diff --git a/debian/patches/Add-support-for-EFI-boot-with-syslinux-efi.patch b/debian/patches/Add-support-for-EFI-boot-with-syslinux-efi.patch deleted file mode 100644 index 6846f29..0000000 --- a/debian/patches/Add-support-for-EFI-boot-with-syslinux-efi.patch +++ /dev/null @@ -1,370 +0,0 @@ -From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= -Date: Fri, 5 Dec 2014 09:36:27 +0100 -Subject: Add support for EFI boot with syslinux-efi. - -Bug-Debian: http://bugs.debian.org/731709 -Bug-Kali: https://bugs.kali.org/view.php?id=680 ---- - scripts/build/binary | 3 + - scripts/build/binary_efi | 282 +++++++++++++++++++++++++++++++++++++++++++++++ - scripts/build/binary_iso | 37 +++++++ - 3 files changed, 322 insertions(+) - create mode 100644 scripts/build/binary_efi - -diff --git a/scripts/build/binary b/scripts/build/binary -index fe90d8e..779dc7d 100755 ---- a/scripts/build/binary -+++ b/scripts/build/binary -@@ -68,6 +68,9 @@ lb binary_loadlin ${@} - lb binary_win32-loader ${@} - lb binary_includes ${@} - lb binary_hooks ${@} -+lb binary_efi ${@} # After includes/hooks because it copies in efi.img -+ # files that can be overriden by binary_includes and -+ # modified by binary_hooks - 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..038a7de ---- /dev/null -+++ b/scripts/build/binary_efi -@@ -0,0 +1,282 @@ -+#!/bin/sh -+ -+## live-build(7) - System Build Scripts -+## Copyright (C) 2014 Raphaël Hertzog -+## -+## 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 "${LIVE_IMAGE_TYPE}" in -+ iso*) -+ _BOOTLOADER="isolinux" -+ -+ case "${LB_MODE}" in -+ progress-linux) -+ _CONFDIR="binary/boot" -+ ;; -+ -+ *) -+ _CONFDIR="binary/isolinux" -+ ;; -+ esac -+ ;; -+ -+ netboot) -+ _BOOTLOADER="pxelinux" -+ _CONFDIR="tftpboot" -+ ;; -+ -+ hdd*|*) -+ case ${LB_BINARY_FILESYSTEM} in -+ fat*|ntfs) -+ _BOOTLOADER=syslinux -+ -+ case "${LB_MODE}" in -+ progress-linux) -+ _CONFDIR="binary/boot" -+ ;; -+ -+ *) -+ _CONFDIR="binary/syslinux" -+ ;; -+ esac -+ ;; -+ -+ ext[234]|btrfs) -+ _BOOTLOADER=extlinux -+ _CONFDIR="binary/boot/extlinux" -+ ;; -+ -+ *) -+ Echo_error "syslinux/extlinux doesn't support ${LB_BINARY_FILESYSTEM}" -+ exit 1 -+ ;; -+ esac -+ ;; -+esac -+ -+# Checking depends -+case "${LB_BUILD_WITH_CHROOT}" in -+ 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 -+ Check_package chroot/usr/lib/SYSLINUX.EFI syslinux-efi -+ 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" -+ _SYSLINUX_COMMON_DIR="/usr/lib/syslinux/modules/$_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/lib/SYSLINUX.EFI ] -+ then -+ # syslinux-efi -+ Echo_error "/usr/lib/SYSLINUX.EFI - 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_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 -+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/ -+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 -+else -+ Echo_warning "No menu.cfg file that can be edited to indicate that we boot on EFI!" -+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 <&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 - if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ] - then -@@ -144,6 +161,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" -+ #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}" diff --git a/debian/patches/Better-handle-empty-package-lists.patch b/debian/patches/Better-handle-empty-package-lists.patch deleted file mode 100644 index f3c1d73..0000000 --- a/debian/patches/Better-handle-empty-package-lists.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= -Date: Wed, 10 Dec 2014 15:58:34 +0100 -Subject: Better handle empty package lists. - -The fix in a294a46fb9fe28e43686b18da7b22ec1c46b0d4f was not enough. -This should finally resolve the problem when a package list ends -up empty (most notably due to #if evaluating to false). ---- - scripts/build/binary_package-lists | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists -index d81bfe7..dcbadcc 100755 ---- a/scripts/build/binary_package-lists -+++ b/scripts/build/binary_package-lists -@@ -145,6 +145,10 @@ then - - for SECTION in ${POOL}/* - do -+ if [ ! -d "${SECTION}" ]; then -+ break # Do nothing if the package lists were empty... -+ fi -+ - SECTION="$(basename ${SECTION})" - - mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES} diff --git a/debian/patches/Drop-ixp4xx-from-available-armel-flavors.patch b/debian/patches/Drop-ixp4xx-from-available-armel-flavors.patch deleted file mode 100644 index 1d1b9d3..0000000 --- a/debian/patches/Drop-ixp4xx-from-available-armel-flavors.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= -Date: Tue, 10 Nov 2015 09:34:38 +0100 -Subject: Drop ixp4xx from available armel flavors - -It's gone from Debian unstable/testing and from Kali. ---- - functions/defaults.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/functions/defaults.sh b/functions/defaults.sh -index eba52ae..9fcced9 100755 ---- a/functions/defaults.sh -+++ b/functions/defaults.sh -@@ -413,7 +413,7 @@ Set_defaults () - armel) - # armel will have special images: one rootfs image and many additional kernel images. - # therefore we default to all available armel flavours -- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}" -+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-kirkwood orion5x versatile}" - ;; - - armhf) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index f89eee7..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -Add-support-for-EFI-boot-with-syslinux-efi.patch -Better-handle-empty-package-lists.patch -Drop-ixp4xx-from-available-armel-flavors.patch