Module Name: src
Committed By: christos
Date: Wed Nov 25 00:50:57 UTC 2015
Modified Files:
src/distrib/common: Makefile.bootcd
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
PR/50360: Thomas Klausner: if MKREPRO is set, provide a consistent timestamp
for the files in the cdroms to be built. For now we copy the timestamp of
<sys/param.h>. We could set an absolute timestamp too like -T 0 for the epoch.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.11 -r1.12 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.32 src/distrib/common/Makefile.bootcd:1.33
--- src/distrib/common/Makefile.bootcd:1.32 Fri May 29 02:28:50 2015
+++ src/distrib/common/Makefile.bootcd Tue Nov 24 19:50:57 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.32 2015/05/29 06:28:50 martin Exp $
+# $NetBSD: Makefile.bootcd,v 1.33 2015/11/25 00:50:57 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -74,6 +74,10 @@ _CDMAKEFSOPTIONS= rockridge,label=${ISO_
_CDMAKEFSOPTIONS= rockridge,label=${ISO_VOLID},publisher=${PUBLISHER}
.endif
+.if ${MKREPRO:Uno} == "yes"
+TIMESTAMP=-T ${NETBSDSRCDIR}/sys/sys/param.h
+.endif
+
.if ${MKUNPRIVED} == "no"
CD_METALOG.unpriv=
mtunpriv=
@@ -281,7 +285,7 @@ image:
.endif
if [ -s ${WORKSPEC} ]; then specarg="-F ${WORKSPEC}"; fi; \
${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 $${specarg} \
- ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+ ${TIMESTAMP} ${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/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.11 src/distrib/common/bootimage/Makefile.bootimage:1.12
--- src/distrib/common/bootimage/Makefile.bootimage:1.11 Fri May 8 13:46:03 2015
+++ src/distrib/common/bootimage/Makefile.bootimage Tue Nov 24 19:50:57 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.11 2015/05/08 17:46:03 riastradh Exp $
+# $NetBSD: Makefile.bootimage,v 1.12 2015/11/25 00:50:57 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -127,6 +127,10 @@
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+.if ${MKREPRO:Uno} == "yes"
+TIMESTAMP=-T ${NETBSDSRCDIR}/sys/sys/param.h
+.endif
+
.if empty(IMGBASE)
.BEGIN:
@echo "Error: IMGBASE is not set"
@@ -292,6 +296,7 @@ ${TARGETFS}: prepare_md_post
${TOOL_MAKEFS} -M ${FSSIZE} -m ${FSSIZE} \
-B ${TARGET_ENDIANNESS} \
-F ${WORKSPEC} -N ${WORKDIR}/etc \
+ ${TIMESTAMP} \
${IMGMAKEFSOPTIONS} \
${WORKFS} ${WORKDIR}
.if !empty(PRIMARY_BOOT) && ${INSTALLBOOT_AFTER_DISKLABEL} == "no"
