forked from public/airgap
1
0
Fork 0

tested deterministic xorriso options

This commit is contained in:
Lance Vick 2020-10-17 17:12:59 -07:00
parent 28ba130cea
commit a9020ee29d
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
1 changed files with 11 additions and 4 deletions

View File

@ -1,5 +1,5 @@
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..068d332876 100644 index a129655ce3..1adaf15923 100644
--- a/fs/iso9660/iso9660.mk --- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
@ -11,7 +11,7 @@ index a129655ce3..068d332876 100644
ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
ROOTFS_ISO9660_USE_INITRD = YES ROOTFS_ISO9660_USE_INITRD = YES
@@ -129,8 +129,14 @@ ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD @@ -129,10 +129,20 @@ 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
@ -19,12 +19,19 @@ index a129655ce3..068d332876 100644
- -no-emul-boot -boot-load-size 4 -boot-info-table \ - -no-emul-boot -boot-load-size 4 -boot-info-table \
+ $(HOST_DIR)/bin/xorriso \ + $(HOST_DIR)/bin/xorriso \
+ -as mkisofs \ + -as mkisofs \
+ -rock \ + -R \
+ -joliet \ + -joliet \
+ -eltorito-boot $(ROOTFS_ISO9660_BOOT_IMAGE) \ + -eltorito-boot $(ROOTFS_ISO9660_BOOT_IMAGE) \
+ -no-emul-boot \ + -no-emul-boot \
+ -boot-load-size 4 \ + -boot-load-size 4 \
+ -boot-info-table \ + -boot-info-table \
$(ROOTFS_ISO9660_GENISOIMAGE_OPTS) \ $(ROOTFS_ISO9660_GENISOIMAGE_OPTS) \
-o $@ $(ROOTFS_ISO9660_TMP_TARGET_DIR) - -o $@ $(ROOTFS_ISO9660_TMP_TARGET_DIR)
+ -o $@ $(ROOTFS_ISO9660_TMP_TARGET_DIR) \
+ -- \
+ -uid 0 \
+ -gid 0 \
+ -volume_date all_file_dates "=$(SOURCE_DATE_EPOCH)"
endef endef
ifeq ($(BR2_TARGET_ROOTFS_ISO9660_HYBRID),y)