Commit c7dd6161 authored by Raphaël Hertzog's avatar Raphaël Hertzog
Browse files

Add EFI boot support with syslinux 6. Closes: #731709

parent 1b83cdbc
......@@ -2,6 +2,7 @@ live-build (3.0.5-1kali4) kali; urgency=medium
* Add the /usr/share/live/build/data/debian-cd/kali symlink that
is currently manually created by Kali's build_all.sh script.
* Add EFI boot support with syslinux 6. Closes: #731709
-- Raphaël Hertzog <hertzog@debian.org> Fri, 28 Mar 2014 17:09:43 +0100
......
Description: Add support for EFI boot
Note that this patch relies on syslinux 6 packaged sanely (i.e.
respecting upstream file locations), such a package only exists in
Kali for now... the experimental package in Debian places files
in new directories (see #742836).
Author: Raphaël Hertzog <buxy@kali.org>
Bug-Debian: http://bugs.debian.org/731709
Bug-Kali: https://bugs.kali.org/view.php?id=680
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -71,6 +71,8 @@ lb binary_disk ${@}
lb binary_loadlin ${@}
lb binary_win32-loader ${@}
lb binary_includes ${@}
+lb binary_efi ${@} # After includes because it copies files that can be
+ # overriden by binary_includes in efi.img
lb binary_hooks ${@}
lb binary_checksums ${@}
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -88,6 +88,23 @@ fi
# Handle xorriso generic options
XORRISO_OPTIONS="-r -J -joliet-long -l -cache-inodes"
+case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ XORRISO_VER=$(Chroot chroot xorriso --version 2>&1 | awk '
+ /^xorriso version/ {
+ split($4, ver, ".")
+ print ver[1]*10000+ver[2]*100+ver[3]
+ }')
+ ;;
+ false)
+ XORRISO_VER=$(xorriso --version 2>&1 | awk '
+ /^xorriso version/ {
+ split($4, ver, ".")
+ print ver[1]*10000+ver[2]*100+ver[3]
+ }')
+ ;;
+esac
+
# Handle xorriso live-build specific options
case "${LB_PARENT_DISTRIBUTION}" in
squeeze)
@@ -180,6 +197,26 @@ case "${LB_BOOTLOADER}" in
;;
esac
+if [ -e binary/boot/efi.img ]; then
+ if [ "$XORRISO_VER" -le 10202 ]; then
+ # 1.2.2 shipping in wheezy
+ Echo "Using older EFI command line for xorriso $XORRISO_VER"
+ # Tell xorriso to create a secondary ElTorito boot record for the
+ # EFI bootloader
+ XORRISO_OPTIONS="${XORRISO_OPTIONS} -eltorito-alt-boot --efi-boot boot/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)
+ XORRISO_OPTIONS="${XORRISO_OPTIONS} -append_partition 2 0x01 binary/boot/efi.img"
+ 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"
+ fi
+else
+ Echo "No EFI boot code to include in the ISO"
+fi
+
#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 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2014 Raphaël Hertzog <buxy@kali.org>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+set -e
+
+# Including common functions
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'prepares and installs EFI support into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LB_BOOTLOADER}" != "syslinux" ]
+then
+ exit 0
+fi
+
+Echo_message "Begin preparing EFI support..."
+
+# Requiring stage file
+Require_stagefile .build/config .build/bootstrap
+
+# Checking stage file
+Check_stagefile .build/binary_efi
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check architecture
+Check_architectures amd64 i386
+Check_crossarchitectures
+
+case "$LB_ARCHITECTURES" in
+ amd64)
+ _EFI_TYPE=efi64
+ ;;
+ i386)
+ _EFI_TYPE=efi32
+ ;;
+ *)
+ echo "ERROR: can't provide EFI boot support to architecture $LB_ARCHITECTURES" >&2
+ exit 1
+ ;;
+esac
+
+# Assembling image specifics
+case "${LB_BINARY_IMAGES}" in
+ iso*)
+ _BOOTLOADER="isolinux"
+
+ case "${LB_MODE}" in
+ progress-linux)
+ _CONFDIR="binary/boot"
+ ;;
+
+ *)
+ _CONFDIR="binary/isolinux"
+ ;;
+ esac
+ ;;
+
+ netboot)
+ _BOOTLOADER="pxelinux"
+ _CONFDIR="tftpboot"
+ ;;
+
+ hdd*|*)
+ _BOOTLOADER="syslinux"
+
+ case "${LB_MODE}" in
+ progress-linux)
+ _CONFDIR="binary/boot"
+ ;;
+
+ *)
+ _CONFDIR="binary/syslinux"
+ ;;
+ esac
+ ;;
+esac
+
+# Checking depends
+case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ _CHROOT_DIR=""
+ _SYSLINUX_EFI_DIR="chroot/usr/lib/syslinux/$_EFI_TYPE"
+
+ Check_package chroot/usr/bin/syslinux syslinux
+ Check_package chroot/usr/lib/syslinux syslinux-common
+ Check_package chroot/usr/bin/mcopy mtools
+ Check_package chroot/sbin/mkfs.msdos dosfstools
+ ;;
+
+ false)
+ _CHROOT_DIR="chroot"
+ _SYSLINUX_EFI_DIR="/usr/lib/syslinux/$_EFI_TYPE"
+
+ if [ ! -e /usr/bin/syslinux ]
+ then
+ # syslinux
+ Echo_error "/usr/bin/syslinux - no such file."
+ exit 1
+ fi
+
+ if [ ! -e /usr/lib/syslinux ]
+ then
+ # syslinux-common
+ Echo_error "/usr/lib/syslinux - no such directory"
+ exit 1
+ fi
+
+ if [ ! -e /usr/bin/mcopy ]
+ then
+ # mtools
+ Echo_error "/usr/bin/mcopy - no such file."
+ exit 1
+ fi
+
+ if [ ! -e /sbin/mkfs.msdos ]
+ then
+ # dosfstools
+ Echo_error "/sbin/mkfs.msdos - no such file."
+ exit 1
+ fi
+ ;;
+esac
+
+# Restoring cache
+Restore_cache cache/packages.binary
+
+# Installing depends
+Install_package
+
+# Abort if we don't have the required EFI files
+if [ ! -e $_SYSLINUX_EFI_DIR/syslinux.efi ]; then
+ Echo_warning "$_SYSLINUX_EFI_DIR/syslinux.efi missing, no EFI support included."
+ case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ # Saving cache
+ Save_cache cache/packages.binary
+
+ # Removing depends
+ Remove_package
+ ;;
+ esac
+ exit 0
+fi
+
+# Cleanup files that we generate
+rm -rf chroot/efi-temp chroot/efi.img binary/boot/efi.img
+
+# 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
+ 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
+
+# Copy the various kernel images
+cp binary/live/vmlinuz* binary/live/initrd.img* chroot/efi-temp/live/
+if [ -d binary/install ]; then
+ cp -r binary/install chroot/efi-temp/
+fi
+
+# 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
+fi
+
+# Ensure we have a syslinux.cfg
+if [ ! -e chroot/efi-temp/EFI/BOOT/syslinux.cfg ]; then
+ for _F in isolinux.cfg pxelinux.cfg/default extlinux.conf; do
+ if [ -f chroot/efi-temp/EFI/BOOT/$_F ]; then
+ cp chroot/efi-temp/EFI/BOOT/$_F chroot/efi-temp/EFI/BOOT/syslinux.cfg
+ break
+ fi
+ done
+fi
+
+# Define the EFI filesystem size
+_TOTALSIZE=$(du -sk chroot/efi-temp/ | awk '{print $1}')
+# Add 5% safety margin
+_TOTALSIZE=$(( $_TOTALSIZE * 21 / 20 ))
+# Required size rounded to upper 32kb
+_BLOCKS=$(( ($_TOTALSIZE + 31) / 32 * 32 ))
+Echo "EFI boot image needs $_TOTALSIZE Kb, thus allocating $_BLOCKS blocks."
+
+# Script to generate the EFI boot image
+cat >binary.sh <<END
+#!/bin/sh
+
+set -e
+
+mkfs.msdos -C $_CHROOT_DIR/efi.img $_BLOCKS
+mcopy -s -v -i $_CHROOT_DIR/efi.img $_CHROOT_DIR/efi-temp/* ::
+END
+
+# Copying files
+case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ mv binary.sh chroot/
+ Chroot chroot "sh binary.sh"
+ rm -f chroot/binary.sh
+
+ # Saving cache
+ Save_cache cache/packages.binary
+
+ # Removing depends
+ Remove_package
+ ;;
+
+ false)
+ sh binary.sh
+ rm -f binary.sh
+ ;;
+esac
+
+mkdir -p binary/boot
+mv chroot/efi.img binary/boot/
+rm -rf chroot/efi-temp
+
+case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ # Saving cache
+ Save_cache cache/packages.binary
+
+ # Removing depends
+ Remove_package
+ ;;
+esac
+
+# Creating stage file
+Create_stagefile .build/binary_efi
add-xfsprogs-jfsutils-to-d-i.patch
fix-kernel-metapackages-used-in-di-step.patch
fix-default-armhf-kernel-flavours.patch
add-efi-support.patch
......@@ -4,6 +4,8 @@
dh ${@}
override_dh_auto_install:
chmod 755 scripts/build/binary_efi
dh_auto_install -- DESTDIR=debian/live-build
# Removing unused files
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment