From 2876d885a119a2647f2f0bddecbf8f78bdede0a8 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 24 May 2015 18:01:31 +0200
Subject: [PATCH 080/257] Fake modification time smarter for everything but
 EXTRA_PACKAGES (XXX)

While at it, remove duplicated slashes in the METALOG as they
result in missing files. XXX 2017-01: It's not clear if this is
still the case, but embedding duplicated slashes in the dist
files is also aesthetically unpleasing.

Mark two suspicious mtree spec modifications as such. XXX: investigate.

Obtained from: ElectroBSD
---
 Makefile.inc1    | 20 ++++++++++++++++++++
 release/Makefile |  6 +++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index fe506aed21dd..c27fefbe8ad1 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1019,6 +1019,14 @@ distributeworld installworld stageworld: _installcheck_world .PHONY
 	find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -type d -empty -delete
 .endfor
 .if defined(NO_ROOT)
+	@# Post process METALOG: add fake timestamps and, if necessary,
+	@# remove duplicated slashes which can occur if DISTDIR is undefined.
+	@# Keeping them results in missing files in the distribution tarballs.
+.if defined(EPOCH_DATE)
+	sed -E -e 's@time=[0-9\.]+@@' \
+	    -e 's@(type=)@uid=0 gid=0 time=${EPOCH_DATE}.0 \1@' \
+	    -e 's@//@/@g' -i '.bak' ${METALOG}
+.endif
 .for dist in base ${EXTRA_DISTRIBUTIONS}
 	@# For each file that exists in this dist, print the corresponding
 	@# line from the METALOG.  This relies on the fact that
@@ -1300,6 +1308,12 @@ distributekernel distributekernel.debug: .PHONY
 packagekernel: .PHONY
 .if defined(NO_ROOT)
 .if !defined(NO_INSTALLKERNEL)
+.if defined(EPOCH_DATE)
+# XXX: Is this really necessary given that we already modify the METALOG itself?
+	sed -E -e 's@time=[0-9\.]+@@' -e 's@(type=)@time=${EPOCH_DATE}.0 \1@' \
+	    -e 's@//@/@g' \
+	    -i '.bak' ${DESTDIR}/${DISTDIR}/kernel.meta
+.endif
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - --exclude '*.debug' \
 	    @${DESTDIR}/${DISTDIR}/kernel.meta | \
@@ -1311,6 +1325,12 @@ packagekernel: .PHONY
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
 .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
+# XXX: See XXX above
+.if defined(EPOCH_DATE)
+	sed -E -e 's@time=[0-9\.]+@@' -e 's@(type=)@time=${EPOCH_DATE}.0 \1@' \
+	    -e 's@//@/@g' \
+	    -i '.bak' ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
+.endif
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - --exclude '*.debug' \
 	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
diff --git a/release/Makefile b/release/Makefile
index 7fa748246b37..e227d19aa559 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -56,6 +56,10 @@ TARGET_ARCH=	${TARGET}
 IMAKE=		${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
 DISTDIR=	dist
 
+# Enable mtree spec usage so we can fake the modification time.
+NO_ROOT=1
+.export NO_ROOT
+
 # Define OSRELEASE by using newvars.sh
 .if !defined(OSRELEASE) || empty(OSRELEASE)
 .for _V in TYPE BRANCH REVISION
@@ -268,7 +272,7 @@ mini-memstick.img: bootonly
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh bootonly ${.TARGET}
 
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
-	for tarball in *.txz; do \
+	for tarball in ${EXTRA_PACKAGES}; do \
 	    sh ${.CURDIR}/scripts/tar-time-reset.sh $${tarball}; \
 	done
 	sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
-- 
2.11.0