Module Name: src
Committed By: apb
Date: Tue Aug 5 15:43:50 UTC 2014
Modified Files:
src/distrib/common: Makefile.image
src/etc: Makefile
Log Message:
Pass GZIP="-9 ${GZIP_N_FLAG}" instead of GZIP=-9n
in the environmentto commands that invoke ${TOOL_GZIP}.
This will allow them to use -nT instead of just -n with pigz.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/distrib/common/Makefile.image
cvs rdiff -u -r1.417 -r1.418 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.34 src/distrib/common/Makefile.image:1.35
--- src/distrib/common/Makefile.image:1.34 Tue Aug 5 15:40:58 2014
+++ src/distrib/common/Makefile.image Tue Aug 5 15:43:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.34 2014/08/05 15:40:58 apb Exp $
+# $NetBSD: Makefile.image,v 1.35 2014/08/05 15:43:50 apb Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -121,7 +121,8 @@ CLEANFILES+= ${IMAGE} ${IMAGE}.gz ${IMAG
${IMAGETAR}: ${WORKBUILT} ${WORKSPEC} ${IMAGEDEPENDS}
${_MKTARGET_CREATE}
( cd ${WORKDIR}; \
- GZIP=-9n ${TOOL_PAX} -ON ${NETBSDSRCDIR}/etc -wdzM <${.OBJDIR}/${WORKSPEC} \
+ GZIP="-9 ${GZIP_N_FLAG}" \
+ ${TOOL_PAX} -ON ${NETBSDSRCDIR}/etc -wdzM <${.OBJDIR}/${WORKSPEC} \
) > ${.TARGET}.tmp \
&& mv ${.TARGET}.tmp ${.TARGET}
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.417 src/etc/Makefile:1.418
--- src/etc/Makefile:1.417 Tue Aug 5 15:40:59 2014
+++ src/etc/Makefile Tue Aug 5 15:43:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.417 2014/08/05 15:40:59 apb Exp $
+# $NetBSD: Makefile,v 1.418 2014/08/05 15:43:50 apb Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -593,7 +593,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=-9n ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
+ pax_cmd="COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP="-9 ${GZIP_N_FLAG}" ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
cd $${kerndir} && { \
kernels=; newest=; \
for kernel in $${kernlist}; do \
