Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Pass GZIP="-9 ${GZIP_N_FLAG}" instead of GZIP=-9n



details:   https://anonhg.NetBSD.org/src/rev/1b0e9bc050f6
branches:  trunk
changeset: 797968:1b0e9bc050f6
user:      apb <apb%NetBSD.org@localhost>
date:      Tue Aug 05 15:43:50 2014 +0000

description:
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.

diffstat:

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

diffs (37 lines):

diff -r 052acda18734 -r 1b0e9bc050f6 distrib/common/Makefile.image
--- a/distrib/common/Makefile.image     Tue Aug 05 15:40:58 2014 +0000
+++ b/distrib/common/Makefile.image     Tue Aug 05 15:43:50 2014 +0000
@@ -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 @@
 ${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}
 
diff -r 052acda18734 -r 1b0e9bc050f6 etc/Makefile
--- a/etc/Makefile      Tue Aug 05 15:40:58 2014 +0000
+++ b/etc/Makefile      Tue Aug 05 15:43:50 2014 +0000
@@ -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 @@
        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 \



Home | Main Index | Thread Index | Old Index