Source-Changes-HG archive

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

[src/trunk]: src Pass the -n flag to gzip invocations.



details:   https://anonhg.NetBSD.org/src/rev/bde9f8137768
branches:  trunk
changeset: 326382:bde9f8137768
user:      apb <apb%NetBSD.org@localhost>
date:      Mon Jan 27 21:37:17 2014 +0000

description:
Pass the -n flag to gzip invocations.

This prevents it from embedding a timestamp in the output.  We pass
"-n" unconditionally, not conditional on MKREPRO, because many other
invocations of gzip already passed the -n flag unconditionally.

diffstat:

 distrib/common/bootimage/Makefile.bootimage |   4 ++--
 distrib/sets/Makefile                       |   4 +++-
 etc/Makefile                                |  10 +++++-----
 libexec/httpd/Makefile                      |   4 ++--
 sys/arch/cobalt/stand/boot/Makefile         |   4 ++--
 sys/arch/evbppc/conf/Makefile.obs405.inc    |   6 +++---
 sys/arch/ews4800mips/stand/boot/Makefile    |   4 ++--
 7 files changed, 19 insertions(+), 17 deletions(-)

diffs (155 lines):

diff -r b9119f8a3e97 -r bde9f8137768 distrib/common/bootimage/Makefile.bootimage
--- a/distrib/common/bootimage/Makefile.bootimage       Mon Jan 27 21:23:59 2014 +0000
+++ b/distrib/common/bootimage/Makefile.bootimage       Mon Jan 27 21:37:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootimage,v 1.7 2014/01/16 01:15:32 christos Exp $
+#      $NetBSD: Makefile.bootimage,v 1.8 2014/01/27 21:37:17 apb Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -390,7 +390,7 @@
 CLEANFILES+=   ${IMGBASE}.img.gz ${IMGBASE}.img.gz.tmp
 
 ${IMGBASE}.img.gz:     ${IMGBASE}.img
-       ${TOOL_GZIP} -9c ${IMGBASE}.img > ${.TARGET}.tmp
+       ${TOOL_GZIP} -9nc ${IMGBASE}.img > ${.TARGET}.tmp
        mv ${.TARGET}.tmp ${.TARGET}
 
 clean:
diff -r b9119f8a3e97 -r bde9f8137768 distrib/sets/Makefile
--- a/distrib/sets/Makefile     Mon Jan 27 21:23:59 2014 +0000
+++ b/distrib/sets/Makefile     Mon Jan 27 21:37:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.93 2014/01/27 08:18:07 apb Exp $
+#      $NetBSD: Makefile,v 1.94 2014/01/27 21:37:17 apb Exp $
 
 # Experimental RCS METALOG versioning
 # (Needs host's rcs(1) commands)
@@ -16,6 +16,7 @@
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 COMPRESS_PROGRAM=${TOOL_GZIP}
+GZIP_FLAGS= -n
 
 SETSENV=       DESTDIR=${DESTDIR:Q} \
                MACHINE=${MACHINE:Q} \
@@ -29,6 +30,7 @@
                MTREE=${TOOL_MTREE:Q} \
                PAX=${TOOL_PAX:Q} \
                COMPRESS_PROGRAM=${COMPRESS_PROGRAM:Q} \
+               GZIP=${GZIP_FLAGS:Q} \
                PKG_CREATE=${TOOL_PKG_CREATE:Q} \
                SED=${TOOL_SED:Q} \
                TSORT=${TSORT:Q}
diff -r b9119f8a3e97 -r bde9f8137768 etc/Makefile
--- a/etc/Makefile      Mon Jan 27 21:23:59 2014 +0000
+++ b/etc/Makefile      Mon Jan 27 21:37:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.411 2014/01/16 01:15:33 christos Exp $
+#      $NetBSD: Makefile,v 1.412 2014/01/27 21:37:17 apb Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -194,7 +194,7 @@
                cat ${NETBSDSRCDIR}/sys/conf/copyright; \
                echo ; \
                echo "Build settings:"; \
-               printf "%20s   %s\n"  "Build date" "$$(date -u)"; \
+               printf "%20s   %s\n" "Build date" "$$(date -u)"; \
                printf "%20s   %s\n"  "Built by" "$${USER-root}@$$(hostname)"; \
                echo ; \
                ${PRINT_PARAMS} ; \
@@ -580,7 +580,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=-9 ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
+       pax_cmd="COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=-9n ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
        cd $${kerndir} && { \
                kernels=; newest=; \
                for kernel in $${kernlist}; do \
@@ -625,8 +625,8 @@
                                knl_gz="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/$${kernel}-${configfile:C/.*\///}$${s}.gz"; \
                                [ $${knl_gz} -nt $${ks} ] && continue; \
                                rm -f $${knl_gz}; \
-                               echo "${TOOL_GZIP} -c -9 < $${kerndir}/$${ks} > $${knl_gz}"; \
-                               ${TOOL_GZIP} -c -9 < $${ks} > $${knl_gz}; \
+                               echo "${TOOL_GZIP} -nc -9 < $${kerndir}/$${ks} > $${knl_gz}"; \
+                               ${TOOL_GZIP} -nc -9 < $${ks} > $${knl_gz}; \
                        done; \
                done; \
        }
diff -r b9119f8a3e97 -r bde9f8137768 libexec/httpd/Makefile
--- a/libexec/httpd/Makefile    Mon Jan 27 21:23:59 2014 +0000
+++ b/libexec/httpd/Makefile    Mon Jan 27 21:37:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2014/01/27 08:18:08 apb Exp $
+#      $NetBSD: Makefile,v 1.19 2014/01/27 21:37:17 apb Exp $
 #
 #      $eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
 #
@@ -83,7 +83,7 @@
          find . -name .CVS | xargs rm -r; \
        ); \
        pax -wf ${TAR} ${BASE}; \
-       ${TOOL_GZIP} -c9 ${TAR} > ${TAR}.gz; \
+       ${TOOL_GZIP} -nc9 ${TAR} > ${TAR}.gz; \
        bzip2 -9 ${TAR}
        @echo "Exported two files:"
        @echo ${TAR}.gz
diff -r b9119f8a3e97 -r bde9f8137768 sys/arch/cobalt/stand/boot/Makefile
--- a/sys/arch/cobalt/stand/boot/Makefile       Mon Jan 27 21:23:59 2014 +0000
+++ b/sys/arch/cobalt/stand/boot/Makefile       Mon Jan 27 21:37:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.27 2014/01/16 01:15:33 christos Exp $
+#      $NetBSD: Makefile,v 1.28 2014/01/27 21:37:17 apb Exp $
 
 NOMAN= # defined
 
@@ -108,7 +108,7 @@
 ${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
        ${LD} ${LINKFORMAT} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
            -T ${LDSCRIPT} -e start -o ${PROG} ${OBJS} ${LIBS}
-       ${TOOL_GZIP} -c9 ${PROG} > ${PROG}.gz
+       ${TOOL_GZIP} -nc9 ${PROG} > ${PROG}.gz
        @${SIZE} ${PROG}
 
 CLEANFILES+=   ${PROG}.map ${PROG}.elf ${PROG}.gz
diff -r b9119f8a3e97 -r bde9f8137768 sys/arch/evbppc/conf/Makefile.obs405.inc
--- a/sys/arch/evbppc/conf/Makefile.obs405.inc  Mon Jan 27 21:23:59 2014 +0000
+++ b/sys/arch/evbppc/conf/Makefile.obs405.inc  Mon Jan 27 21:37:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.obs405.inc,v 1.8 2014/01/27 08:18:08 apb Exp $
+#      $NetBSD: Makefile.obs405.inc,v 1.9 2014/01/27 21:37:17 apb Exp $
 
 CFLAGS+=-mcpu=405
 AFLAGS+=-mcpu=405
@@ -55,8 +55,8 @@
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo ${OBJCOPY} -S -O binary $@ $@.bin; \
        ${OBJCOPY} -S -O binary $@ $@.bin; \
-       echo "${TOOL_GZIP} -c $@.bin > $@.bin.gz"; \
-       ${TOOL_GZIP} -c $@.bin > $@.bin.gz; \
+       echo "${TOOL_GZIP} -nc $@.bin > $@.bin.gz"; \
+       ${TOOL_GZIP} -nc $@.bin > $@.bin.gz; \
        echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
        ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
        echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
diff -r b9119f8a3e97 -r bde9f8137768 sys/arch/ews4800mips/stand/boot/Makefile
--- a/sys/arch/ews4800mips/stand/boot/Makefile  Mon Jan 27 21:23:59 2014 +0000
+++ b/sys/arch/ews4800mips/stand/boot/Makefile  Mon Jan 27 21:37:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2014/01/12 15:26:29 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.17 2014/01/27 21:37:17 apb Exp $
 
 WARNS          ?= 1
 NOMAN          =
@@ -140,7 +140,7 @@
            ${BINKERNEL_O}
        mv ${BOOT_KERNEL}.elf ${BOOT_KERNEL}
        ${OBJDUMP} -h ${BOOT_KERNEL}
-       ${TOOL_GZIP} -9c ${BOOT_KERNEL} > ${.TARGET}.tmp
+       ${TOOL_GZIP} -9nc ${BOOT_KERNEL} > ${.TARGET}.tmp
        mv ${.TARGET}.tmp ${.TARGET}
        ls -al ${.TARGET}
 



Home | Main Index | Thread Index | Old Index