Changeset 283 in ProjectBuilder for devel/pb

Timestamp:

Nov 13, 2007, 12:09:52 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix pbdistrocheck usage
• Fix build process for older distro + add new test scripts for delivery
• Attempt to solve the problem of the delivery variable for MakeMaker which is different depending on version (PREFIX or destdir)

(merge -r276:282 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/pb/0.8.11)

Location:

devel/pb

Files:

• Makefile.PL (modified) (1 diff)
• bin/pb (modified) (1 diff)
• contrib/newpb (copied) (copied from 0.8.11/pb/contrib/newpb )
• contrib/newpbqemu (copied) (copied from 0.8.11/pb/contrib/newpbqemu )
• contrib/updateqemu (modified) (1 diff)

devel/pb/Makefile.PL

@@ -1 @@
-use 5.008000;
+use 5.006001;
 use ExtUtils::MakeMaker;
 

devel/pb/bin/pb

@@ -365 +365 @@
         my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
         # Suse 10.0 forces tar.bz2 usage :-(
-        if (($ddir eq "suse") && ($dver eq "10.0")) {
-            print "SuSE 10.0 needs bz2 type of packages so recompressing...\n";
-            my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";
-            system "gzip -cd $src | bzip2 -c6 > $newsrc";
-            $src = $newsrc;
-        }
+        #if (($ddir eq "suse") && ($dver eq "10.0")) {
+        #   print "SuSE 10.0 needs bz2 type of packages so recompressing...\n";
+        #   my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";
+        #   system "gzip -cd $src | bzip2 -c6 > $newsrc";
+        #   $src = $newsrc;
+        #}
         print $LOG "Source file: $src\n" if ($debug >= 0);
 

devel/pb/contrib/updateqemu

@@ -25 +25 @@
     echo "Halting $m"
     echo "/sbin/halt -p" > /tmp/pbscript
-    pb -m $m -a root -s /tmp/pbscript script2vm 
+    #pb -m $m -a root -s /tmp/pbscript script2vm 
     sleep 120
     job=`ps auhxww | grep qemu | grep $m | grep -Ev 'grep|updateqemu' | awk '{print $2}'`
     if [ _"$job" != _"" ]; then
         echo "Really halting $m"
-        kill $job
+        #kill $job
     fi
 done