Changeset 283


Ignore:
Timestamp:
Nov 13, 2007, 12:09:52 AM (12 years ago)
Author:
bruno
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:
6 edited
5 copied

Legend:

Unmodified
Added
Removed
  • devel/pb/Makefile.PL

    r176 r283  
    1 use 5.008000;
     1use 5.006001;
    22use ExtUtils::MakeMaker;
    33
  • devel/pb/bin/pb

    r274 r283  
    365365        my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
    366366        # Suse 10.0 forces tar.bz2 usage :-(
    367         if (($ddir eq "suse") && ($dver eq "10.0")) {
    368             print "SuSE 10.0 needs bz2 type of packages so recompressing...\n";
    369             my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";
    370             system "gzip -cd $src | bzip2 -c6 > $newsrc";
    371             $src = $newsrc;
    372         }
     367        #if (($ddir eq "suse") && ($dver eq "10.0")) {
     368        #   print "SuSE 10.0 needs bz2 type of packages so recompressing...\n";
     369        #   my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";
     370        #   system "gzip -cd $src | bzip2 -c6 > $newsrc";
     371        #   $src = $newsrc;
     372        #}
    373373        print $LOG "Source file: $src\n" if ($debug >= 0);
    374374
  • devel/pb/contrib/updateqemu

    r262 r283  
    2525    echo "Halting $m"
    2626    echo "/sbin/halt -p" > /tmp/pbscript
    27     pb -m $m -a root -s /tmp/pbscript script2vm
     27    #pb -m $m -a root -s /tmp/pbscript script2vm
    2828    sleep 120
    2929    job=`ps auhxww | grep qemu | grep $m | grep -Ev 'grep|updateqemu' | awk '{print $2}'`
    3030    if [ _"$job" != _"" ]; then
    3131        echo "Really halting $m"
    32         kill $job
     32        #kill $job
    3333    fi
    3434done
  • devel/pbconf/pbfilter/all.pbf

    r237 r283  
    2727# PBPACKAGER is replaced by the packager name ($pbpackager in code)
    2828filter PBPACKAGER = $pbpackager
     29
  • devel/pbconf/project-builder/pbfilter/rpm.pbf

    r253 r283  
    1212# PBSUF is replaced by the package name ($pbpkg in code)
    1313filter PBSUF = $pbsuf
     14
     15# Special for pb : MakeMaker has various variable for the dest dir
     16filter PBKEYWORD = destdir
     17filter PBFINALDIR =
  • devel/pbconf/project-builder/rpm/project-builder.spec

    r231 r283  
    22# $Id$
    33#
    4 %define perlvendorlib: %(eval "`%{__perl} -V:installvendorlib | cut -d= -f2`")
     4%define perlvendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
    55
    66Summary:    Project Builder aka pb is a tool to produce packages for multiple distributions
     
    3535
    3636%build
    37 %{__perl} Makefile.PL destdir=$RPM_BUILD_ROOT
     37%{__perl} Makefile.PL PBKEYWORD=${RPM_BUILD_ROOT}/PBFINALDIR
    3838make
    3939
    4040%install
    41 make DESTDIR=${RPM_BUILD_ROOT} pure_install
     41%{__rm} -rf $RPM_BUILD_ROOT
     42make pure_install
    4243find ${RPM_BUILD_ROOT} -name perllocal.pod | xargs rm -f
    4344
     
    5051%doc INSTALL COPYING README AUTHORS contrib/pbsetupqemu
    5152
    52 %{_prefix}/lib/perl5/vendor_perl/*/*
     53%{perlvendorlib}/*
    5354%{_bindir}/*
    5455#%{_mandir}/*/*
Note: See TracChangeset for help on using the changeset viewer.