scjudd
/
airgap
forked from public/airgap
1
0
Fork 0
Code Pull Requests Activity

swap buggy/broken genisofs for maintained xorriso

This commit is contained in:
Lance Vick 2020-10-17 15:37:12 -07:00
parent d0e04eeb90
commit 28ba130cea
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/buildroot/configs/airgap_x86_64_defconfig
View File

@ -3437,7 +3437,7 @@ BR2_PACKAGE_PROVIDES_HOST_RUSTC="host-rust-bin"
BR2_PACKAGE_HOST_UTIL_LINUX=y BR2_PACKAGE_HOST_UTIL_LINUX=y
# BR2_PACKAGE_HOST_UTP_COM is not set # BR2_PACKAGE_HOST_UTP_COM is not set
# BR2_PACKAGE_HOST_VBOOT_UTILS is not set # BR2_PACKAGE_HOST_VBOOT_UTILS is not set
# BR2_PACKAGE_HOST_XORRISO is not set BR2_PACKAGE_HOST_XORRISO=y
# BR2_PACKAGE_HOST_ZIP is not set # BR2_PACKAGE_HOST_ZIP is not set
# BR2_PACKAGE_HOST_ZSTD is not set # BR2_PACKAGE_HOST_ZSTD is not set

24
config/buildroot/patches/deterministic-iso9660.patch
View File

@ -1,16 +1,30 @@
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index a129655ce3..7cda68f7fb 100644 index a129655ce3..068d332876 100644
--- a/fs/iso9660/iso9660.mk --- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk
@@ -129,8 +129,9 @@ ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD @@ -24,7 +24,7 @@
ROOTFS_ISO9660_BOOT_MENU = $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
-ROOTFS_ISO9660_DEPENDENCIES = host-cdrkit linux
+ROOTFS_ISO9660_DEPENDENCIES = host-xorriso host-cdrkit linux
ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
ROOTFS_ISO9660_USE_INITRD = YES
@@ -129,8 +129,14 @@ ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD
endif # ROOTFS_ISO9660_USE_INITRD endif # ROOTFS_ISO9660_USE_INITRD
define ROOTFS_ISO9660_CMD define ROOTFS_ISO9660_CMD
- $(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \ - $(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
- -no-emul-boot -boot-load-size 4 -boot-info-table \ - -no-emul-boot -boot-load-size 4 -boot-info-table \
+LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 \ + $(HOST_DIR)/bin/xorriso \
+ $(HOST_DIR)/bin/genisoimage -J -r -b $(ROOTFS_ISO9660_BOOT_IMAGE) \ + -as mkisofs \
+ -no-cache-inodes -no-emul-boot -boot-load-size 4 -boot-info-table \ + -rock \
+ -joliet \
+ -eltorito-boot $(ROOTFS_ISO9660_BOOT_IMAGE) \
+ -no-emul-boot \
+ -boot-load-size 4 \
+ -boot-info-table \
$(ROOTFS_ISO9660_GENISOIMAGE_OPTS) \ $(ROOTFS_ISO9660_GENISOIMAGE_OPTS) \
-o $@ $(ROOTFS_ISO9660_TMP_TARGET_DIR) -o $@ $(ROOTFS_ISO9660_TMP_TARGET_DIR)
endef endef

1
scripts/environment
View File

@ -13,4 +13,3 @@ export BUILDROOT_REPO=git://git.busybox.net/buildroot
export HEADS_REPO=https://source.puri.sm/coreboot/purism-heads.git export HEADS_REPO=https://source.puri.sm/coreboot/purism-heads.git
export FAKETIME="@${GIT_DATETIME?}" export FAKETIME="@${GIT_DATETIME?}"
export SOURCE_DATE_EPOCH="${GIT_EPOCH?}" export SOURCE_DATE_EPOCH="${GIT_EPOCH?}"
export ROOTFS_ISO9660_GENISOIMAGE_OPTS="-creation-date=${GIT_EPOCH} "