Codebase list live-build / ff601e1
Drop -isohybrid-apm-hfsplus add back ldlinux.e64 in the generated EFI image Raphaël Hertzog 9 years ago
2 changed file(s) with 15 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all
+7
-0
debian/changelog less more
0 live-build (3.0.5-1kali5) UNRELEASED; urgency=medium
1
2 * Drop -isohybrid-apm-hfsplus as recommended by Thomas Schmitt.
3 * And add back ldlinux.e64 in the generated EFI image.
4
5 -- Raphaël Hertzog <[email protected]> Tue, 08 Jul 2014 14:54:40 +0200
6
07 live-build (3.0.5-1kali4) kali; urgency=medium
18
29 * Add the /usr/share/live/build/data/debian-cd/kali{,-dev} symlinks that
+8
-5
debian/patches/add-efi-support.patch less more
6161 + else
6262 + Echo "Using newer EFI support in xorriso $XORRISO_VER"
6363 + XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot -e boot/efi.img -no-emul-boot"
64 + XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-gpt-basdat -isohybrid-apm-hfsplus"
64 + XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-gpt-basdat"
6565 + fi
6666 +else
6767 + Echo "No EFI boot code to include in the ISO"
7070 #if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
7171 #then
7272 # XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}"
73 --- /dev/null 2014-03-28 13:44:11.766963107 +0100
74 +++ b/scripts/build/binary_efi 2014-03-28 17:24:05.689996188 +0100
75 @@ -0,0 +1,253 @@
73 --- /dev/null
74 +++ b/scripts/build/binary_efi
75 @@ -0,0 +1,256 @@
7676 +#!/bin/sh
7777 +
7878 +## live-build(7) - System Build Scripts
244244 +# Copy syslinux and its config files in the temporary EFI image
245245 +mkdir -p chroot/efi-temp/live
246246 +mkdir -p chroot/efi-temp/EFI/BOOT
247 +for _F in $_CONFDIR/*.cfg $_CONFDIR/*.png $_SYSLINUX_EFI_DIR/*.*32; do
247 +for _F in $_CONFDIR/*.cfg $_CONFDIR/*.png $_SYSLINUX_EFI_DIR/*.*32 $_SYSLINUX_EFI_DIR/*.*64; do
248248 + if [ -e $_F ]; then
249249 + cp $_F chroot/efi-temp/EFI/BOOT/
250250 + fi
251251 +done
252252 +cp $_SYSLINUX_EFI_DIR/syslinux.efi chroot/efi-temp/EFI/BOOT/BOOTX64.efi
253 +cp $_SYSLINUX_EFI_DIR/syslinux.efi chroot/efi-temp/EFI/BOOT/syslinux.efi
253254 +
254255 +# Copy the various kernel images
255256 +cp binary/live/vmlinuz* binary/live/initrd.img* chroot/efi-temp/live/
260261 +# Edit the menu to differentiate the EFI version
261262 +if [ -e chroot/efi-temp/EFI/BOOT/menu.cfg ]; then
262263 + sed -i -e "s/^menu title/menu title EFI/" chroot/efi-temp/EFI/BOOT/menu.cfg
264 +else
265 + Echo "No menu.cfg file that can be edited to indicate that we boot on EFI!"
263266 +fi
264267 +
265268 +# Ensure we have a syslinux.cfg