Module Name: src
Committed By: apb
Date: Wed Aug 6 11:41:19 UTC 2014
Modified Files:
src/distrib/common: Makefile.image
src/etc: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/common/Makefile.image
cvs rdiff -u -r1.419 -r1.420 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.36 src/distrib/common/Makefile.image:1.37
--- src/distrib/common/Makefile.image:1.36 Wed Aug 6 10:41:13 2014
+++ src/distrib/common/Makefile.image Wed Aug 6 11:41:18 2014
@@ -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 @@ ${IMAGETAR}: ${WORKBUILT} ${WORKSPEC} ${
${_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}
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.419 src/etc/Makefile:1.420
--- src/etc/Makefile:1.419 Wed Aug 6 10:37:30 2014
+++ src/etc/Makefile Wed Aug 6 11:41:18 2014
@@ -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 @@ kernset-${configfile}: .PHONY build_kern
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 \
