unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob ff6aa1da94f4cb1dee79253205ec81802da8ff78 2094 bytes (raw)
name: gnu/packages/patches/ipxe-reproducible-geniso.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
 
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

debug log:

solving ff6aa1da94 ...
found ff6aa1da94 in https://git.savannah.gnu.org/cgit/guix.git

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).