Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Use ${TOOL_GZIP} instead of just gzip in all Makefiles
details: https://anonhg.NetBSD.org/src/rev/82b98de004f0
branches: trunk
changeset: 793104:82b98de004f0
user: apb <apb%NetBSD.org@localhost>
date: Mon Jan 27 08:18:07 2014 +0000
description:
Use ${TOOL_GZIP} instead of just gzip in all Makefiles
outside */dist/* subdirectories.
When USE_PIGZGZIP=yes, bsd.own.mk sets TOOL_GZIP=${TOOL_PIGZ},
so there's no need to test USE_PIGZGZIP in these Makefiles.
diffstat:
distrib/alpha/floppy-GENERIC/Makefile | 4 ++--
distrib/alpha/rz25dist/Makefile | 10 +++++-----
distrib/cobalt/Makefile | 5 +++--
distrib/common/Makefile.image | 4 ++--
distrib/common/Makefile.mdset | 8 ++++----
distrib/common/Makefile.minirootkmod | 4 ++--
distrib/common/Makefile.tarfloppy | 5 +++--
distrib/evbarm/gzboot/gzimg/Makefile | 6 +++---
distrib/ews4800mips/floppies/instkernel/Makefile | 4 ++--
distrib/prep/floppies/bootfloppy-common/Makefile.inc | 4 ++--
distrib/prep/floppies/kernel-generic/Makefile | 4 ++--
distrib/rs6000/bootfs/Makefile | 6 +++---
distrib/sets/Makefile | 8 ++------
distrib/sparc64/xminiroot/Makefile | 4 ++--
distrib/x68k/floppies/bootfloppy.generic/Makefile | 4 ++--
etc/etc.cats/Makefile.inc | 4 ++--
external/mit/xorg/share/fonts/Makefile.bdf | 4 ++--
external/mit/xorg/share/fonts/encodings/Makefile.enc | 4 ++--
lib/libc/time/Makefile | 4 ++--
libexec/httpd/Makefile | 4 ++--
sys/arch/evbppc/conf/Makefile.obs405.inc | 6 +++---
x11/share/fonts/bdf/Makefile.bdf | 4 ++--
x11/share/fonts/encodings/Makefile.enc | 5 +++--
23 files changed, 57 insertions(+), 58 deletions(-)
diffs (truncated from 466 to 300 lines):
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/alpha/floppy-GENERIC/Makefile
--- a/distrib/alpha/floppy-GENERIC/Makefile Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/alpha/floppy-GENERIC/Makefile Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/04/03 22:36:34 perry Exp $
+# $NetBSD: Makefile,v 1.21 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -42,7 +42,7 @@
@rm -f ${.TARGET} ${.TARGET}.tmp
cp ${.ALLSRC} ${.TARGET}.tmp
${STRIP} ${.TARGET}.tmp
- gzip -9nf ${.TARGET}.tmp
+ ${TOOL_GZIP} -9nf ${.TARGET}.tmp
mv ${.TARGET}.tmp.gz ${.TARGET}
CLEANFILES+= netbsd netbsd.tmp netbsd.tmp.gz
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/alpha/rz25dist/Makefile
--- a/distrib/alpha/rz25dist/Makefile Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/alpha/rz25dist/Makefile Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/04/03 22:36:34 perry Exp $
+# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $
.include "../../../Makefile.inc"
@@ -77,21 +77,21 @@
umount ${DESTDIR}/usr ${DESTDIR}
/bin/rm -f $@
dd if=/dev/r${DESTDISK}c bs=`expr ${SECPERCYL} \* 512` \
- count=${CYLS} | gzip -9n > $@
+ count=${CYLS} | ${TOOL_GZIP} -9n > $@
bin.tar.gz: mount-fs build-fs
/bin/rm -f $@
(cd ${DESTDIR} ; find . | grep -v '^./etc' | \
grep -v '^./usr/X11R6' | grep -v '^./netbsd' | \
- grep -v '^./boot' | pax -w -d | gzip -9n) > $@
+ grep -v '^./boot' | pax -w -d | ${TOOL_GZIP} -9n) > $@
etc.tar.gz: mount-fs build-fs
/bin/rm -f $@
- (cd ${DESTDIR} ; find ./etc | pax -w -d | gzip -9n) > $@
+ (cd ${DESTDIR} ; find ./etc | pax -w -d | ${TOOL_GZIP} -9n) > $@
x11.tar.gz: mount-fs build-fs
/bin/rm -f $@
- (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | gzip -9n) > $@
+ (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | ${TOOL_GZIP} -9n) > $@
.endif
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/cobalt/Makefile
--- a/distrib/cobalt/Makefile Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/cobalt/Makefile Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/03 22:36:34 perry Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,7 +9,8 @@
TARGETS+= release
release: check_RELEASEDIR .WAIT ${BOOT}
- gzip -9nc ${BOOT} > ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/boot.gz
+ ${TOOL_GZIP} -9nc ${BOOT} \
+ > ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/boot.gz
iso_image:
${MAKEDIRTARGET} cdroms iso_image
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/common/Makefile.image
--- a/distrib/common/Makefile.image Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/common/Makefile.image Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.32 2013/05/24 21:34:19 christos Exp $
+# $NetBSD: Makefile.image,v 1.33 2014/01/27 08:18:07 apb Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -103,7 +103,7 @@
${IMAGE}.gz: ${IMAGE}
${_MKTARGET_CREATE}
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
realall: ${IMAGE}
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/common/Makefile.mdset
--- a/distrib/common/Makefile.mdset Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/common/Makefile.mdset Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.38 2013/08/15 12:39:28 joerg Exp $
+# $NetBSD: Makefile.mdset,v 1.39 2014/01/27 08:18:07 apb Exp $
#
# Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels
#
@@ -110,7 +110,7 @@
${_KERNEL.${_K}.${_F}}.${_S}.gz: ${_KERNEL.${_K}.${_F}}.${_S}
${_MKTARGET_CREATE}
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
.endif # }
.endfor # }
@@ -150,7 +150,7 @@
${TOOL_MDSETIMAGE} ${MDSETIMAGEFLAGS} ${.TARGET}.tmp ${_I}
.endif
.if !defined(MDSET_NOSYMBOLS.${_FILENAME}) && !defined(MDSET_NOSYMBOLS)
- ${NM} ${.TARGET}.tmp | gzip -9n > ${.TARGET}.symbols.gz
+ ${NM} ${.TARGET}.tmp | ${TOOL_GZIP} -9n > ${.TARGET}.symbols.gz
.endif
.if !defined(MDSET_NOSTRIP.${_FILENAME}) && !defined(MDSET_NOSTRIP)
${STRIP} -R .eh_frame -R .eh_frame_hdr -R .comment -R .ident ${.TARGET}.tmp
@@ -168,7 +168,7 @@
${_KERNEL.${_K}.${_F}}.gz: ${_KERNEL.${_K}.${_F}}
${_MKTARGET_CREATE}
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
.endif # }
.endif
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/common/Makefile.minirootkmod
--- a/distrib/common/Makefile.minirootkmod Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/common/Makefile.minirootkmod Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.minirootkmod,v 1.1 2012/10/16 08:19:36 apb Exp $
+# $NetBSD: Makefile.minirootkmod,v 1.2 2014/01/27 08:18:07 apb Exp $
#
# Makefile snippet to build a miniroot kernel module (e.g. miniroot.kmod)
#
@@ -46,7 +46,7 @@
${OBJCOPY} --add-section miniroot=${RAMDISKFS} \
--set-section-flags miniroot=alloc,contents,load,data \
${SRCMOD} ${DSTMOD}.tmp
- gzip -9nc < ${DSTMOD}.tmp > ${DSTMOD}
+ ${TOOL_GZIP} -9nc < ${DSTMOD}.tmp > ${DSTMOD}
rm -f ${DSTMOD}.tmp
.include <bsd.prog.mk>
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/common/Makefile.tarfloppy
--- a/distrib/common/Makefile.tarfloppy Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/common/Makefile.tarfloppy Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.tarfloppy,v 1.16 2009/04/03 22:36:35 perry Exp $
+# $NetBSD: Makefile.tarfloppy,v 1.17 2014/01/27 08:18:07 apb Exp $
#
# Makefile snippet to create a set of ustar floppies.
# Each floppy has an 8KB header, followed by part or all of the ustar archive.
@@ -54,7 +54,8 @@
CLEANFILES+= netbsd netbsd.tmp
.if ${FLOPPY_NETBSD:E}=="gz"
COPY_CMD= gunzip -c ${.ALLSRC} > ${.TARGET}.tmp
-COMPRESS_CMD= gzip -9nc ${.TARGET}.tmp > ${.TARGET}; rm -f ${.TARGET}.tmp
+COMPRESS_CMD= ${TOOL_GZIP} -9nc ${.TARGET}.tmp > ${.TARGET}; \
+ rm -f ${.TARGET}.tmp
.else
COPY_CMD= cp ${.ALLSRC} ${.TARGET}.tmp
COMPRESS_CMD= mv -f ${.TARGET}.tmp ${.TARGET}
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/evbarm/gzboot/gzimg/Makefile
--- a/distrib/evbarm/gzboot/gzimg/Makefile Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/evbarm/gzboot/gzimg/Makefile Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/01/30 13:47:36 he Exp $
+# $NetBSD: Makefile,v 1.25 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -76,12 +76,12 @@
gzimg_${I}_flash_${R}: .NOTMAIN ${GZB${G}} ${KERNOBJDIR}/${K}/${W}.bin
@echo "Populating ${.TARGET}"
-rm -f ${.TARGET}.kern.gz
- gzip -9nc ${KERNOBJDIR}/${K}/${W}.bin > ${.TARGET}.kern.gz
+ ${TOOL_GZIP} -9nc ${KERNOBJDIR}/${K}/${W}.bin > ${.TARGET}.kern.gz
${TOOL_CAT} ${GZB${G}} ${.TARGET}.kern.gz > ${.TARGET}
gzimg_${I}_flash_${R}.gz: .NOTMAIN gzimg_${I}_flash_${R}
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
CLEANFILES+= gzimg_${I}_flash_${R}.kern gzimg_${I}_flash_${R}.kern.gz \
gzimg_${I}_flash_${R}
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/ews4800mips/floppies/instkernel/Makefile
--- a/distrib/ews4800mips/floppies/instkernel/Makefile Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/ews4800mips/floppies/instkernel/Makefile Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/03 22:36:35 perry Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -20,7 +20,7 @@
gunzip -c ${DESTDIR}/usr/mdec/boot_kernel.gz > ${BOOT_RAMDISK}.tmp
${TOOL_MDSETIMAGE} ${BOOT_RAMDISK}.tmp netbsd-RAMDISK.gz
${ELF2ECOFF} ${BOOT_RAMDISK}.tmp ${BOOT_RAMDISK}.coff
- gzip -9nc ${BOOT_RAMDISK}.coff > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${BOOT_RAMDISK}.coff > ${.TARGET}
CLEANFILES+= ${BOOT_RAMDISK}.tmp ${BOOT_RAMDISK}.coff ${BOOT_RAMDISK}.gz
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/prep/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/prep/floppies/bootfloppy-common/Makefile.inc Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/prep/floppies/bootfloppy-common/Makefile.inc Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2008/06/23 02:16:54 matt Exp $
+# $NetBSD: Makefile.inc,v 1.13 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,7 +12,7 @@
TMPKERNEL= ${.OBJDIR}/netbsd
${IMAGE}: ${KERNEL}
- gzip -cd ${KERNEL} > ${TMPKERNEL}
+ ${TOOL_GZIP} -cd ${KERNEL} > ${TMPKERNEL}
${TOOL_POWERPCMKBOOTIMAGE} -m ${MACHINE} -b ${BOOTLOADER} \
-k ${TMPKERNEL} ${.TARGET}
-rm -f ${TMPKERNEL}
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/prep/floppies/kernel-generic/Makefile
--- a/distrib/prep/floppies/kernel-generic/Makefile Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/prep/floppies/kernel-generic/Makefile Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/04/03 22:36:35 perry Exp $
+# $NetBSD: Makefile,v 1.10 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,7 +12,7 @@
${KERNEL}: ${KERN}
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
realall: ${KERNEL}
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/rs6000/bootfs/Makefile
--- a/distrib/rs6000/bootfs/Makefile Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/rs6000/bootfs/Makefile Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/04/30 12:47:39 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,10 +16,10 @@
BOOT_RELEASEDIR= installation/bootfs
${IMAGE}.gz: ${KERNEL} ${BOOTLOADER}
- gzip -cd ${KERNEL} > ${TMPKERNEL}
+ ${TOOL_GZIP} -cd ${KERNEL} > ${TMPKERNEL}
${TOOL_POWERPCMKBOOTIMAGE} -m ${MACHINE} \
-b ${BOOTLOADER} -k ${TMPKERNEL} ${IMAGE}
- gzip -9nc ${IMAGE} > ${IMAGE}.tmp
+ ${TOOL_GZIP} -9nc ${IMAGE} > ${IMAGE}.tmp
mv ${IMAGE}.tmp ${.TARGET}
CLEANFILES+= ${IMAGE} ${IMAGE}.tmp ${IMAGE}.gz
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/sets/Makefile
--- a/distrib/sets/Makefile Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/sets/Makefile Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2014/01/23 21:45:27 apb Exp $
+# $NetBSD: Makefile,v 1.93 2014/01/27 08:18:07 apb Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -15,11 +15,7 @@
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-.if ${USE_PIGZGZIP} != "no"
-COMPRESS_PROGRAM=${TOOL_PIGZ:Q}
-.else
-COMPRESS_PROGRAM=gzip
-.endif
+COMPRESS_PROGRAM=${TOOL_GZIP}
SETSENV= DESTDIR=${DESTDIR:Q} \
MACHINE=${MACHINE:Q} \
diff -r 8a6baee42d9b -r 82b98de004f0 distrib/sparc64/xminiroot/Makefile
--- a/distrib/sparc64/xminiroot/Makefile Mon Jan 27 07:57:28 2014 +0000
+++ b/distrib/sparc64/xminiroot/Makefile Mon Jan 27 08:18:07 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2010/03/12 23:07:13 martin Exp $
+# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -23,7 +23,7 @@
netbsd.gz: ${KERNOBJDIR}/GENERIC/netbsd
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
Home |
Main Index |
Thread Index |
Old Index