Changeset 493 for devel/pb/bin/pb


Ignore:
Timestamp:
Jun 29, 2008, 1:21:30 AM (12 years ago)
Author:
Bruno Cornec
Message:
  • Split the pbconf dir content in a seaparate tar file to allow for matching upstream tar files. this should permit to handle patches more easily now.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r492 r493  
    606606        chdir "$ENV{'PBDESTDIR'}" || die "Unable to change dir to $ENV{'PBDESTDIR'}";
    607607        # Possibility to look at PBSRC to guess more the filename
    608         pb_system("tar cfz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files compressed");
     608        pb_system("tar cfz $pbpkg-$pbver.tar.gz --exclude=$pbpkg-$pbver/pbconf $pbpkg-$pbver","Creating $pbpkg tar files compressed");
    609609        pb_log(0,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n");
     610        pb_system("tar cfz $pbpkg-$pbver.pbconf.tar.gz $pbpkg-$pbver/pbconf","Creating pbconf tar files compressed");
     611        pb_log(0,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.pbconf.tar.gz\n");
    610612
    611613        # Keep track of version-tag per pkg
     
    658660
    659661        my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
     662        my $src2="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.pbconf.tar.gz";
    660663        pb_log(2,"Source file: $src\n");
     664        pb_log(2,"Pbconf file: $src2\n");
    661665
    662666        pb_log(2,"Working directory: $ENV{'PBBUILDDIR'}\n");
     
    673677            # We need to first extract the spec file
    674678            my @specfile;
    675             @specfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
     679            @specfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
     680
     681            # We need to handle potential patches to upstream sources
    676682
    677683            pb_log(2,"specfile: ".Dumper(\@specfile)."\n");
     
    696702            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
    697703            pb_system("tar xfz $src","Extracting sources");
     704            pb_system("tar xfz $src2","Extracting pbconf");
    698705
    699706            chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
     
    720727
    721728            # We need to first extract the ebuild file
    722             @ebuildfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$tmpd");
     729            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$tmpd");
    723730
    724731            # Prepare the build env for gentoo
     
    766773            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
    767774            pb_system("tar xfz $src","Extracting sources");
     775            pb_system("tar xfz $src2","Extracting pbconf");
    768776            chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
    769777            symlink "pbconf/$ddir-$dver","install" || die "Unable to symlink to pbconf/$ddir-$dver";
     
    853861
    854862            if (($cmt eq "Sources") || ($cmt eq "vm") || ($cmt eq "ve")) {
    855                 $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
     863                $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz $ENV{'PBDESTDIR'}/$pbpkg-$pbver.pbconf.tar.gz";
    856864                if ($cmd eq "") {
    857865                    $cmd = "ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";
Note: See TracChangeset for help on using the changeset viewer.