Module Name: src
Committed By: apb
Date: Wed Aug 6 10:41:13 UTC 2014
Modified Files:
src/distrib/common: Makefile.image
Log Message:
Introduce and use GZIP_FLAGS variable.
The previous use of GZIP="-9 ${GZIP_N_FLAG}" happened to work, but
the new use of GZIP=${GZIP_FLAGS:Q} is safer.
For consistency, also use GZIP_FLAGS elesehere in this file.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/common/Makefile.image
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.35 src/distrib/common/Makefile.image:1.36
--- src/distrib/common/Makefile.image:1.35 Tue Aug 5 15:43:50 2014
+++ src/distrib/common/Makefile.image Wed Aug 6 10:41:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.35 2014/08/05 15:43:50 apb Exp $
+# $NetBSD: Makefile.image,v 1.36 2014/08/06 10:41:13 apb Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -38,6 +38,7 @@ WORKBUILT?= work.built
PARSELISTENV+= TARGETDIR=${.OBJDIR}/${WORKDIR:Q}
+GZIP_FLAGS= -9 ${GZIP_N_FLAG}
.if !target(${WORKBUILT}) # {
${WORKBUILT}: ${IMAGEDEPENDS} ${WORKSPEC} ${PARSELISTDEP} ${LISTS}
@@ -103,7 +104,7 @@ fsimage: ${IMAGE}
${IMAGE}.gz: ${IMAGE}
${_MKTARGET_CREATE}
-rm -f ${.TARGET}
- ${TOOL_GZIP_N} -9c ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} ${GZIP_FLAGS} -c ${.ALLSRC} > ${.TARGET}
realall: ${IMAGE}
@@ -121,7 +122,7 @@ CLEANFILES+= ${IMAGE} ${IMAGE}.gz ${IMAG
${IMAGETAR}: ${WORKBUILT} ${WORKSPEC} ${IMAGEDEPENDS}
${_MKTARGET_CREATE}
( cd ${WORKDIR}; \
- GZIP="-9 ${GZIP_N_FLAG}" \
+ GZIP=${GZIP_FLAGS:Q} \
${TOOL_PAX} -ON ${NETBSDSRCDIR}/etc -wdzM <${.OBJDIR}/${WORKSPEC} \
) > ${.TARGET}.tmp \
&& mv ${.TARGET}.tmp ${.TARGET}
