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 class='content'>
AgeCommit message (Expand)Author
2017-11-08gnu: Improve error reporting of the use-.*modules macros....Suggested by Julien Lepiller and myglc2 at <https://lists.gnu.org/archive/html/guix-devel/2017-11/msg00106.html>. * gnu.scm (%try-use-modules): New procedure. (package-module-hint, service-module-hint): New procedures. (try-use-modules): New macro. (use-package-modules, use-service-modules, use-system-modules): Use it. * tests/guix-system.sh: Test it. Ludovic Courtès
2017-05-16bootloader: Add extlinux support....* gnu/bootloader.scm: New file. * gnu/bootloader/extlinux.scm: New file. * gnu/bootloader/grub.scm: New file. * gnu/local.mk: Build new files. * gnu/system.scm: Adapt to new bootloader api. * gnu/scripts/system.scm: Adapt to new bootloader api. * gnu.scm: Remove (gnu system grub) and replace by (gnu bootloader) and (gnu bootloader grub) modules. * gnu/system/grub.scm: Moved content to gnu/bootloader/grub.scm. * gnu/system/vm: Replace (gnu system grub) module by (gnu bootloader). * gnu/tests.scm: Ditto. * gnu/tests/nfs.scm: Ditto. Mathieu Othacehe
2016-04-18system: Add (gnu system mapped-devices)....* gnu/system/file-systems.scm (<mapped-device>, <mapped-device-type>): Move to... * gnu/system/mapped-devices.scm: ... here. New file. * gnu/system.scm, gnu/services/base.scm, gnu/system/linux-initrd.scm: Use it. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. * gnu.scm (%public-modules): Add it. Ludovic Courtès