From 052d24d8217c51c572c2f6cbb4a687be2e8ba52d Mon Sep 17 00:00:00 2001 From: Brice Waegeneire 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 r class='nohover'>AgeCommit message (Expand)Author 2024-12-12build: Fix detection of guile-ssh....Fixes <https://issues.guix.gnu.org/74800>. The check for make-session stopped working after update to 0.18.0. This commit adds the additional `#:config #f' to skip reading the ssh configuration, arguably we did not want to do that anyway. * m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Add `#:config #f' to make-session call. Change-Id: Id6ea3860292159ac2e6cf2a77df5f720f66aa071 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Reported-by: Dariqq <dariqq@posteo.net> Tomas Volf 2024-12-03gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd....On commit: ec8a5ec15f898e864705e5a5c834532e3fa8d0a4 gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. Run: ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs Producing: /gnu/store/w1n7bdpn88plcc49h7n0jriaj41sgwx8-bootstrap-tarballs-0/ With guix hash -r: 15cb1xh7s2hhp8s0d81bjnw1759w9sh7ckc9n5jq2f3rqw6z76by * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for x86_64-gnu. (%bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Add entry for x86_64-gnu. * guix/packages.scm (%supported-systems, %hurd-systems): Add x86_64-gnu. (%cuirass-supported-systems): Remove x86_64-gnu. * guix/utils.scm (target-64bit?): Add x86_64-gnu. * m4/guix.m4: Add x86_64-gnu as a supported system. * doc/guix.texi (GNU Distribution): Add x86_64-gnu. Change-Id: I828159aedb3f66caba98e935083cc3682429f219 Janneke Nieuwenhuizen 2023-11-07build: Fix spelling in m4 macros....* m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Fix spelling of parameter. (GUIX_CHECK_FILE_NAME_LIMITS): Fix spelling of maximum. Change-Id: I93c80441393622a4bc06daa475eee13874cca527 Efraim Flashner 2023-03-16build: Correct guix_system on musl libc distros....* m4/guix.m4 (GUIX_SYSTEM_TYPE): Add linux-musl* case. This prevents the macro from mis-parsing the host OS, which causes breakage when building from source. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Antero Mejr