Module Name: src
Committed By: apb
Date: Mon Jan 27 21:37:17 UTC 2014
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
src/distrib/sets: Makefile
src/etc: Makefile
src/libexec/httpd: Makefile
src/sys/arch/cobalt/stand/boot: Makefile
src/sys/arch/evbppc/conf: Makefile.obs405.inc
src/sys/arch/ews4800mips/stand/boot: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/Makefile
cvs rdiff -u -r1.411 -r1.412 src/etc/Makefile
cvs rdiff -u -r1.18 -r1.19 src/libexec/httpd/Makefile
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/cobalt/stand/boot/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ews4800mips/stand/boot/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/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.7 src/distrib/common/bootimage/Makefile.bootimage:1.8
--- src/distrib/common/bootimage/Makefile.bootimage:1.7 Thu Jan 16 01:15:32 2014
+++ src/distrib/common/bootimage/Makefile.bootimage Mon Jan 27 21:37:17 2014
@@ -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 @@ ${IMGBASE}.img: ${TARGETFS} ${WORKLABEL}
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:
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.93 src/distrib/sets/Makefile:1.94
--- src/distrib/sets/Makefile:1.93 Mon Jan 27 08:18:07 2014
+++ src/distrib/sets/Makefile Mon Jan 27 21:37:17 2014
@@ -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 @@ all:
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
COMPRESS_PROGRAM=${TOOL_GZIP}
+GZIP_FLAGS= -n
SETSENV= DESTDIR=${DESTDIR:Q} \
MACHINE=${MACHINE:Q} \
@@ -29,6 +30,7 @@ SETSENV= DESTDIR=${DESTDIR:Q} \
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}
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.411 src/etc/Makefile:1.412
--- src/etc/Makefile:1.411 Thu Jan 16 01:15:33 2014
+++ src/etc/Makefile Mon Jan 27 21:37:17 2014
@@ -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 @@ etc-release: .EXEC .MAKE
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 @@ 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=-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 @@ releasekern-${configfile}: .PHONY build_
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; \
}
Index: src/libexec/httpd/Makefile
diff -u src/libexec/httpd/Makefile:1.18 src/libexec/httpd/Makefile:1.19
--- src/libexec/httpd/Makefile:1.18 Mon Jan 27 08:18:08 2014
+++ src/libexec/httpd/Makefile Mon Jan 27 21:37:17 2014
@@ -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 @@ export-distfile:
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
Index: src/sys/arch/cobalt/stand/boot/Makefile
diff -u src/sys/arch/cobalt/stand/boot/Makefile:1.27 src/sys/arch/cobalt/stand/boot/Makefile:1.28
--- src/sys/arch/cobalt/stand/boot/Makefile:1.27 Thu Jan 16 01:15:33 2014
+++ src/sys/arch/cobalt/stand/boot/Makefile Mon Jan 27 21:37:17 2014
@@ -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 @@ vers.c: ${.CURDIR}/version
${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
Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.8 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.9
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.8 Mon Jan 27 08:18:08 2014
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Mon Jan 27 21:37:17 2014
@@ -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 @@ MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEAR
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; \
Index: src/sys/arch/ews4800mips/stand/boot/Makefile
diff -u src/sys/arch/ews4800mips/stand/boot/Makefile:1.16 src/sys/arch/ews4800mips/stand/boot/Makefile:1.17
--- src/sys/arch/ews4800mips/stand/boot/Makefile:1.16 Sun Jan 12 15:26:29 2014
+++ src/sys/arch/ews4800mips/stand/boot/Makefile Mon Jan 27 21:37:17 2014
@@ -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 @@ ${BOOT_KERNEL}.gz: ${BINKERNEL_O} ${OBJS
${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}
