Drop -isohybrid-apm-hfsplus add back ldlinux.e64 in the generated EFI image

debian/changelog

+live-build (3.0.5-1kali5) UNRELEASED; urgency=medium
+
+  * Drop -isohybrid-apm-hfsplus as recommended by Thomas Schmitt.
+  * And add back ldlinux.e64 in the generated EFI image.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Tue, 08 Jul 2014 14:54:40 +0200
+
 live-build (3.0.5-1kali4) kali; urgency=medium
 
   * Add the /usr/share/live/build/data/debian-cd/kali{,-dev} symlinks that

debian/patches/add-efi-support.patch

@@ -62,7 +62,7 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
 +	else
 +		Echo "Using newer EFI support in xorriso $XORRISO_VER"
 +		XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot -e boot/efi.img -no-emul-boot"
-+		XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-gpt-basdat -isohybrid-apm-hfsplus"
++		XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-gpt-basdat"
 +	fi
 +else
 +	Echo "No EFI boot code to include in the ISO"
@@ -71,9 +71,9 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
  #if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
  #then
  #	XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}"
---- /dev/null	2014-03-28 13:44:11.766963107 +0100
-+++ b/scripts/build/binary_efi	2014-03-28 17:24:05.689996188 +0100
-@@ -0,0 +1,253 @@
+--- /dev/null
++++ b/scripts/build/binary_efi
+@@ -0,0 +1,256 @@
 +#!/bin/sh
 +
 +## live-build(7) - System Build Scripts
@@ -245,12 +245,13 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
 +# Copy syslinux and its config files in the temporary EFI image
 +mkdir -p chroot/efi-temp/live
 +mkdir -p chroot/efi-temp/EFI/BOOT
-+for _F in $_CONFDIR/*.cfg $_CONFDIR/*.png $_SYSLINUX_EFI_DIR/*.*32; do
++for _F in $_CONFDIR/*.cfg $_CONFDIR/*.png $_SYSLINUX_EFI_DIR/*.*32 $_SYSLINUX_EFI_DIR/*.*64; do
 +	if [ -e $_F ]; then
 +		cp $_F chroot/efi-temp/EFI/BOOT/
 +	fi
 +done
 +cp $_SYSLINUX_EFI_DIR/syslinux.efi chroot/efi-temp/EFI/BOOT/BOOTX64.efi
++cp $_SYSLINUX_EFI_DIR/syslinux.efi chroot/efi-temp/EFI/BOOT/syslinux.efi
 +
 +# Copy the various kernel images
 +cp binary/live/vmlinuz* binary/live/initrd.img* chroot/efi-temp/live/
@@ -261,6 +262,8 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
 +# Edit the menu to differentiate the EFI version
 +if [ -e chroot/efi-temp/EFI/BOOT/menu.cfg ]; then
 +	sed -i -e "s/^menu title/menu title EFI/" chroot/efi-temp/EFI/BOOT/menu.cfg
++else
++        Echo "No menu.cfg file that can be edited to indicate that we boot on EFI!"
 +fi
 +
 +# Ensure we have a syslinux.cfg