Changeset 2186


Ignore:
Timestamp:
Mar 3, 2017, 4:07:30 AM (3 years ago)
Author:
bruno
Message:

Use the build keyword instead of spec to be more neutral in messages

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r2182 r2186  
    16591659        }
    16601660
    1661         @buildfiles = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBTMP'}","spec");
     1661        @buildfiles = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBTMP'}","build");
    16621662        pb_log(2,"buildfiles ".Dumper(\@buildfiles)."\n");
    16631663        foreach my $f (@buildfiles) {
     
    17351735            symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
    17361736            # We need to first extract the spec file
    1737             my @buildfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBBUILDDIR'}/SPECS","spec");
     1737            my @buildfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$ENV{'PBBUILDDIR'}/SPECS","build");
    17381738
    17391739            # We need to handle potential patches to upstream sources
     
    18751875
    18761876            # We need to first extract the ebuild file
    1877             @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$tmpe","ebuild");
     1877            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver$pbextdir/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$tmpe","build");
    18781878
    18791879            # Prepare the build env for gentoo
     
    46944694my $dir=shift;
    46954695my $ddir=shift;
    4696 my $mandatory=shift || "spec";
     4696my $mandatory=shift || "build";
    46974697
    46984698my $flag = "mayfail" if (($mandatory eq "patch") || ($mandatory eq "src"));
Note: See TracChangeset for help on using the changeset viewer.