From 7f303516f69a143c2ecc317948ec1934a195235c Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Tue, 14 Sep 2021 11:34:52 +0200 Subject: [PATCH] fs/iso9660: switch from cdrkit to xorriso to build ISO9660 images In order to add support for EFI-compatible ISO9660 images in future patches, this commit switch the ISO9660 logic to use xorriso instead of cdrkit. Indeed the genimageiso tool from cdrkit doesn't have the --efi-boot option needed to generate an image compatible with EFI BIOS. Signed-off-by: Kory Maincent [yann.morin.1998@free.fr: drop superfluous tool name from variable] Signed-off-by: Yann E. MORIN --- fs/iso9660/iso9660.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index a129655ce3..23421a9a5c 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -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 linux ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) ROOTFS_ISO9660_USE_INITRD = YES @@ -52,7 +52,7 @@ define ROOTFS_ISO9660_MKZFTREE $(ROOTFS_ISO9660_TMP_TARGET_DIR) endef ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_MKZFTREE -ROOTFS_ISO9660_GENISOIMAGE_OPTS += -z +ROOTFS_ISO9660_OPTS += -z else ROOTFS_ISO9660_TMP_TARGET_DIR = $(TARGET_DIR) endif @@ -129,9 +129,9 @@ ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD endif # ROOTFS_ISO9660_USE_INITRD define ROOTFS_ISO9660_CMD - $(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \ + $(HOST_DIR)/bin/xorriso -as mkisofs -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \ -no-emul-boot -boot-load-size 4 -boot-info-table \ - $(ROOTFS_ISO9660_GENISOIMAGE_OPTS) \ + $(ROOTFS_ISO9660_OPTS) \ -o $@ $(ROOTFS_ISO9660_TMP_TARGET_DIR) endef -- 2.30.2