[neon/forks/live-build/Neon/release_jammy] scripts/build: arm64 iso's cannot have -isohybrid-* options

[Carlos De Maine]

Git commit e7eeb88bec3d8672e72066f905f47812dc4615d3 by Carlos De Maine.
Committed on 20/05/2024 at 11:03.
Pushed by carlosdem into branch 'Neon/release_jammy'.

arm64 iso's cannot have -isohybrid-* options

as per https://wiki.debian.org/RepackBootableISO#arm64_release_9.4.0

arm64 live-build iso's cannot have -isohybrid-gpt-basdat -isohybrid-apm-hfsplus options as they don't exist on non amd64 architectures


(cherry picked from commit afd3da789bac67c202eff6b3ba8163e8d8704c5f)

M  +6    -2    scripts/build/lb_binary_iso

https://invent.kde.org/neon/forks/live-build/-/commit/e7eeb88bec3d8672e72066f905f47812dc4615d3

diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index 35b7aaf..1c96430 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -158,8 +158,12 @@ if [ -e binary/boot/grub/efi.img ];
 then
         Echo "Yes EFI boot code to include in the ISO"
         XORRISO_OPTIONS="-as mkisofs ${GENISOIMAGE_OPTIONS}"
-	XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot"
-	XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-gpt-basdat -isohybrid-apm-hfsplus"
+		XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot"
+		case "${LB_ARCHITECTURES}" in
+			amd64)
+				XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-gpt-basdat -isohybrid-apm-hfsplus"
+			;;
+		esac
 else
 	Echo "No EFI boot code to include in the ISO"
 fi