Changeset 226 in ProjectBuilder
- Timestamp:
- Oct 17, 2007, 6:38:20 PM (16 years ago)
- Location:
- devel
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r220 r226 567 567 pb_system("ssh -q -p $port $mac \"rm -rf $tdir $bdir\"","VM cleanup on $mac"); 568 568 if (! $vmexist) { 569 pb_system("ssh -q -p $port $mac \"sudo / usr/bin/poweroff\"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $vm halt (pid $vmpid)");569 pb_system("ssh -q -p $port $mac \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $vm halt (pid $vmpid)"); 570 570 } 571 571 pb_send2ssh("Packages","$odir"."_"."$over"); … … 636 636 $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$vm.qemu"; 637 637 if (! -f "$vmm") { 638 print "Unable to find VM $vmm"; 639 return; 638 die "Unable to find VM $vmm"; 640 639 } 641 640 $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$vmport->{$ENV{'PBPROJ'}}:10.0.2.15:22 $vmm" … … 674 673 print SCRIPT "mv .pbrc \$HOME\n"; 675 674 print SCRIPT "cd ..\n"; 675 # Force new date to be in the future compared to the date of the tar file by removing 1 minute 676 my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst()); 677 $date[1]--; 676 678 my $upddate = strftime("%m%d%H%M%Y", @date); 677 679 print SCRIPT "echo Setting up date on $vmntp...\n"; -
devel/pb/contrib/pbsetupqemu
r220 r226 79 79 } 80 80 81 my $topbuilddir=`rpmquery --eval '%{_topdir}' 2> /dev/null`;82 chomp($topbuilddir);81 #my $topbuilddir=`rpmquery --eval '%{_topdir}' 2> /dev/null`; 82 #chomp($topbuilddir); 83 83 84 84 if ( $dver <= 4 ) { 85 85 # FC4 - AppConfig unavailable 86 system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ntp sudo ; rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";86 system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ntp sudo ; rm -rf AppConfig-* ; rm -rf AppConfig* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd .."; 87 87 } else { 88 88 # FC5/6/7 … … 117 117 # Adapt sudoers 118 118 $file="/etc/sudoers"; 119 $found = 0;120 119 open(PBFILE,$file) || die "Unable to open $file"; 121 120 open(PBOUT,"> $file.new") || die "Unable to open $file.new"; 122 121 while (<PBFILE>) { 123 $found = 1if (/^pb /);122 next if (/^pb /); 124 123 s/Defaults[ \t]+requiretty//; 125 124 print PBOUT $_; 126 125 } 127 126 close(PBFILE); 128 print PBOUT "pb ALL=(ALL) NOPASSWD:ALL\n" if ( $found == 0 );127 print PBOUT "pb ALL=(ALL) NOPASSWD:ALL\n"; 129 128 close(PBOUT); 130 129 rename("$file.new",$file); … … 172 171 } 173 172 174 system "rm -rf project-builder-* ; wget ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd ..";173 system "rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .."; 175 174 -
devel/pb/lib/ProjectBuilder/Base.pm
r212 r226 288 288 $ENV{'PBCMSLOG'}="svn log"; 289 289 $ENV{'PBCMSLOGFILE'}="svn.log"; 290 } elsif ($cms->{$proj} eq "flat") { 291 $ENV{'PBREVISION'}="flat"; 292 $ENV{'PBCMSLOG'}="/bin/true"; 293 $ENV{'PBCMSLOGFILE'}="/dev/null"; 290 294 } elsif ($cms->{$proj} eq "cvs") { 291 295 # Way too slow … … 321 325 } 322 326 pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp"); 327 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") { 328 if (-d $source) { 329 $tmp = $destdir; 330 } else { 331 $tmp = $destdir."/".basename($source); 332 } 333 pb_system("cp -a $source $tmp","Exporting $source from DIR to $tmp"); 323 334 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 324 335 my $dir=dirname($destdir); … … 346 357 if ($cms->{$ENV{'PBPROJ'}} eq "svn") { 347 358 pb_system("svn log -v $pkgdir > $destfile","Extracting log info from SVN"); 359 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") { 360 # Nothing to do 348 361 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 349 362 my $tmp=basename($pkgdir); … … 367 380 close(PIPE); 368 381 chomp($url); 382 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") { 369 383 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 370 384 } else { … … 381 395 if ($cms->{$ENV{'PBPROJ'}} eq "svn") { 382 396 pb_system("svn copy -m \"Creation of $newurl from $oldurl\" $oldurl $newurl","Copying $oldurl to $newurl "); 397 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") { 383 398 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 384 399 } else { … … 394 409 if ($cms->{$ENV{'PBPROJ'}} eq "svn") { 395 410 pb_system("svn co $url $destination","Checking $url to $destination "); 411 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") { 396 412 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 397 413 } else { … … 408 424 pb_system("svn ci -m \"Updated to $ver\" $dir","Checking in $dir"); 409 425 pb_system("svn up $dir","Updating $dir"); 426 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") { 410 427 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 411 428 } else { … … 424 441 } 425 442 return($l); 443 } elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") { 426 444 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") { 427 445 } else { -
devel/pb/lib/ProjectBuilder/Distribution.pm
r203 r226 29 29 $dfam="gen"; 30 30 $dtype="ebuild"; 31 my $dver1 = $dver; 32 $dver1 =~ s/\.//; 33 $dsuf=".$ddir$dver1"; 31 $dver="nover"; 32 $dsuf=".$ddir"; 34 33 } elsif ($ddir =~ /slackware/) { 35 34 $dfam="slack"; -
devel/pbconf/project-builder/pbfilter/suse.pbf
r32 r226 2 2 # $Id$ 3 3 # 4 # Filter for redhatbuild4 # Filter for suse build 5 5 # 6 # PBSRC is replaced by the source package format7 filter PBSRC = ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz28 9 6 # PBGRP is replaced by the RPM group of apps 10 7 filter PBGRP = Applications/Archiving -
devel/pbconf/project-builder/rpm/project-builder.spec
r225 r226 2 2 # $Id$ 3 3 # 4 %define perlvendorlib: %(eval "`%{__perl} -V:installvendorlib | cut -d= -f2`") 4 5 5 6 Summary: Project Builder aka pb is a tool to produce packages for multiple distributions … … 11 12 License: GPL 12 13 Group: PBGRP 13 Url: http:// www.mondorescue.org14 Url: http://trac.project-builder.org 14 15 Source: PBSRC 15 16 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) … … 34 35 35 36 %build 36 %{__perl} Makefile.PL 37 %{__perl} Makefile.PL destdir=$RPM_BUILD_ROOT 37 38 make 38 39 39 40 %install 40 make DESTDIR=${RPM_BUILD_ROOT} install41 make DESTDIR=${RPM_BUILD_ROOT} pure_install 41 42 42 43 %clean 43 %{__rm} -rf %{buildroot}44 %{__rm} -rf $RPM_BUILD_ROOT 44 45 45 46 %files … … 48 49 %doc INSTALL COPYING README AUTHORS contrib/pbsetupqemu 49 50 50 %{perl_vendorlib} 51 %{_prefix}/lib/perl5/vendor_perl/*/* 52 %{_bindir}/* 51 53 #%{_mandir}/*/* 52 %{_bindir}/*53 54 54 55 %changelog
Note:
See TracChangeset
for help on using the changeset viewer.