Module Name: src
Committed By: christos
Date: Sat Feb 11 03:07:06 UTC 2017
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
src/distrib/cdrom: Makefile
src/distrib/common: Makefile.bootcd Makefile.image Makefile.tarfloppy
buildfloppies.sh
src/distrib/common/bootimage: Makefile.bootimage
src/distrib/evbarm/instkernel/sshramdisk: Makefile
src/distrib/vax/floppy: Makefile
src/distrib/x68k/stand: Makefile
Log Message:
more MKREPRO_TIMESTAMP fixes (for pax/tar generated files)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.50 -r1.51 src/distrib/cdrom/Makefile
cvs rdiff -u -r1.36 -r1.37 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.39 -r1.40 src/distrib/common/Makefile.image
cvs rdiff -u -r1.18 -r1.19 src/distrib/common/Makefile.tarfloppy
cvs rdiff -u -r1.17 -r1.18 src/distrib/common/buildfloppies.sh
cvs rdiff -u -r1.14 -r1.15 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.12 -r1.13 src/distrib/evbarm/instkernel/sshramdisk/Makefile
cvs rdiff -u -r1.13 -r1.14 src/distrib/vax/floppy/Makefile
cvs rdiff -u -r1.9 -r1.10 src/distrib/x68k/stand/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/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.3 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.4
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.3 Fri Feb 10 11:53:51 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Fri Feb 10 22:07:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.3 2017/02/10 16:53:51 christos Exp $
+# $NetBSD: Makefile.bootimage,v 1.4 2017/02/11 03:07:06 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -138,6 +138,7 @@
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
.endif
.if empty(IMGBASE)
@@ -260,7 +261,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
false; \
fi
@echo Extracting ${set}.tgz ...
- @(cd ${WORKDIR}; ${TOOL_PAX} -rnz -f ${SETS_DIR}/${set}.tgz .)
+ @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.tgz .)
.endfor
.if defined(SECONDARY_BOOT)
@echo Copying secondary boot...
@@ -303,7 +304,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
fi
${MKDIR} ${MKDIRPERM} ${WORKDIR}/${_TARGET}
(cd ${_SRCDIR} ; \
- ${TOOL_PAX} -rw -pe -v \
+ ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pe -v \
${IMGDIR_EXCLUDE} \
. ${.OBJDIR}/${WORKDIR}/${_TARGET} )
.endfor
Index: src/distrib/cdrom/Makefile
diff -u src/distrib/cdrom/Makefile:1.50 src/distrib/cdrom/Makefile:1.51
--- src/distrib/cdrom/Makefile:1.50 Mon Mar 31 07:25:47 2014
+++ src/distrib/cdrom/Makefile Fri Feb 10 22:07:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2014/03/31 11:25:47 martin Exp $
+# $NetBSD: Makefile,v 1.51 2017/02/11 03:07:06 christos Exp $
#
# Consult "*.conf" for the configuration variables; this Makefile is typically
# not edited for basic configuration changes.
@@ -12,6 +12,10 @@ all: cdimages
.include "site.conf"
.endif
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
+.endif
+
.if !defined(RELEASE)
.BEGIN:
@echo "Please set RELEASE in the environment or in site.conf to the basename"
@@ -377,7 +381,8 @@ USE-FILE: .USE
cp `pwd -P`/${>:S/,link$//} $@;; \
*.tgz,*) \
echo "Extracting: $> --> $@..."; \
- ${TOOL_PAX} -rnz -f ${>:C/,.*$//} ${>:C/^.*,//} ; \
+ ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz \
+ -f ${>:C/,.*$//} ${>:C/^.*,//} ; \
cp ${>:C/^.*,//} $@; rm -rf ${>:C/^.*,//} ;; \
*.gz) echo "gunzip -c <$> >$@"; gunzip -c <$> >$@;; \
*) echo "Unknown archive method for $@"; false;; \
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.36 src/distrib/common/Makefile.bootcd:1.37
--- src/distrib/common/Makefile.bootcd:1.36 Fri Feb 10 11:43:59 2017
+++ src/distrib/common/Makefile.bootcd Fri Feb 10 22:07:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.36 2017/02/10 16:43:59 christos Exp $
+# $NetBSD: Makefile.bootcd,v 1.37 2017/02/11 03:07:06 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -76,6 +76,7 @@ _CDMAKEFSOPTIONS= rockridge,label=${ISO_
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
.endif
.if ${MKUNPRIVED} == "no"
@@ -181,7 +182,7 @@ copy-releasedir:
release_destdir="${CUROBJDIR}/cdrom/${MACHINE}"; \
cd ${RELEASEDIR}/${RELEASEMACHINEDIR}; \
echo Copying $$(pwd) to $$release_destdir ...; \
- ${TOOL_PAX} \
+ ${TOOL_PAX} ${PAX_TIMESTAMP} \
-rw -pe ${PAX_v} \
${CDRELEASE_EXCLUDE} \
. $$release_destdir; \
@@ -196,7 +197,7 @@ copy-releasedir:
release_destdir="${CUROBJDIR}/cdrom/source"; \
cd ${RELEASEDIR}/source; \
echo Copying $$(pwd) to $$release_destdir ...; \
- ${TOOL_PAX} \
+ ${TOOL_PAX} ${PAX_TIMESTAMP} \
-rw -pe ${PAX_v} \
. $$release_destdir; \
cd "${CUROBJDIR}"; \
@@ -207,7 +208,8 @@ copy-releasedir:
cd ${DESTDIR}; \
for cde in ${CDRUNTIME}; \
do \
- ${TOOL_PAX} -rw -pp ${PAX_v} $${cde} $$release_destdir;\
+ ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${PAX_v} \
+ $${cde} $$release_destdir; \
done; \
cd "${CUROBJDIR}"; \
fi
@@ -234,8 +236,9 @@ copy-releasedir:
cd $${cde}; \
echo Copying $$(pwd) to $$release_destdir ...; \
${TOOL_MTREE} -c $${skipflag} | \
- ${TOOL_PAX} -rw -pe ${PAX_v} -M \
- $$release_destdir; \
+ ${TOOL_PAX} ${PAX_TIMESTAMP} \
+ -rw -pe ${PAX_v} \
+ -M $$release_destdir; \
else \
echo "Missing $${cde}, aborting"; \
exit 1; \
Index: src/distrib/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.39 src/distrib/common/Makefile.image:1.40
--- src/distrib/common/Makefile.image:1.39 Sun Dec 20 17:47:59 2015
+++ src/distrib/common/Makefile.image Fri Feb 10 22:07:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.39 2015/12/20 22:47:59 christos Exp $
+# $NetBSD: Makefile.image,v 1.40 2017/02/11 03:07:06 christos Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -43,6 +43,7 @@ GZIP_FLAGS= -9 ${GZIP_N_FLAG}
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
.endif
.if !target(${WORKBUILT}) # {
@@ -131,7 +132,7 @@ ${IMAGETAR}: ${WORKBUILT} ${WORKSPEC} ${
${_MKTARGET_CREATE}
( cd ${WORKDIR}; \
GZIP=${GZIP_FLAGS:Q} \
- ${TOOL_PAX} --use-compress-program=${TOOL_GZIP:Q} \
+ ${TOOL_PAX} ${PAX_TIMESTAMP} --use-compress-program=${TOOL_GZIP:Q} \
-ON ${NETBSDSRCDIR}/etc -wdM <${.OBJDIR}/${WORKSPEC} \
) > ${.TARGET}.tmp \
&& mv ${.TARGET}.tmp ${.TARGET}
Index: src/distrib/common/Makefile.tarfloppy
diff -u src/distrib/common/Makefile.tarfloppy:1.18 src/distrib/common/Makefile.tarfloppy:1.19
--- src/distrib/common/Makefile.tarfloppy:1.18 Tue Aug 5 11:40:58 2014
+++ src/distrib/common/Makefile.tarfloppy Fri Feb 10 22:07:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.tarfloppy,v 1.18 2014/08/05 15:40:58 apb Exp $
+# $NetBSD: Makefile.tarfloppy,v 1.19 2017/02/11 03:07:06 christos 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.
@@ -82,7 +82,7 @@ ${FLOPPYBASE}1${FLOPPYSUFFIX}: ${FLOPPYF
PAX=${TOOL_PAX:Q} ${HOST_SH} ${DISTRIBDIR}/common/buildfloppies.sh \
${FLOPPYINSTBOOT:D-i ${FLOPPYINSTBOOT}} ${FLOPPYPAD:D-p} \
${FLOPPYMAX:D-m ${FLOPPYMAX}} ${FLOPPYSUFFIX:D-s ${FLOPPYSUFFIX}} \
- -N ${DESTDIR}/etc \
+ ${MKREPRO_TIMESTAMP:D-t ${MKREPRO_TIMESTAMP}} -N ${DESTDIR}/etc \
${FLOPPYBASE} ${FLOPPYSIZE} ${FLOPPYFILES}
CLEANFILES+= ${FLOPPYBASE}?${FLOPPYSUFFIX}
Index: src/distrib/common/buildfloppies.sh
diff -u src/distrib/common/buildfloppies.sh:1.17 src/distrib/common/buildfloppies.sh:1.18
--- src/distrib/common/buildfloppies.sh:1.17 Wed Nov 12 09:22:16 2008
+++ src/distrib/common/buildfloppies.sh Fri Feb 10 22:07:06 2017
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: buildfloppies.sh,v 1.17 2008/11/12 14:22:16 apb Exp $
+# $NetBSD: buildfloppies.sh,v 1.18 2017/02/11 03:07:06 christos Exp $
#
# Copyright (c) 2002-2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -48,6 +48,7 @@ Usage: ${prog} [options] base size file
-N etcdir directory in which to find passwd and group files.
-p pad last floppy to floppy size
-s suffix suffix for floppies
+ -t timestamp set timestamp for reproducible builds
base basename of generated floppies
size size of a floppy in 512 byte blocks
file [...] file(s) to store in the floppies
@@ -69,7 +70,7 @@ roundup()
# parse and check arguments
#
-while getopts i:m:N:ps: opt; do
+while getopts i:m:N:ps:t: opt; do
case ${opt} in
i)
instboot=${OPTARG} ;;
@@ -81,6 +82,8 @@ while getopts i:m:N:ps: opt; do
pad=1 ;;
s)
suffix=${OPTARG} ;;
+ t)
+ timestamp="--timestamp ${OPTARG}" ;;
\?|*)
usage
;;
@@ -109,7 +112,7 @@ dd if=/dev/zero of=${floppy} bs=8k count
echo "./$f type=file uname=root gname=wheel mode=0444"
done
) | \
-${PAX} -O -w -b8k -M -N "${etcdir}" -s,^./,, >> ${floppy} || exit 1
+${PAX} ${timestamp} -O -w -b8k -M -N "${etcdir}" -s,^./,, >> ${floppy} || exit 1
# install bootstrap before the image is split into multiple disks
#
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.14 src/distrib/common/bootimage/Makefile.bootimage:1.15
--- src/distrib/common/bootimage/Makefile.bootimage:1.14 Fri Feb 10 11:43:59 2017
+++ src/distrib/common/bootimage/Makefile.bootimage Fri Feb 10 22:07:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.14 2017/02/10 16:43:59 christos Exp $
+# $NetBSD: Makefile.bootimage,v 1.15 2017/02/11 03:07:06 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -129,6 +129,8 @@
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
+.endif
.endif
.if empty(IMGBASE)
@@ -235,7 +237,7 @@ ${TARGETFS}: prepare_md_post
false; \
fi
@echo Extracting ${set}.tgz ...
- @(cd ${WORKDIR}; ${TOOL_PAX} -rnz -f ${SETS_DIR}/${set}.tgz .)
+ @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.tgz .)
.endfor
.if defined(SECONDARY_BOOT)
@echo Copying secondary boot...
@@ -257,7 +259,7 @@ ${TARGETFS}: prepare_md_post
fi
${MKDIR} ${MKDIRPERM} ${WORKDIR}/${_TARGET}
(cd ${_SRCDIR} ; \
- ${TOOL_PAX} -rw -pe -v \
+ ${TOOL_PAX} -rw -pe -v ${PAX_TIMESTAMP} \
${IMGDIR_EXCLUDE} \
. ${.OBJDIR}/${WORKDIR}/${_TARGET} )
.endfor
Index: src/distrib/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.12 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.13
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.12 Tue Jan 24 13:04:02 2017
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri Feb 10 22:07:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/01/24 18:04:02 christos Exp $
+# $NetBSD: Makefile,v 1.13 2017/02/11 03:07:06 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -7,6 +7,11 @@ IMAGE= sshramdisk.fs
IMAGESIZE= 20000k
MAKEFS_FLAGS+= -f 15
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
+.endif
+
WARNS= 1
DBG= -Os
@@ -24,7 +29,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-IMAGEPREBUILD= ${TOOL_PAX} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
+IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP{ -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
Index: src/distrib/vax/floppy/Makefile
diff -u src/distrib/vax/floppy/Makefile:1.13 src/distrib/vax/floppy/Makefile:1.14
--- src/distrib/vax/floppy/Makefile:1.13 Sun Jun 22 22:16:54 2008
+++ src/distrib/vax/floppy/Makefile Fri Feb 10 22:07:06 2017
@@ -1,10 +1,15 @@
-# $NetBSD: Makefile,v 1.13 2008/06/23 02:16:54 matt Exp $
+# $NetBSD: Makefile,v 1.14 2017/02/11 03:07:06 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
+.endif
+
INSTKERNOBJ!= cd ${.CURDIR}/../ramdisk-kernel && ${PRINTOBJDIR}
IMAGE= boot.fs
@@ -24,7 +29,7 @@ boot.vax: ${DESTDIR}/usr/mdec/boot
${IMAGE}: ${IMAGEDEPENDS}
cat ${XXBOOT} > ${IMAGE}.tmp
- ${TOOL_PAX} -O -w -x ustar boot.vax netbsd.gz | dd of=${IMAGE}.tmp seek=16
+ ${TOOL_PAX} ${PAX_TIMESTAMP} -O -w -x ustar boot.vax netbsd.gz | dd of=${IMAGE}.tmp seek=16
dd if=${IMAGE}.tmp of=${IMAGE} bs=${IMAGESIZE} conv=sync
release: check_RELEASEDIR .WAIT ${IMAGE}
Index: src/distrib/x68k/stand/Makefile
diff -u src/distrib/x68k/stand/Makefile:1.9 src/distrib/x68k/stand/Makefile:1.10
--- src/distrib/x68k/stand/Makefile:1.9 Tue Jan 21 20:03:10 2014
+++ src/distrib/x68k/stand/Makefile Fri Feb 10 22:07:06 2017
@@ -1,8 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2014/01/22 01:03:10 christos Exp $
+# $NetBSD: Makefile,v 1.10 2017/02/11 03:07:06 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
+.endif
+
ARCHIVES= gzip rawrite
MEMBER_gzip= gz124x5f.lzh gzip.x
MEMBER_rawrite= rawrite.doc rawrite.lzh rawrite.x
@@ -15,7 +20,7 @@ CLEANFILES+= ${MEMBER_${archive}}
realall: ${UUDECODE_FILES}
.for archive in ${UUDECODE_FILES}
- ${TOOL_PAX} -O -zrvpp -f ${archive}
+ ${TOOL_PAX} ${PAX_TIMESTAMP} -O -zrvpp -f ${archive}
.endfor
release:
