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 href='/guix/log/gnu?id=6d13c785fc49171027b3baabab9c6fdb93dd422c'>gnu/packages/php.scm
AgeCommit message (Expand)Author
2024-09-29gnu: php: Update to 8.3.12....* gnu/packages/php.scm (php): Update to 8.3.12. Change-Id: Ic9c60659e8dad0d00958475dc283259eb3de4072 Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> Wilko Meyer
2024-09-05gnu: php: Disable tests relating to BICUBIC interpolation....* gnu/packages/php.scm (php)[arguments]: Delete three tests that are known to fail. Change-Id: Ib684328654c75f37111d252fb0f9fb3356daff9a Signed-off-by: Andreas Enge <andreas@enge.fr> Carlo Zancanaro
2024-09-05gnu: php: Fix check phase....* gnu/packages/php.scm (php): Add missing inputs. These should potentially be propagated by gd instead, see https://issues.guix.gnu.org/72968 Change-Id: I3ddc47e5ad121a8177e3a12c5dfe154a8d6029b6 Signed-off-by: Andreas Enge <andreas@enge.fr> Noé Lopez
2024-08-05gnu: php: Update to 8.3.10....* gnu/packages/php.scm (php): Update to 8.3.10. Change-Id: I75e5ee0afda02f7978f8aeeeb10deb4fa2510409 Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> Wilko Meyer
2024-07-18gnu: php: Update to 8.3.9....* gnu/packages/php.scm (php): Update to 8.3.9. Change-Id: Icdd41fff7fd89dd0116988acb0f7aa28c2e77ebe Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> Wilko Meyer
2024-06-29gnu: php: Update to 8.3.8....* gnu/packages/php.scm (php): Update to 8.3.8. Change-Id: Ia0714520973b537a82d12fb346f3efbadfc11e61 Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> Wilko Meyer
2024-04-26gnu: php: Update to 8.3.6....* gnu/packages/php.scm (php): Update to 8.3.6. Change-Id: I8f173558fc4098d6d72b42724e5e106d7dabb62a Signed-off-by: Christopher Baines <mail@cbaines.net> Wilko Meyer