diff options
| author | grant <grant@pkgsrc.org> | 2004-02-25 09:05:40 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-02-25 09:05:40 +0000 |
| commit | b8a6d28e392cfc5d51df72b3e20eacad70cd51b1 (patch) | |
| tree | a29d0bfbb55ae245226e3fc5e49a26b15d3694bd /mk/bulk | |
| parent | a4c6ac3037bd5b02bbc6ea98ed24ead39a4d8790 (diff) | |
| download | pkgsrc-b8a6d28e392cfc5d51df72b3e20eacad70cd51b1.tar.gz | |
GNU tar on netbsd-1-6 doesn't grok "-T -" at the end, but pax-as-tar
does, so rearrange the arguments so that "-f -" is always at the end.
noted by krister@.
while I'm here, make sure we use the same tar(1) program pkgsrc does.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/post-build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/bulk/post-build b/mk/bulk/post-build index 0064724d55c..4021eb72bbe 100644 --- a/mk/bulk/post-build +++ b/mk/bulk/post-build @@ -1,5 +1,5 @@ #!/usr/pkg/bin/perl -# $NetBSD: post-build,v 1.35 2004/02/15 06:17:10 grant Exp $ +# $NetBSD: post-build,v 1.36 2004/02/25 09:05:40 grant Exp $ # # Collect stuff after a pkg bulk build # @@ -53,6 +53,7 @@ chomp($STARTFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VAR chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=LOCALBASE )`); chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=X11BASE )`); chomp($FIND=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=FIND )`); +chomp($GTAR=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=GTAR )`); $dtfile=basename($DEPENDSTREEFILE); $depfile=basename($DEPENDSFILE); $supfile=basename($SUPPORTSFILE); @@ -84,7 +85,7 @@ system("mkdir -p ${FTP}"); # Copy over the output from the build process chdir($USR_PKGSRC); -system("find . -name $BROKENFILE -print | tar plcf - -T - | (cd $FTP; tar plxf -)"); +system("find . -name $BROKENFILE -print | $GTAR -T - -plcf - | (cd $FTP; $GTAR -plxf -)"); # Copy over the cache files used during the build foreach my $f ($DEPENDSTREEFILE, $DEPENDSFILE, $SUPPORTSFILE, $INDEXFILE, $ORDERFILE) { @@ -139,7 +140,7 @@ writeReport(); if (scalar(@leftovers)) { # Store leftovers, for easier identification: - system("tar plcf - -T $leftovers_txt | (cd leftovers-${arch}; tar plxf -)"); + system("$GTAR -T $leftovers_txt -plcf - | (cd leftovers-${arch}; $GTAR -plxf -)"); } # Add links to leftover list: |