From 6ea92b0aed7e5b6d8f86d419cf79e30abdf1473f Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 17 Nov 2019 19:09:49 +0100 Subject: [PATCH] Drop support for xorriso versions before 1.2.2 --- debian/changelog | 3 +++ tools/boot/bullseye/boot-x86 | 18 ++---------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a067887..58e70506 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ debian-cd (3.1.28) UNRELEASED; urgency=medium * Add a "with firmware" text to the DISKINFO string when appropriate Closes: #944207 + [ Samuel Thibault ] + * Drop support for xorriso versions before 1.2.2 + -- Holger Levsen Wed, 23 Oct 2019 18:06:41 +0200 debian-cd (3.1.27) unstable; urgency=medium diff --git a/tools/boot/bullseye/boot-x86 b/tools/boot/bullseye/boot-x86 index 15c5961a..26a8b394 100644 --- a/tools/boot/bullseye/boot-x86 +++ b/tools/boot/bullseye/boot-x86 @@ -503,22 +503,8 @@ if [ -d boot$N/isolinux/grub ] && [ $BOOT_EFI -ne 0 ] ; then add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-eltorito-alt-boot" fi - # Ugh - different code here depending on the version of xorriso we've got - if [ $XORRISO_VER -le 10202 ] ; then - # 1.2.2 shipping in Wheezy - echo " Using older EFI command line for xorriso $XORRISO_VER" - - add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--efi-boot boot/grub/efi.img" - # Add the efi image as a FAT partition too, so our CD image will - # also boot on a USB key (like isohybrid, just implemented - # differently) - add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-append_partition 2 0x01 $CDDIR/boot/grub/efi.img" - - elif [ $XORRISO_VER -gt 10202 ] ; then - echo " Using newer EFI support in xorriso $XORRISO_VER" - add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-e boot/grub/efi.img -no-emul-boot" - add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-isohybrid-gpt-basdat -isohybrid-apm-hfsplus" - fi + add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-e boot/grub/efi.img -no-emul-boot" + add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-isohybrid-gpt-basdat -isohybrid-apm-hfsplus" else echo " No EFI boot code for $ARCH on CD$N" fi