Changeset 283 in ProjectBuilder for devel

Timestamp:

Nov 13, 2007, 12:09:52 AM (18 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

Files:

• pb/Makefile.PL (modified) (1 diff)
• pb/bin/pb (modified) (1 diff)
• pb/contrib/newpb (copied) (copied from 0.8.11/pb/contrib/newpb )
• pb/contrib/newpbqemu (copied) (copied from 0.8.11/pb/contrib/newpbqemu )
• pb/contrib/updateqemu (modified) (1 diff)
• pbconf/pbfilter/all.pbf (modified) (1 diff)
• pbconf/project-builder/pbfilter/redhat.pbf (copied) (copied from 0.8.11/pbconf/project-builder/pbfilter/redhat.pbf )
• pbconf/project-builder/pbfilter/rhel-3.pbf (copied) (copied from 0.8.11/pbconf/project-builder/pbfilter/rhel-3.pbf )
• pbconf/project-builder/pbfilter/rpm.pbf (modified) (1 diff)
• pbconf/project-builder/pbfilter/suse-10.0.pbf (copied) (copied from 0.8.11/pbconf/project-builder/pbfilter/suse-10.0.pbf )
• pbconf/project-builder/rpm/project-builder.spec (modified) (3 diffs)

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

devel/pbconf/pbfilter/all.pbf

@@ -27 +27 @@
 # PBPACKAGER is replaced by the packager name ($pbpackager in code)
 filter PBPACKAGER = $pbpackager
+

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

@@ -12 +12 @@
 # PBSUF is replaced by the package name ($pbpkg in code)
 filter PBSUF = $pbsuf
+
+# Special for pb : MakeMaker has various variable for the dest dir
+filter PBKEYWORD = destdir
+filter PBFINALDIR = 

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

@@ -2 +2 @@
 # $Id$
 #
-%define perlvendorlib: %(eval "`%{__perl} -V:installvendorlib | cut -d= -f2`")
+%define perlvendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
 
 Summary:    Project Builder aka pb is a tool to produce packages for multiple distributions
@@ -35 +35 @@
 
 %build
-%{__perl} Makefile.PL destdir=$RPM_BUILD_ROOT
+%{__perl} Makefile.PL PBKEYWORD=${RPM_BUILD_ROOT}/PBFINALDIR
 make
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} pure_install
+%{__rm} -rf $RPM_BUILD_ROOT
+make pure_install
 find ${RPM_BUILD_ROOT} -name perllocal.pod | xargs rm -f
 
@@ -50 +51 @@
 %doc INSTALL COPYING README AUTHORS contrib/pbsetupqemu
 
-%{_prefix}/lib/perl5/vendor_perl/*/*
+%{perlvendorlib}/*
 %{_bindir}/*
 #%{_mandir}/*/*