Changeset 226

Timestamp:

10/17/07 18:38:20 (6 years ago)

Author:

bruno

Message:

• Improve pbsetupqemu for fc4, sudoers management
• Adds updateqemu script
• Adds support for "flat" type of CMS
• gentoo is nover now
• halt replaces poweroff
• try to fix date issue on the VM
• improve destdir management on spec file

Location:

devel

Files:

• pb/bin/pb (modified) (3 diffs)
• pb/contrib/pbsetupqemu (modified) (3 diffs)
• pb/contrib/updateqemu (added)
• pb/lib/ProjectBuilder/Base.pm (modified) (8 diffs)
• pb/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pbconf/project-builder/pbfilter/suse.pbf (modified) (1 diff)
• pbconf/project-builder/rpm/project-builder.spec (modified) (4 diffs)

devel/pb/bin/pb

@@ -567 +567 @@
         pb_system("ssh -q -p $port $mac \"rm -rf $tdir $bdir\"","VM cleanup on $mac");
         if (! $vmexist) {
-            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)");
+            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)");
         }
         pb_send2ssh("Packages","$odir"."_"."$over");
@@ -636 +636 @@
         $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$vm.qemu";
         if (! -f "$vmm") {
-            print "Unable to find VM $vmm";
-            return;
+            die "Unable to find VM $vmm";
         }
         $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$vmport->{$ENV{'PBPROJ'}}:10.0.2.15:22 $vmm"
@@ -674 +673 @@
     print SCRIPT "mv .pbrc \$HOME\n";
     print SCRIPT "cd ..\n";
+    # Force new date to be in the future compared to the date of the tar file by removing 1 minute
+    my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
+    $date[1]--;
     my $upddate = strftime("%m%d%H%M%Y", @date);
     print SCRIPT "echo Setting up date on $vmntp...\n";

devel/pb/contrib/pbsetupqemu

@@ -79 +79 @@
     }
 
-    my $topbuilddir=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
-    chomp($topbuilddir);
+    #my $topbuilddir=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
+    #chomp($topbuilddir);
 
     if ( $dver <= 4 ) {
         # FC4 - AppConfig unavailable
-        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 ..";
+        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 ..";
     } else {
         # FC5/6/7
@@ -117 +117 @@
 # Adapt sudoers
 $file="/etc/sudoers";
-$found = 0;
 open(PBFILE,$file) || die "Unable to open $file";
 open(PBOUT,"> $file.new") || die "Unable to open $file.new";
 while (<PBFILE>) {
-    $found = 1 if (/^pb   /);
+    next if (/^pb   /);
     s/Defaults[ \t]+requiretty//;
     print PBOUT $_;
 }
 close(PBFILE);
-print PBOUT "pb   ALL=(ALL) NOPASSWD:ALL\n" if ( $found == 0 );
+print PBOUT "pb   ALL=(ALL) NOPASSWD:ALL\n";
 close(PBOUT);
 rename("$file.new",$file);
@@ -172 +171 @@
 }
 
-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 ..";
+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 ..";
 

devel/pb/lib/ProjectBuilder/Base.pm

@@ -288 +288 @@
     $ENV{'PBCMSLOG'}="svn log";
     $ENV{'PBCMSLOGFILE'}="svn.log";
+} elsif ($cms->{$proj} eq "flat") {
+    $ENV{'PBREVISION'}="flat";
+    $ENV{'PBCMSLOG'}="/bin/true";
+    $ENV{'PBCMSLOGFILE'}="/dev/null";
 } elsif ($cms->{$proj} eq "cvs") {
     # Way too slow
@@ -321 +325 @@
     }
     pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
+    if (-d $source) {
+        $tmp = $destdir;
+    } else {
+        $tmp = $destdir."/".basename($source);
+    }
+    pb_system("cp -a $source $tmp","Exporting $source from DIR to $tmp");
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
     my $dir=dirname($destdir);
@@ -346 +357 @@
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
     pb_system("svn log -v $pkgdir > $destfile","Extracting log info from SVN");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
+    # Nothing to do
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
     my $tmp=basename($pkgdir);
@@ -367 +380 @@
     close(PIPE);
     chomp($url);
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {
@@ -381 +395 @@
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
     pb_system("svn copy -m \"Creation of $newurl from $oldurl\" $oldurl $newurl","Copying $oldurl to $newurl ");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {
@@ -394 +409 @@
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
     pb_system("svn co $url $destination","Checking $url to $destination ");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {
@@ -408 +424 @@
     pb_system("svn ci -m \"Updated to $ver\" $dir","Checking in $dir");
     pb_system("svn up $dir","Updating $dir");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {
@@ -424 +441 @@
     }
     return($l);
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -29 +29 @@
     $dfam="gen";
     $dtype="ebuild";
-    my $dver1 = $dver;
-    $dver1 =~ s/\.//;
-    $dsuf=".$ddir$dver1";
+    $dver="nover";
+    $dsuf=".$ddir";
 } elsif ($ddir =~ /slackware/) {
     $dfam="slack";

devel/pbconf/project-builder/pbfilter/suse.pbf

@@ -2 +2 @@
 # $Id$
 # 
-# Filter for redhat build
+# Filter for suse build
 #
-# PBSRC is replaced by the source package format
-filter PBSRC = ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2
-
 # PBGRP is replaced by the RPM group of apps
 filter PBGRP = Applications/Archiving

devel/pbconf/project-builder/rpm/project-builder.spec

@@ -2 +2 @@
 # $Id$
 #
+%define perlvendorlib: %(eval "`%{__perl} -V:installvendorlib | cut -d= -f2`")
 
 Summary:    Project Builder aka pb is a tool to produce packages for multiple distributions
@@ -11 +12 @@
 License:    GPL
 Group:      PBGRP
-Url:        http://www.mondorescue.org
+Url:        http://trac.project-builder.org
 Source:     PBSRC
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
@@ -34 +35 @@
 
 %build
-%{__perl} Makefile.PL
+%{__perl} Makefile.PL destdir=$RPM_BUILD_ROOT
 make
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install
+make DESTDIR=${RPM_BUILD_ROOT} pure_install
 
 %clean
-%{__rm} -rf %{buildroot}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files
@@ -48 +49 @@
 %doc INSTALL COPYING README AUTHORS contrib/pbsetupqemu
 
-%{perl_vendorlib}
+%{_prefix}/lib/perl5/vendor_perl/*/*
+%{_bindir}/*
 #%{_mandir}/*/*
-%{_bindir}/*
 
 %changelog