From 052d24d8217c51c572c2f6cbb4a687be2e8ba52d Mon Sep 17 00:00:00 2001
From: Brice Waegeneire <brice@waegenei.re>
Date: Fri, 5 Jun 2020 14:38:43 +0200
Subject: [PATCH] [geniso] Make it reproducible

Some timestamps get embedded in the generated ISO, making it
unreproducible so we overwrite those timestamps to be at the UNIX epoch.
---
 src/util/geniso | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/util/geniso b/src/util/geniso
index ff090d4a..e032ffb0 100755
--- a/src/util/geniso
+++ b/src/util/geniso
@@ -11,6 +11,13 @@ function help() {
 	echo " -o FILE  save iso image to file"
 }
 
+function reset_timestamp() {
+	for f in "$1"/*; do
+		touch -t 197001010100 "$f"
+	done
+	touch -t 197001010100 "$1"
+}
+
 LEGACY=0
 FIRST=""
 
@@ -37,8 +44,9 @@ if [ -z "${OUT}" ]; then
 	exit 1
 fi
 
-# There should either be mkisofs or the compatible genisoimage program
-for command in genisoimage mkisofs; do
+# There should either be mkisofs, xorriso or the compatible genisoimage
+# program
+for command in xorriso genisoimage mkisofs; do
 	if ${command} --version >/dev/null 2>/dev/null; then
 		mkisofs=(${command})
 		break
@@ -46,8 +54,10 @@ for command in genisoimage mkisofs; do
 done
 
 if [ -z "${mkisofs}" ]; then
-	echo "${0}: mkisofs or genisoimage not found, please install or set PATH" >&2
+	echo "${0}: mkisofs, xorriso or genisoimage not found, please install or set PATH" >&2
 	exit 1
+elif [ "$mkisofs" = "xorriso" ]; then
+	 mkisofs+=(-as mkisofs)
 fi
 
 dir=$(mktemp -d bin/iso.dir.XXXXXX)
@@ -115,6 +125,8 @@ case "${LEGACY}" in
 			exit 1
 		fi
 
+		reset_timestamp "$dir"
+
 		# generate the iso image
 		"${mkisofs[@]}" -b boot.img -output ${OUT} ${dir}
 		;;
@@ -127,6 +139,12 @@ case "${LEGACY}" in
 			cp ${LDLINUX_C32} ${dir}
 		fi
 
+		reset_timestamp "$dir"
+
+		if [ "${mkisofs[0]}" = "xorriso" ]; then
+			mkisofs+=(-isohybrid-mbr "$SYSLINUX_MBR_DISK_PATH")
+		fi
+
 		# generate the iso image
 		"${mkisofs[@]}" -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -output ${OUT} ${dir}
 
-- 
2.26.2
guix/log/tests?id=1e6bd256a3d52e41719dbcd8ea5c0e90b187a738'>tests</a>/<a href='/guix/log/tests/challenge.scm?id=1e6bd256a3d52e41719dbcd8ea5c0e90b187a738'>challenge.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/challenge.scm?id=1e6bd256a3d52e41719dbcd8ea5c0e90b187a738&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-01-16 11:51:03 +0000'>2021-01-16</span></td><td><a href='/guix/commit/tests/challenge.scm?id=681af17460fa34916ac40589cccdcca7222249af'>guix: Move narinfo code from substitute script to module.</a><span class='msg-avail'>...</span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2020-05-22 01:29:39 +0200'>2020-05-22</span></td><td><a href='/guix/commit/tests/challenge.scm?id=ce0be5675b702b2ff89aed1772ebb42af4150243'>packages: Introduce &lt;content-hash&gt; and use it in &lt;origin&gt;.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-12-12 17:56:58 +0100'>2019-12-12</span></td><td><a href='/guix/commit/tests/challenge.scm?id=828a39da68a9169ef1d9f9ff02a1c66b1bcbe884'>challenge: Support "--diff=diffoscope".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-12-12 17:56:58 +0100'>2019-12-12</span></td><td><a href='/guix/commit/tests/challenge.scm?id=5208db3a526e3fcdb8473d9bab8afe498c5f3f76'>challenge: Add "--diff".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>