Fix EFI patch to properly include syslinux "libraries" which are now in a...

Fix EFI patch to properly include syslinux "libraries" which are now in a separate path from syslinux.efi.

debian/changelog

+live-build (4.0.4-1kali3) kali-dev; urgency=medium
+
+  * Fix EFI patch to properly include syslinux "libraries" which
+    are now in a separate path from syslinux.efi.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Tue, 03 Feb 2015 15:44:04 +0100
+
 live-build (4.0.4-1kali2) kali-dev; urgency=medium
 
   * Better handle empty package lists (second try).

debian/patches/Add-support-for-EFI-boot-with-syslinux-efi.patch

@@ -11,8 +11,6 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
  3 files changed, 318 insertions(+)
  create mode 100644 scripts/build/binary_efi
 
-diff --git a/scripts/build/binary b/scripts/build/binary
-index c1f9ec6..b893988 100755
 --- a/scripts/build/binary
 +++ b/scripts/build/binary
 @@ -69,6 +69,9 @@ lb binary_loadlin ${@}
@@ -25,12 +23,9 @@ index c1f9ec6..b893988 100755
  lb binary_checksums ${@}
  
  if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]
-diff --git a/scripts/build/binary_efi b/scripts/build/binary_efi
-new file mode 100644
-index 0000000..f98a5bf
 --- /dev/null
 +++ b/scripts/build/binary_efi
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,282 @@
 +#!/bin/sh
 +
 +## live-build(7) - System Build Scripts
@@ -148,6 +143,7 @@ index 0000000..f98a5bf
 +	true)
 +		_CHROOT_DIR=""
 +		_SYSLINUX_EFI_DIR="chroot/usr/lib/SYSLINUX.EFI/$_EFI_TYPE"
++		_SYSLINUX_COMMON_DIR="chroot/usr/lib/syslinux/modules/$_EFI_TYPE"
 +
 +		Check_package chroot/usr/bin/syslinux syslinux
 +		Check_package chroot/usr/lib/syslinux syslinux-common
@@ -159,6 +155,7 @@ index 0000000..f98a5bf
 +	false)
 +		_CHROOT_DIR="chroot"
 +		_SYSLINUX_EFI_DIR="/usr/lib/syslinux/$_EFI_TYPE"
++		_SYSLINUX_COMMON_DIR="/usr/lib/syslinux/modules/$_EFI_TYPE"
 +
 +		if [ ! -e /usr/bin/syslinux ]
 +		then
@@ -224,9 +221,11 @@ index 0000000..f98a5bf
 +# 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 $_SYSLINUX_EFI_DIR/*.*64; do
++for _F in $_CONFDIR/*.cfg $_CONFDIR/*.png $_SYSLINUX_COMMON_DIR/*.*32 $_SYSLINUX_COMMON_DIR/*.*64; do
 +	if [ -e $_F ]; then
 +		cp $_F chroot/efi-temp/EFI/BOOT/
++	else
++		Echo_warning "No file matching $_F, EFI support might be broken."
 +	fi
 +done
 +cp $_SYSLINUX_EFI_DIR/syslinux.efi chroot/efi-temp/EFI/BOOT/BOOTX64.efi
@@ -242,7 +241,7 @@ index 0000000..f98a5bf
 +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!"
++        Echo_warning "No menu.cfg file that can be edited to indicate that we boot on EFI!"
 +fi
 +
 +# Ensure we have a syslinux.cfg
@@ -309,8 +308,6 @@ index 0000000..f98a5bf
 +
 +# Creating stage file
 +Create_stagefile .build/binary_efi
-diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
-index ddb3e64..8ced525 100755
 --- a/scripts/build/binary_iso
 +++ b/scripts/build/binary_iso
 @@ -82,6 +82,23 @@ fi