Changeset 1065
- Timestamp:
- 01/27/08 18:19:54 (1 year ago)
- Files:
-
- utils/cmu/trunk/Makefile (modified) (5 diffs)
- utils/cmu/trunk/cobalt-cmu.spec.in (modified) (2 diffs)
- utils/cmu/trunk/conf/5200R.cobaltBase.xml (added)
- utils/cmu/trunk/perl_modules/Archive.pm (modified) (5 diffs)
- utils/cmu/trunk/perl_modules/Conflict.pm (modified) (1 diff)
- utils/cmu/trunk/perl_modules/Global.pm (modified) (4 diffs)
- utils/cmu/trunk/scripts/5200Radjust.pl (added)
- utils/cmu/trunk/scripts/5200Rconflict.pl (added)
- utils/cmu/trunk/scripts/5200Rscanin.pl (added)
- utils/cmu/trunk/scripts/5200Rscanout.pl (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
utils/cmu/trunk/Makefile
r959 r1065 11 11 INSTALL = /usr/bin/install 12 12 13 VERSION = 2.6 313 VERSION = 2.64 14 14 15 15 BUILD_DIR = /tmp/cmu … … 73 73 RaQUtil.pm 74 74 75 5200R_SCRIPTS = \ 76 $(wildcard scripts/5200R*.pl) 77 78 5200R_LIBS = \ 79 RaQUtil.pm 80 75 81 TLAS1HE_SCRIPTS = \ 76 82 $(wildcard scripts/TLAS1HE*.pl) … … 95 101 96 102 ADJUST_SCRIPTS = \ 97 $(wildcard scripts/RaQ*adjust.pl scripts/5 100Radjust.pl scripts/TLAS*HEadjust.pl scripts/TLAS2adjust.pl)103 $(wildcard scripts/RaQ*adjust.pl scripts/5*00Radjust.pl scripts/TLAS*HEadjust.pl scripts/TLAS2adjust.pl) 98 104 99 105 BASE_SCRIPTS = \ … … 236 242 (cd $(PKG_DIR)/5100R;make) 237 243 244 5200r:: cmu base adjust 245 for t in $(5200R_SCRIPTS) ; do \ 246 $(INSTALL) -o $(CMUUSER) -m0700 $$t $(TMP_DIR)/$$t ; \ 247 done 248 for t in $(5200R_LIBS) ; do \ 249 $(INSTALL) -o $(CMUUSER) -m0600 lib/$$t $(PERLDIR)/$$t ; \ 250 done 251 sed -e 's/\[PRODUCT\]/5200R/' < $(SPEC_IN) > $(SPEC_FILE) 252 sed -e 's/\[PRODUCT\]/5200R/' < $(MAKE_IN) > $(MAKE_FILE) 253 $(CP) conf/5200R.cobaltBase.xml $(BASE_CONF) 254 perl -pi -e 's#\[VERSION\]#$(VERSION)#' $(SPEC_FILE) $(MAKE_FILE) $(BASE_CONF) 255 /bin/tar -X $(TMP_DIR)/ignore -C $(BUILD_DIR) -czvf $(TMPTAR) cpr 256 $(RPMBUILD) -ta $(TMPTAR) 257 perl -pi -e 's#\[VERSION\]#$(VERSION)#' $(PKG_DIR)/5200R/packing_list 258 (cd $(PKG_DIR)/5200R;make) 259 238 260 tlas1he:: cmu base adjust 239 261 for t in $(TLAS1HE_SCRIPTS) ; do \ … … 298 320 (cd $(PKG_DIR)/Qube3;make) 299 321 300 all:: raq2 raq3 raq4 raqxtr raq550 5100r tlas1he tlas2 qube2 qube3322 all:: raq2 raq3 raq4 raqxtr raq550 5100r 5200r tlas1he tlas2 qube2 qube3 301 323 302 324 raq1:: cmu utils/cmu/trunk/cobalt-cmu.spec.in
r959 r1065 4 4 Name: [PRODUCT]-cmu 5 5 Version: [VERSION] 6 Release: 0BQ1 5%{?dist}6 Release: 0BQ16%{?dist} 7 7 Vendor: %{vendor} 8 8 License: Sun modified BSD … … 68 68 69 69 %changelog 70 * Sun Jan 27 2008 Hisao SHIBUYA <shibuya@bluequartz.org> 71 - version 2.64-0BQ16 72 - add 5200R platform 73 70 74 * Mon May 08 2006 Hisao SHIBUYA <shibuya@turbolinux.co.jp> 71 75 - version 2.63-0BQ15 utils/cmu/trunk/perl_modules/Archive.pm
r955 r1065 159 159 if($self->build =~ /^Qube/) { 160 160 $homeDir = "/home/groups/".$self->name; 161 } elsif($self->build =~ /^RaQ550$/ || $self->build =~ /^5100R$/ || $self->build =~ /^ TLAS1HE$/ || $self->build =~ /^TLAS2$/) {161 } elsif($self->build =~ /^RaQ550$/ || $self->build =~ /^5100R$/ || $self->build =~ /^5200R$/ || $self->build =~ /^TLAS1HE$/ || $self->build =~ /^TLAS2$/) { 162 162 $homeDir = $self->{baseDir}; 163 163 } elsif($self->build =~ /^RaQ/) { … … 194 194 } else { 195 195 $self->addIgnore("web"); 196 if(($self->build =~ /^RaQ/ || $self->build =~ /^5100R/ || $self->build =~ /^ TLAS1HE/ || $self->build =~ /^TLAS2/) && $self->type eq "groups") {196 if(($self->build =~ /^RaQ/ || $self->build =~ /^5100R/ || $self->build =~ /^5200R$/ || $self->build =~ /^TLAS1HE/ || $self->build =~ /^TLAS2/) && $self->type eq "groups") { 197 197 $self->addIgnore("users"); 198 198 $self->addIgnore(".users"); … … 355 355 if($self->build =~ /^Qube/) { 356 356 $homeDir = "/home/groups/".$self->name; 357 } elsif($self->build =~ /^RaQ/ || $self->build =~ /^5100R/ || $self->build =~ /^ TLAS1HE/ || $self->build =~ /^TLAS2/) {357 } elsif($self->build =~ /^RaQ/ || $self->build =~ /^5100R/ || $self->build =~ /^5200R$/ || $self->build =~ /^TLAS1HE/ || $self->build =~ /^TLAS2/) { 358 358 $homeDir = "/home/sites/".$self->name; 359 359 } else { … … 440 440 chmod 0660, $mailDest; 441 441 442 } elsif($self->build =~ /^RaQ550/ || $self->build =~ /^5100R/ ) {442 } elsif($self->build =~ /^RaQ550/ || $self->build =~ /^5100R/ || $self->build =~ /^5200R/) { 443 443 if(-l $homeDir."/mbox") { 444 444 warn "WARN $homeDir/mbox is a symlink\n"; … … 522 522 if($file->{name} =~ /\`/) { $file->{name} =~ s/\`/\\\`/g; } 523 523 524 if($self->build =~ /^RaQ/ || $self->build =~ /^5100R/ || $self->build =~ /^ TLAS1HE/ || $self->build =~ /^TLAS2/) {524 if($self->build =~ /^RaQ/ || $self->build =~ /^5100R/ || $self->build =~ /^5200R/ || $self->build =~ /^TLAS1HE/ || $self->build =~ /^TLAS2/) { 525 525 $ret = chown((getpwnam($file->{uid}))[2], 526 526 (getgrnam($self->{gid}))[2], $file->{name} ); utils/cmu/trunk/perl_modules/Conflict.pm
r945 r1065 184 184 if($self->getConfig('product') eq 'RaQ3') { 185 185 $self->{$IM}->{$class}->{$name}->{$attr} = 'off'; 186 } elsif($self->getConfig('product') =~ /(RaQ550|5100R| TLAS1HE|Qube3)/) {186 } elsif($self->getConfig('product') =~ /(RaQ550|5100R|5200R|TLAS1HE|Qube3)/) { 187 187 $self->{$IM}->{$class}->{$name}->{$attr} = '0'; 188 188 } else { $self->{$IM}->{$class}->{$name}->{$attr} = 'f' } utils/cmu/trunk/perl_modules/Global.pm
r959 r1065 31 31 RaQ550 => 1, 32 32 '5100R' => 1, 33 '5200R' => 1, 33 34 TLAS1HE => 1, 34 35 TLAS2 => 1, … … 41 42 RaQ550 => 1, 42 43 '5100R' => 1, 44 '5200R' => 1, 43 45 TLAS1HE => 1, 44 46 TLAS2 => 1, … … 54 56 TLAS1HE => '5100R', 55 57 '5100R' => 'TLAS2', 58 'TLAS2' => '5200R', 56 59 ); 57 60 … … 114 117 "5104R", "5100R", 115 118 "5105R", "5100R", 119 "5200R", "5200R", 116 120 # TLAS 117 121 "TLAS1HE", "TLAS1HE",
