From 52dec0288e10b7a5c8a5e84a3e7b7e06bc1c9795 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 15 Feb 2022 12:41:48 +0100 Subject: [PATCH] add reproducibility to isos --- usr/bin/archboot-aarch64-iso.sh | 2 ++ usr/bin/archboot-x86_64-iso.sh | 2 ++ usr/lib/archboot/iso_functions | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/usr/bin/archboot-aarch64-iso.sh b/usr/bin/archboot-aarch64-iso.sh index 6474e6c6c..c954a8697 100755 --- a/usr/bin/archboot-aarch64-iso.sh +++ b/usr/bin/archboot-aarch64-iso.sh @@ -13,7 +13,9 @@ _prepare_kernel_initramfs_files || exit 1 _prepare_fedora_shim_bootloaders_aarch64 || exit 1 _prepare_efitools_uefi || exit 1 _prepare_uefi_AA64_GRUB_USB_files || exit 1 +_reproducibility _prepare_uefi_image || exit 1 +_reproducibility _grub_mkrescue || exit 1 _create_cksum || exit 1 _cleanup_iso || exit 1 diff --git a/usr/bin/archboot-x86_64-iso.sh b/usr/bin/archboot-x86_64-iso.sh index 47ca4c07b..38784f317 100755 --- a/usr/bin/archboot-x86_64-iso.sh +++ b/usr/bin/archboot-x86_64-iso.sh @@ -15,7 +15,9 @@ _download_uefi_shell_tianocore || exit 1 _prepare_efitools_uefi || exit 1 _prepare_uefi_X64_GRUB_USB_files || exit 1 _prepare_uefi_IA32_GRUB_USB_files || exit 1 +_reproducibility _prepare_uefi_image || exit 1 +_reproducibility _grub_mkrescue || exit 1 _create_cksum || exit 1 _cleanup_iso || exit 1 diff --git a/usr/lib/archboot/iso_functions b/usr/lib/archboot/iso_functions index 07838a08e..7f5d92712 100644 --- a/usr/lib/archboot/iso_functions +++ b/usr/lib/archboot/iso_functions @@ -129,6 +129,12 @@ _prepare_uefi_AA64_GRUB_USB_files() { grub-mkstandalone -d /usr/lib/grub/arm64-efi -O arm64-efi --sbat=/usr/share/grub/sbat.csv --modules="all_video boot btrfs cat configfile cryptodisk echo efi_gop efifwsetup efinet ext2 f2fs fat font gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd chain tpm" --fonts="unicode" --locales="" --themes="" -o "${_ISODIR}/EFI/BOOT/grubaa64.efi" "boot/grub/grub.cfg=${_GRUB_CONFIG}" } +_reproducibility() { + # Reproducibility: set all timestamps to 0 + # from /usr/bin/mkinitcpio + find "${_ISODIR}" -mindepth 1 -execdir touch -hcd "@0" "{}" + +} + _prepare_uefi_image() { echo "Prepare UEFI image ..." ## get size of boot files