Module Name: src Committed By: apb Date: Tue Aug 5 15:40:59 UTC 2014
Modified Files: src/distrib/alpha/floppy-GENERIC: Makefile src/distrib/alpha/rz25dist: Makefile src/distrib/cobalt: Makefile src/distrib/common: Makefile.image Makefile.mdset Makefile.minirootkmod Makefile.tarfloppy src/distrib/common/bootimage: Makefile.bootimage src/distrib/evbarm/gzboot/gzimg: Makefile src/distrib/ews4800mips/floppies/instkernel: Makefile src/distrib/prep/floppies/kernel-generic: Makefile src/distrib/rs6000/bootfs: Makefile src/distrib/sparc64/xminiroot: Makefile src/distrib/x68k/floppies/bootfloppy.generic: Makefile src/etc: Makefile src/external/mit/xorg/share/fonts: Makefile.bdf src/external/mit/xorg/share/fonts/encodings: Makefile.enc src/share/mk: bsd.man.mk src/sys/arch/cobalt/stand/boot: Makefile src/sys/arch/evbmips/conf: Makefile.evbmips.inc src/sys/arch/evbppc/conf: Makefile.obs405.inc src/sys/arch/ews4800mips/stand/boot: Makefile src/sys/arch/powerpc/conf: Makefile.powerpc src/x11/share/fonts/bdf: Makefile.bdf src/x11/share/fonts/encodings: Makefile.enc Log Message: Use ${TOOL_GZIP_N} instead of ${TOOL_GZIP} -n, and similarly use ${TOOL_GZIP_N} -9 instead of ${TOOL_GZIP} -9n, etc. This will pass -nT instead of just -n if the gzip program is actually pigz. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/distrib/alpha/floppy-GENERIC/Makefile cvs rdiff -u -r1.30 -r1.31 src/distrib/alpha/rz25dist/Makefile cvs rdiff -u -r1.4 -r1.5 src/distrib/cobalt/Makefile cvs rdiff -u -r1.33 -r1.34 src/distrib/common/Makefile.image cvs rdiff -u -r1.39 -r1.40 src/distrib/common/Makefile.mdset cvs rdiff -u -r1.2 -r1.3 src/distrib/common/Makefile.minirootkmod cvs rdiff -u -r1.17 -r1.18 src/distrib/common/Makefile.tarfloppy cvs rdiff -u -r1.8 -r1.9 src/distrib/common/bootimage/Makefile.bootimage cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/gzboot/gzimg/Makefile cvs rdiff -u -r1.5 -r1.6 src/distrib/ews4800mips/floppies/instkernel/Makefile cvs rdiff -u -r1.10 -r1.11 src/distrib/prep/floppies/kernel-generic/Makefile cvs rdiff -u -r1.2 -r1.3 src/distrib/rs6000/bootfs/Makefile cvs rdiff -u -r1.31 -r1.32 src/distrib/sparc64/xminiroot/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/distrib/x68k/floppies/bootfloppy.generic/Makefile cvs rdiff -u -r1.416 -r1.417 src/etc/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/share/fonts/Makefile.bdf cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/share/fonts/encodings/Makefile.enc cvs rdiff -u -r1.114 -r1.115 src/share/mk/bsd.man.mk cvs rdiff -u -r1.28 -r1.29 src/sys/arch/cobalt/stand/boot/Makefile cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/conf/Makefile.evbmips.inc cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/conf/Makefile.obs405.inc cvs rdiff -u -r1.18 -r1.19 src/sys/arch/ews4800mips/stand/boot/Makefile cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/conf/Makefile.powerpc cvs rdiff -u -r1.8 -r1.9 src/x11/share/fonts/bdf/Makefile.bdf cvs rdiff -u -r1.9 -r1.10 src/x11/share/fonts/encodings/Makefile.enc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/alpha/floppy-GENERIC/Makefile diff -u src/distrib/alpha/floppy-GENERIC/Makefile:1.21 src/distrib/alpha/floppy-GENERIC/Makefile:1.22 --- src/distrib/alpha/floppy-GENERIC/Makefile:1.21 Mon Jan 27 08:18:07 2014 +++ src/distrib/alpha/floppy-GENERIC/Makefile Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile,v 1.22 2014/08/05 15:40:58 apb Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -42,7 +42,7 @@ netbsd: ${FLOPPYKERNEL} @rm -f ${.TARGET} ${.TARGET}.tmp cp ${.ALLSRC} ${.TARGET}.tmp ${STRIP} ${.TARGET}.tmp - ${TOOL_GZIP} -9nf ${.TARGET}.tmp + ${TOOL_GZIP_N} -9f ${.TARGET}.tmp mv ${.TARGET}.tmp.gz ${.TARGET} CLEANFILES+= netbsd netbsd.tmp netbsd.tmp.gz Index: src/distrib/alpha/rz25dist/Makefile diff -u src/distrib/alpha/rz25dist/Makefile:1.30 src/distrib/alpha/rz25dist/Makefile:1.31 --- src/distrib/alpha/rz25dist/Makefile:1.30 Mon Jan 27 08:18:07 2014 +++ src/distrib/alpha/rz25dist/Makefile Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile,v 1.31 2014/08/05 15:40:58 apb Exp $ .include "../../../Makefile.inc" @@ -77,21 +77,21 @@ diskimage.gz: mount-fs build-fs unmount- umount ${DESTDIR}/usr ${DESTDIR} /bin/rm -f $@ dd if=/dev/r${DESTDISK}c bs=`expr ${SECPERCYL} \* 512` \ - count=${CYLS} | ${TOOL_GZIP} -9n > $@ + count=${CYLS} | ${TOOL_GZIP_N} -9 > $@ 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 | ${TOOL_GZIP} -9n) > $@ + grep -v '^./boot' | pax -w -d | ${TOOL_GZIP_N} -9) > $@ etc.tar.gz: mount-fs build-fs /bin/rm -f $@ - (cd ${DESTDIR} ; find ./etc | pax -w -d | ${TOOL_GZIP} -9n) > $@ + (cd ${DESTDIR} ; find ./etc | pax -w -d | ${TOOL_GZIP_N} -9) > $@ x11.tar.gz: mount-fs build-fs /bin/rm -f $@ - (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | ${TOOL_GZIP} -9n) > $@ + (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | ${TOOL_GZIP_N} -9) > $@ .endif Index: src/distrib/cobalt/Makefile diff -u src/distrib/cobalt/Makefile:1.4 src/distrib/cobalt/Makefile:1.5 --- src/distrib/cobalt/Makefile:1.4 Mon Jan 27 08:18:07 2014 +++ src/distrib/cobalt/Makefile Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile,v 1.5 2014/08/05 15:40:58 apb Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -9,7 +9,7 @@ SUBDIR= ramdisk .WAIT instkernel .WAIT TARGETS+= release release: check_RELEASEDIR .WAIT ${BOOT} - ${TOOL_GZIP} -9nc ${BOOT} \ + ${TOOL_GZIP_N} -9c ${BOOT} \ > ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/boot.gz iso_image: Index: src/distrib/common/Makefile.image diff -u src/distrib/common/Makefile.image:1.33 src/distrib/common/Makefile.image:1.34 --- src/distrib/common/Makefile.image:1.33 Mon Jan 27 08:18:07 2014 +++ src/distrib/common/Makefile.image Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.image,v 1.33 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile.image,v 1.34 2014/08/05 15:40:58 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 @@ fsimage: ${IMAGE} ${IMAGE}.gz: ${IMAGE} ${_MKTARGET_CREATE} -rm -f ${.TARGET} - ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET} + ${TOOL_GZIP_N} -9c ${.ALLSRC} > ${.TARGET} realall: ${IMAGE} Index: src/distrib/common/Makefile.mdset diff -u src/distrib/common/Makefile.mdset:1.39 src/distrib/common/Makefile.mdset:1.40 --- src/distrib/common/Makefile.mdset:1.39 Mon Jan 27 08:18:07 2014 +++ src/distrib/common/Makefile.mdset Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.mdset,v 1.39 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile.mdset,v 1.40 2014/08/05 15:40:58 apb Exp $ # # Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels # @@ -110,7 +110,7 @@ KERNELS+= ${_KERNEL.${_K}.${_F}}.${_S}.g ${_KERNEL.${_K}.${_F}}.${_S}.gz: ${_KERNEL.${_K}.${_F}}.${_S} ${_MKTARGET_CREATE} -rm -f ${.TARGET} - ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET} + ${TOOL_GZIP_N} -9c ${.ALLSRC} > ${.TARGET} .endif # } .endfor # } @@ -150,7 +150,7 @@ ${_KERNEL.${_K}.${_F}}: .NOTMAIN ${_KERN ${TOOL_MDSETIMAGE} ${MDSETIMAGEFLAGS} ${.TARGET}.tmp ${_I} .endif .if !defined(MDSET_NOSYMBOLS.${_FILENAME}) && !defined(MDSET_NOSYMBOLS) - ${NM} ${.TARGET}.tmp | ${TOOL_GZIP} -9n > ${.TARGET}.symbols.gz + ${NM} ${.TARGET}.tmp | ${TOOL_GZIP_N} -9 > ${.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 @@ KERNELS+= ${_KERNEL.${_K}.${_F}}.gz ${_KERNEL.${_K}.${_F}}.gz: ${_KERNEL.${_K}.${_F}} ${_MKTARGET_CREATE} -rm -f ${.TARGET} - ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET} + ${TOOL_GZIP_N} -9c ${.ALLSRC} > ${.TARGET} .endif # } .endif Index: src/distrib/common/Makefile.minirootkmod diff -u src/distrib/common/Makefile.minirootkmod:1.2 src/distrib/common/Makefile.minirootkmod:1.3 --- src/distrib/common/Makefile.minirootkmod:1.2 Mon Jan 27 08:18:07 2014 +++ src/distrib/common/Makefile.minirootkmod Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.minirootkmod,v 1.2 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile.minirootkmod,v 1.3 2014/08/05 15:40:58 apb Exp $ # # Makefile snippet to build a miniroot kernel module (e.g. miniroot.kmod) # @@ -46,7 +46,7 @@ ${MINIROOT}.kmod: ${RAMDISKFS} ${SRCMOD} ${OBJCOPY} --add-section miniroot=${RAMDISKFS} \ --set-section-flags miniroot=alloc,contents,load,data \ ${SRCMOD} ${DSTMOD}.tmp - ${TOOL_GZIP} -9nc < ${DSTMOD}.tmp > ${DSTMOD} + ${TOOL_GZIP_N} -9c < ${DSTMOD}.tmp > ${DSTMOD} rm -f ${DSTMOD}.tmp .include <bsd.prog.mk> Index: src/distrib/common/Makefile.tarfloppy diff -u src/distrib/common/Makefile.tarfloppy:1.17 src/distrib/common/Makefile.tarfloppy:1.18 --- src/distrib/common/Makefile.tarfloppy:1.17 Mon Jan 27 08:18:07 2014 +++ src/distrib/common/Makefile.tarfloppy Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.tarfloppy,v 1.17 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile.tarfloppy,v 1.18 2014/08/05 15:40:58 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,7 @@ boot.cfg: ${FLOPPY_BOOT_CFG} CLEANFILES+= netbsd netbsd.tmp .if ${FLOPPY_NETBSD:E}=="gz" COPY_CMD= gunzip -c ${.ALLSRC} > ${.TARGET}.tmp -COMPRESS_CMD= ${TOOL_GZIP} -9nc ${.TARGET}.tmp > ${.TARGET}; \ +COMPRESS_CMD= ${TOOL_GZIP_N} -9c ${.TARGET}.tmp > ${.TARGET}; \ rm -f ${.TARGET}.tmp .else COPY_CMD= cp ${.ALLSRC} ${.TARGET}.tmp Index: src/distrib/common/bootimage/Makefile.bootimage diff -u src/distrib/common/bootimage/Makefile.bootimage:1.8 src/distrib/common/bootimage/Makefile.bootimage:1.9 --- src/distrib/common/bootimage/Makefile.bootimage:1.8 Mon Jan 27 21:37:17 2014 +++ src/distrib/common/bootimage/Makefile.bootimage Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootimage,v 1.8 2014/01/27 21:37:17 apb Exp $ +# $NetBSD: Makefile.bootimage,v 1.9 2014/08/05 15:40:58 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} -9nc ${IMGBASE}.img > ${.TARGET}.tmp + ${TOOL_GZIP_N} -9c ${IMGBASE}.img > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} clean: Index: src/distrib/evbarm/gzboot/gzimg/Makefile diff -u src/distrib/evbarm/gzboot/gzimg/Makefile:1.26 src/distrib/evbarm/gzboot/gzimg/Makefile:1.27 --- src/distrib/evbarm/gzboot/gzimg/Makefile:1.26 Sat Mar 1 01:52:13 2014 +++ src/distrib/evbarm/gzboot/gzimg/Makefile Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2014/03/01 01:52:13 matt Exp $ +# $NetBSD: Makefile,v 1.27 2014/08/05 15:40:58 apb Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -76,12 +76,12 @@ GZIMGS+= gzimg_${I}_flash_${R}.gz gzimg_${I}_flash_${R}: .NOTMAIN ${GZB${G}} ${KERNOBJDIR}/${K}/${W}.bin @echo "Populating ${.TARGET}" -rm -f ${.TARGET}.kern.gz - ${TOOL_GZIP} -9nc ${KERNOBJDIR}/${K}/${W}.bin > ${.TARGET}.kern.gz + ${TOOL_GZIP_N} -9c ${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} - ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET} + ${TOOL_GZIP_N} -9c ${.ALLSRC} > ${.TARGET} CLEANFILES+= gzimg_${I}_flash_${R}.kern gzimg_${I}_flash_${R}.kern.gz \ gzimg_${I}_flash_${R} Index: src/distrib/ews4800mips/floppies/instkernel/Makefile diff -u src/distrib/ews4800mips/floppies/instkernel/Makefile:1.5 src/distrib/ews4800mips/floppies/instkernel/Makefile:1.6 --- src/distrib/ews4800mips/floppies/instkernel/Makefile:1.5 Mon Jan 27 08:18:07 2014 +++ src/distrib/ews4800mips/floppies/instkernel/Makefile Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile,v 1.6 2014/08/05 15:40:58 apb Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -20,7 +20,7 @@ ${BOOT_RAMDISK}.gz: netbsd-RAMDISK.gz ${ 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 - ${TOOL_GZIP} -9nc ${BOOT_RAMDISK}.coff > ${.TARGET} + ${TOOL_GZIP_N} -9c ${BOOT_RAMDISK}.coff > ${.TARGET} CLEANFILES+= ${BOOT_RAMDISK}.tmp ${BOOT_RAMDISK}.coff ${BOOT_RAMDISK}.gz Index: src/distrib/prep/floppies/kernel-generic/Makefile diff -u src/distrib/prep/floppies/kernel-generic/Makefile:1.10 src/distrib/prep/floppies/kernel-generic/Makefile:1.11 --- src/distrib/prep/floppies/kernel-generic/Makefile:1.10 Mon Jan 27 08:18:07 2014 +++ src/distrib/prep/floppies/kernel-generic/Makefile Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile,v 1.11 2014/08/05 15:40:58 apb Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -12,7 +12,7 @@ CLEANFILES+= ${KERNEL} ${KERNEL}: ${KERN} -rm -f ${.TARGET} - ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET} + ${TOOL_GZIP_N} -9c ${.ALLSRC} > ${.TARGET} realall: ${KERNEL} Index: src/distrib/rs6000/bootfs/Makefile diff -u src/distrib/rs6000/bootfs/Makefile:1.2 src/distrib/rs6000/bootfs/Makefile:1.3 --- src/distrib/rs6000/bootfs/Makefile:1.2 Mon Jan 27 08:18:07 2014 +++ src/distrib/rs6000/bootfs/Makefile Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile,v 1.3 2014/08/05 15:40:58 apb Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -16,10 +16,10 @@ TMPKERNEL= ${.OBJDIR}/netbsd BOOT_RELEASEDIR= installation/bootfs ${IMAGE}.gz: ${KERNEL} ${BOOTLOADER} - ${TOOL_GZIP} -cd ${KERNEL} > ${TMPKERNEL} + ${TOOL_GZIP_N} -cd ${KERNEL} > ${TMPKERNEL} ${TOOL_POWERPCMKBOOTIMAGE} -m ${MACHINE} \ -b ${BOOTLOADER} -k ${TMPKERNEL} ${IMAGE} - ${TOOL_GZIP} -9nc ${IMAGE} > ${IMAGE}.tmp + ${TOOL_GZIP_N} -9c ${IMAGE} > ${IMAGE}.tmp mv ${IMAGE}.tmp ${.TARGET} CLEANFILES+= ${IMAGE} ${IMAGE}.tmp ${IMAGE}.gz Index: src/distrib/sparc64/xminiroot/Makefile diff -u src/distrib/sparc64/xminiroot/Makefile:1.31 src/distrib/sparc64/xminiroot/Makefile:1.32 --- src/distrib/sparc64/xminiroot/Makefile:1.31 Tue May 27 19:04:29 2014 +++ src/distrib/sparc64/xminiroot/Makefile Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2014/05/27 19:04:29 palle Exp $ +# $NetBSD: Makefile,v 1.32 2014/08/05 15:40:58 apb Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -32,7 +32,7 @@ ${CRUNCHBIN}: ${CRUNCHBINDIR}/${CRUNCHBI netbsd.gz: ${KERNOBJDIR}/GENERIC/netbsd -rm -f ${.TARGET} - ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET} + ${TOOL_GZIP_N} -9c ${.ALLSRC} > ${.TARGET} clean: localclean Index: src/distrib/x68k/floppies/bootfloppy.generic/Makefile diff -u src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.8 src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.9 --- src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.8 Mon Jan 27 08:18:07 2014 +++ src/distrib/x68k/floppies/bootfloppy.generic/Makefile Tue Aug 5 15:40:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/01/27 08:18:07 apb Exp $ +# $NetBSD: Makefile,v 1.9 2014/08/05 15:40:58 apb Exp $ .include <bsd.own.mk> .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -28,7 +28,7 @@ ${BOOTNAME}: ${MDEC}/boot netbsd.gz: ${KERNOBJDIR}/GENERIC/netbsd @rm -f ${.TARGET} - ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET} + ${TOOL_GZIP_N} -9c ${.ALLSRC} > ${.TARGET} .include "${DISTRIBDIR}/common/Makefile.tarfloppy" Index: src/etc/Makefile diff -u src/etc/Makefile:1.416 src/etc/Makefile:1.417 --- src/etc/Makefile:1.416 Sun Aug 3 09:19:34 2014 +++ src/etc/Makefile Tue Aug 5 15:40:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.416 2014/08/03 09:19:34 apb Exp $ +# $NetBSD: Makefile,v 1.417 2014/08/05 15:40:59 apb Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -638,8 +638,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} -nc -9 < $${kerndir}/$${ks} > $${knl_gz}"; \ - ${TOOL_GZIP} -nc -9 < $${ks} > $${knl_gz}; \ + echo "${TOOL_GZIP_N} -c -9 < $${kerndir}/$${ks} > $${knl_gz}"; \ + ${TOOL_GZIP_N} -c -9 < $${ks} > $${knl_gz}; \ done; \ done; \ } Index: src/external/mit/xorg/share/fonts/Makefile.bdf diff -u src/external/mit/xorg/share/fonts/Makefile.bdf:1.3 src/external/mit/xorg/share/fonts/Makefile.bdf:1.4 --- src/external/mit/xorg/share/fonts/Makefile.bdf:1.3 Mon Jan 27 08:18:08 2014 +++ src/external/mit/xorg/share/fonts/Makefile.bdf Tue Aug 5 15:40:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bdf,v 1.3 2014/01/27 08:18:08 apb Exp $ +# $NetBSD: Makefile.bdf,v 1.4 2014/08/05 15:40:59 apb Exp $ # Font files built using this makefile are cleaned in two ways: # @@ -17,7 +17,7 @@ FILESDIR= ${X11FONTDIR}/${FONTSUBDIR} .PATH: ${X11SRCDIR.${FONTSRCPKG}} FONTSUFFIX= .gz -FONTGZIP= | ${TOOL_GZIP} ${GZIPLEVEL:U-9} -ncf +FONTGZIP= | ${TOOL_GZIP_N} ${GZIPLEVEL:U-9} -cf .include "${NETBSDSRCDIR}/external/mit/xorg/tools/bdftopcf/Makefile.bdftopcf" .include "${NETBSDSRCDIR}/external/mit/xorg/tools/ucs2any/Makefile.ucs2any" Index: src/external/mit/xorg/share/fonts/encodings/Makefile.enc diff -u src/external/mit/xorg/share/fonts/encodings/Makefile.enc:1.3 src/external/mit/xorg/share/fonts/encodings/Makefile.enc:1.4 --- src/external/mit/xorg/share/fonts/encodings/Makefile.enc:1.3 Mon Jan 27 08:18:08 2014 +++ src/external/mit/xorg/share/fonts/encodings/Makefile.enc Tue Aug 5 15:40:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.enc,v 1.3 2014/01/27 08:18:08 apb Exp $ +# $NetBSD: Makefile.enc,v 1.4 2014/08/05 15:40:59 apb Exp $ FILESDIR= ${X11FONTDIR}/${ENCDIR} @@ -9,7 +9,7 @@ CLEANFILES+= ${GZFILES:S/.gz$/.gz.tmp/} .SUFFIXES: .enc .enc.gz .enc.enc.gz: ${_MKTARGET_CREATE} - ${TOOL_GZIP} -9nfc ${.IMPSRC} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET} + ${TOOL_GZIP_N} -9fc ${.IMPSRC} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET} realall: ${FILES} Index: src/share/mk/bsd.man.mk diff -u src/share/mk/bsd.man.mk:1.114 src/share/mk/bsd.man.mk:1.115 --- src/share/mk/bsd.man.mk:1.114 Fri Oct 25 22:16:29 2013 +++ src/share/mk/bsd.man.mk Tue Aug 5 15:40:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.man.mk,v 1.114 2013/10/25 22:16:29 apb Exp $ +# $NetBSD: bsd.man.mk,v 1.115 2014/08/05 15:40:59 apb Exp $ # @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93 .include <bsd.init.mk> @@ -40,7 +40,7 @@ _MSECTIONREGEX= ${_MSECTIONS:ts|} # e.g. MANCOMPRESS?= MANSUFFIX?= .else -MANCOMPRESS?= ${TOOL_GZIP} -ncf +MANCOMPRESS?= ${TOOL_GZIP_N} -cf MANSUFFIX?= .gz .endif Index: src/sys/arch/cobalt/stand/boot/Makefile diff -u src/sys/arch/cobalt/stand/boot/Makefile:1.28 src/sys/arch/cobalt/stand/boot/Makefile:1.29 --- src/sys/arch/cobalt/stand/boot/Makefile:1.28 Mon Jan 27 21:37:17 2014 +++ src/sys/arch/cobalt/stand/boot/Makefile Tue Aug 5 15:40:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2014/01/27 21:37:17 apb Exp $ +# $NetBSD: Makefile,v 1.29 2014/08/05 15:40:59 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} -nc9 ${PROG} > ${PROG}.gz + ${TOOL_GZIP_N} -c9 ${PROG} > ${PROG}.gz @${SIZE} ${PROG} CLEANFILES+= ${PROG}.map ${PROG}.elf ${PROG}.gz Index: src/sys/arch/evbmips/conf/Makefile.evbmips.inc diff -u src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.5 src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.6 --- src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.5 Tue Aug 16 07:01:37 2011 +++ src/sys/arch/evbmips/conf/Makefile.evbmips.inc Tue Aug 5 15:40:59 2014 @@ -38,8 +38,8 @@ MKUBOOTIMAGEARGS+= -n "$(MACHINE) $ MKUBOOTIMAGEARGS+= -C gz SYSTEM_LD_TAIL_EXTRA+=; \ - echo ${TOOL_GZIP} -9cn $@.bin '>' $@.bin.gz; \ - ${TOOL_GZIP} -9cn $@.bin > $@.bin.gz; \ + echo ${TOOL_GZIP_N} -9c $@.bin '>' $@.bin.gz; \ + ${TOOL_GZIP_N} -9c $@.bin > $@.bin.gz; \ echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub; \ ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.11 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.12 --- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.11 Mon Mar 3 19:08:46 2014 +++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Tue Aug 5 15:40:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.obs405.inc,v 1.11 2014/03/03 19:08:46 joerg Exp $ +# $NetBSD: Makefile.obs405.inc,v 1.12 2014/08/05 15:40:59 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} -nc $@.bin > $@.bin.gz"; \ - ${TOOL_GZIP} -nc $@.bin > $@.bin.gz; \ + echo "${TOOL_GZIP_N} -c $@.bin > $@.bin.gz"; \ + ${TOOL_GZIP_N} -c $@.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.18 src/sys/arch/ews4800mips/stand/boot/Makefile:1.19 --- src/sys/arch/ews4800mips/stand/boot/Makefile:1.18 Fri Jan 31 19:25:14 2014 +++ src/sys/arch/ews4800mips/stand/boot/Makefile Tue Aug 5 15:40:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2014/01/31 19:25:14 tsutsui Exp $ +# $NetBSD: Makefile,v 1.19 2014/08/05 15:40:59 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} -9nc ${BOOT_KERNEL} > ${.TARGET}.tmp + ${TOOL_GZIP_N} -9c ${BOOT_KERNEL} > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} ls -al ${.TARGET} Index: src/sys/arch/powerpc/conf/Makefile.powerpc diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.54 src/sys/arch/powerpc/conf/Makefile.powerpc:1.55 --- src/sys/arch/powerpc/conf/Makefile.powerpc:1.54 Thu Mar 6 09:24:07 2014 +++ src/sys/arch/powerpc/conf/Makefile.powerpc Tue Aug 5 15:40:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.powerpc,v 1.54 2014/03/06 09:24:07 matt Exp $ +# $NetBSD: Makefile.powerpc,v 1.55 2014/08/05 15:40:59 apb Exp $ # # Makefile for NetBSD # @@ -120,8 +120,8 @@ MKUBOOTIMAGEARGS+= -a ${TEXTADDR:C/ MKUBOOTIMAGEARGS+= -n "NetBSD/$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))" SYSTEM_LD_TAIL_EXTRA+=; \ - echo ${TOOL_GZIP} -9cn $@.bin '>' $@.bin.gz; \ - ${TOOL_GZIP} -9cn $@.bin > $@.bin.gz; \ + echo ${TOOL_GZIP_N} -9c $@.bin '>' $@.bin.gz; \ + ${TOOL_GZIP_N} -9c $@.bin > $@.bin.gz; \ echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub; \ ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub Index: src/x11/share/fonts/bdf/Makefile.bdf diff -u src/x11/share/fonts/bdf/Makefile.bdf:1.8 src/x11/share/fonts/bdf/Makefile.bdf:1.9 --- src/x11/share/fonts/bdf/Makefile.bdf:1.8 Mon Jan 27 08:18:08 2014 +++ src/x11/share/fonts/bdf/Makefile.bdf Tue Aug 5 15:40:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bdf,v 1.8 2014/01/27 08:18:08 apb Exp $ +# $NetBSD: Makefile.bdf,v 1.9 2014/08/05 15:40:59 apb Exp $ # Font files built using this makefile are cleaned in two ways: # @@ -17,7 +17,7 @@ FILESDIR= ${X11FONTDIR}/${FONTSUBDIR} .PATH: ${X11SRCDIR.xc}/fonts/bdf/${FONTSUBDIR} FONTSUFFIX= .gz -FONTGZIP= | ${TOOL_GZIP} ${GZIPLEVEL:U-9} -ncf +FONTGZIP= | ${TOOL_GZIP_N} ${GZIPLEVEL:U-9} -cf .include "${NETBSDSRCDIR}/x11/tools/bdftopcf/Makefile.bdftopcf" .include "${NETBSDSRCDIR}/x11/tools/ucs2any/Makefile.ucs2any" Index: src/x11/share/fonts/encodings/Makefile.enc diff -u src/x11/share/fonts/encodings/Makefile.enc:1.9 src/x11/share/fonts/encodings/Makefile.enc:1.10 --- src/x11/share/fonts/encodings/Makefile.enc:1.9 Mon Jan 27 08:18:08 2014 +++ src/x11/share/fonts/encodings/Makefile.enc Tue Aug 5 15:40:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.enc,v 1.9 2014/01/27 08:18:08 apb Exp $ +# $NetBSD: Makefile.enc,v 1.10 2014/08/05 15:40:59 apb Exp $ FILESDIR= ${X11FONTDIR}/${ENCDIR} .PATH: ${X11SRCDIR.xc}/fonts/${ENCDIR} @@ -11,7 +11,7 @@ CLEANFILES+= ${GZFILES:S/.gz$/.gz.tmp/} .SUFFIXES: .enc .enc.gz .enc.enc.gz: ${_MKTARGET_CREATE} - ${TOOL_GZIP} -9nfc ${.IMPSRC} > ${.TARGET}.tmp \ + ${TOOL_GZIP_N} -9fc ${.IMPSRC} > ${.TARGET}.tmp \ && mv ${.TARGET}.tmp ${.TARGET}