Module Name: src
Committed By: tls
Date: Sun Aug 10 06:47:57 UTC 2014
Modified Files:
src/distrib/common [tls-earlyentropy]: Makefile.bootcd Makefile.image
Makefile.mdset Makefile.minirootkmod Makefile.tarfloppy
list.sysinst list.sysinst.en
src/distrib/common/bootimage [tls-earlyentropy]: Makefile.bootimage
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.33 -r1.33.2.1 src/distrib/common/Makefile.image
cvs rdiff -u -r1.39 -r1.39.2.1 src/distrib/common/Makefile.mdset
cvs rdiff -u -r1.2 -r1.2.2.1 src/distrib/common/Makefile.minirootkmod
cvs rdiff -u -r1.17 -r1.17.2.1 src/distrib/common/Makefile.tarfloppy
cvs rdiff -u -r1.12 -r1.12.64.1 src/distrib/common/list.sysinst
cvs rdiff -u -r1.1 -r1.1.72.1 src/distrib/common/list.sysinst.en
cvs rdiff -u -r1.8 -r1.8.2.1 src/distrib/common/bootimage/Makefile.bootimage
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.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.24 src/distrib/common/Makefile.bootcd:1.24.2.1
--- src/distrib/common/Makefile.bootcd:1.24 Sat Feb 15 09:43:02 2014
+++ src/distrib/common/Makefile.bootcd Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.24 2014/02/15 09:43:02 dsl Exp $
+# $NetBSD: Makefile.bootcd,v 1.24.2.1 2014/08/10 06:47:57 tls Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -25,6 +25,7 @@
# BOOTXX_CD9660 Defaults to $DESTDIR/usr/mdec/bootxx_cd9660
# CDBOOTOPTIONS Options for installboot, eg -o console=com0,speed=9600
# CDMAKEFSOPTIONS Options for makefs, eg bootimage=i386;bootxx,no-emul-boot
+# CDMAKEFSEXTRAOPTS additional options for makefs, e.g. -F specfile
# CDROMS_RELEASEDIR Where to install ${CDBASE}.iso
# CDINSTKERNEL instkernel directory (relative to ${.CURDIR})
# CDKERNELS couples of the form:
@@ -206,7 +207,7 @@ copy-releasedir:
fi
image:
- ${TOOL_MAKEFS} -t cd9660 -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+ ${TOOL_MAKEFS} -t cd9660 ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
.if ${CDRELEASE} == false
release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post
Index: src/distrib/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.33 src/distrib/common/Makefile.image:1.33.2.1
--- src/distrib/common/Makefile.image:1.33 Mon Jan 27 08:18:07 2014
+++ src/distrib/common/Makefile.image Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.33 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile.image,v 1.33.2.1 2014/08/10 06:47:57 tls 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} -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} ${GZIP_FLAGS} -c ${.ALLSRC} > ${.TARGET}
realall: ${IMAGE}
@@ -121,7 +122,9 @@ CLEANFILES+= ${IMAGE} ${IMAGE}.gz ${IMAG
${IMAGETAR}: ${WORKBUILT} ${WORKSPEC} ${IMAGEDEPENDS}
${_MKTARGET_CREATE}
( cd ${WORKDIR}; \
- GZIP=-9n ${TOOL_PAX} -ON ${NETBSDSRCDIR}/etc -wdzM <${.OBJDIR}/${WORKSPEC} \
+ GZIP=${GZIP_FLAGS:Q} \
+ ${TOOL_PAX} --use-compress-program=${TOOL_GZIP:Q} \
+ -ON ${NETBSDSRCDIR}/etc -wdM <${.OBJDIR}/${WORKSPEC} \
) > ${.TARGET}.tmp \
&& mv ${.TARGET}.tmp ${.TARGET}
Index: src/distrib/common/Makefile.mdset
diff -u src/distrib/common/Makefile.mdset:1.39 src/distrib/common/Makefile.mdset:1.39.2.1
--- src/distrib/common/Makefile.mdset:1.39 Mon Jan 27 08:18:07 2014
+++ src/distrib/common/Makefile.mdset Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.39 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile.mdset,v 1.39.2.1 2014/08/10 06:47:57 tls 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.2.2.1
--- src/distrib/common/Makefile.minirootkmod:1.2 Mon Jan 27 08:18:07 2014
+++ src/distrib/common/Makefile.minirootkmod Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.minirootkmod,v 1.2 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile.minirootkmod,v 1.2.2.1 2014/08/10 06:47:57 tls 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.17.2.1
--- src/distrib/common/Makefile.tarfloppy:1.17 Mon Jan 27 08:18:07 2014
+++ src/distrib/common/Makefile.tarfloppy Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.tarfloppy,v 1.17 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile.tarfloppy,v 1.17.2.1 2014/08/10 06:47:57 tls 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/list.sysinst
diff -u src/distrib/common/list.sysinst:1.12 src/distrib/common/list.sysinst:1.12.64.1
--- src/distrib/common/list.sysinst:1.12 Sat Aug 27 15:42:56 2005
+++ src/distrib/common/list.sysinst Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: list.sysinst,v 1.12 2005/08/27 15:42:56 xtraeme Exp $
+# $NetBSD: list.sysinst,v 1.12.64.1 2014/08/10 06:47:57 tls Exp $
#
# list file (c.f. parselist.awk) for sysinst-using install media.
#
@@ -8,7 +8,7 @@
PROG sysinst
PROG usr/bin/progress
-SPECIAL sysinst srcdir distrib/utils/sysinst/arch/${MACHINE}
+SPECIAL sysinst srcdir usr.sbin/sysinst/arch/${MACHINE}
# Foreign texts for sysinst
COPY ${OBJDIR}/sysinst/sysinstmsgs.fr sysinstmsgs.fr
Index: src/distrib/common/list.sysinst.en
diff -u src/distrib/common/list.sysinst.en:1.1 src/distrib/common/list.sysinst.en:1.1.72.1
--- src/distrib/common/list.sysinst.en:1.1 Sun Apr 18 20:04:26 2004
+++ src/distrib/common/list.sysinst.en Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: list.sysinst.en,v 1.1 2004/04/18 20:04:26 dsl Exp $
+# $NetBSD: list.sysinst.en,v 1.1.72.1 2014/08/10 06:47:57 tls Exp $
#
# list file (c.f. parselist.awk) for sysinst-using install media.
#
@@ -8,4 +8,4 @@
PROG sysinst
PROG usr/bin/progress
-SPECIAL sysinst srcdir distrib/utils/sysinst/arch/${MACHINE}
+SPECIAL sysinst srcdir usr.sbin/sysinst/arch/${MACHINE}
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.8 src/distrib/common/bootimage/Makefile.bootimage:1.8.2.1
--- src/distrib/common/bootimage/Makefile.bootimage:1.8 Mon Jan 27 21:37:17 2014
+++ src/distrib/common/bootimage/Makefile.bootimage Sun Aug 10 06:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.8 2014/01/27 21:37:17 apb Exp $
+# $NetBSD: Makefile.bootimage,v 1.8.2.1 2014/08/10 06:47:57 tls 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:
