[src/trunk]: src To make pax use ${TOOL_GZIP}, we need to pass "--use-compres...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/127539c6db9d
branches:  trunk
changeset: 331231:127539c6db9d
user:      apb <apb%NetBSD.org@localhost>
date:      Wed Aug 06 11:41:18 2014 +0000

description:
To make pax use ${TOOL_GZIP}, we need to pass "--use-compress-program
${TOOL_GZIP}" on the command line, and refrain from passing "-z".  If
passed "-z", pax will use plain "gzip", ignoring --use-compress-program.

diffstat:

 distrib/common/Makefile.image |  5 +++--
 etc/Makefile                  |  4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 0d5f6ffd75cc -r 127539c6db9d distrib/common/Makefile.image
--- a/distrib/common/Makefile.image     Wed Aug 06 10:41:13 2014 +0000
+++ b/distrib/common/Makefile.image     Wed Aug 06 11:41:18 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.image,v 1.36 2014/08/06 10:41:13 apb Exp $
+#      $NetBSD: Makefile.image,v 1.37 2014/08/06 11:41:18 apb Exp $
 #
 # Makefile snippet to build a tree from the provided lists,
 # and make an ffs file system image from that tree
@@ -123,7 +123,8 @@
        ${_MKTARGET_CREATE}
        ( cd ${WORKDIR}; \
          GZIP=${GZIP_FLAGS:Q} \
-         ${TOOL_PAX} -ON ${NETBSDSRCDIR}/etc -wdzM <${.OBJDIR}/${WORKSPEC} \
+         ${TOOL_PAX} --use-compress-program=${TOOL_GZIP:Q} \
+             -ON ${NETBSDSRCDIR}/etc -wdM <${.OBJDIR}/${WORKSPEC} \
        ) > ${.TARGET}.tmp \
        && mv ${.TARGET}.tmp ${.TARGET}
 
diff -r 0d5f6ffd75cc -r 127539c6db9d etc/Makefile
--- a/etc/Makefile      Wed Aug 06 10:41:13 2014 +0000
+++ b/etc/Makefile      Wed Aug 06 11:41:18 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.419 2014/08/06 10:37:30 apb Exp $
+#      $NetBSD: Makefile,v 1.420 2014/08/06 11:41:18 apb Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -595,7 +595,7 @@
        kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
        kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
        kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
-       pax_cmd="COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=${GZIP_FLAGS:Q} ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
+       pax_cmd="GZIP=${GZIP_FLAGS:Q} ${TOOL_PAX} --use-compress-program ${TOOL_GZIP:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
        cd $${kerndir} && { \
                kernels=; newest=; \
                for kernel in $${kernlist}; do \