diffstat of debian/ for live-build_5.0~a9-1 live-build_5.0~a9-1tanglu2 changelog | 139 +++++++++++ control | 5 patches/01_win32-loader-path.patch | 11 patches/02_fix-resolvconf-truncate.patch | 26 ++ patches/03_remove_elilo_on_i386.patch | 11 patches/04_tanglu-mode.patch | 198 ++++++++++++++++ patches/05_add-efi-support.patch | 364 +++++++++++++++++++++++++++++++ patches/06_syslinux-append-union.patch | 15 + patches/series | 6 rules | 4 10 files changed, 778 insertions(+), 1 deletion(-) --- live-build-5.0~a9/debian/changelog 2015-06-06 04:40:45.000000000 +0000 +++ live-build-5.0~a9/debian/changelog 2015-06-16 20:29:46.000000000 +0000 @@ -1,3 +1,26 @@ +live-build (5.0~a9-1tanglu2) staging; urgency=medium + + * Make EFI support work again + + -- Matthias Klumpp Tue, 16 Jun 2015 22:28:10 +0200 + +live-build (5.0~a9-1tanglu1) staging; urgency=medium + + * Merge with Debian unstable + * Refresh patches: + - win32-loader-path.patch: Search for win32-loader in the right + location (when not performing a chroot build) + - fix-resolvconf-truncate.patch: Ensure host resolv.conf doesn't + get truncated if chroot/etc/resolv.conf is a working symlink to the + host resolv.conf + - remove_elilo_on_i386.patch: Remove elilo from the required + packages on i386. It's gone from Tanglu. + - tanglu-mode.patch: Add support for Tanglu + - add-efi-support.patch: Add support for UEFI + - syslinux-append-union.patch: Use OverlayFS by default + + -- Matthias Klumpp Mon, 15 Jun 2015 14:14:41 +0200 + live-build (5.0~a9-1) unstable; urgency=low * Splitting non-live specific hooks into their own subdirectory within @@ -90,6 +113,41 @@ -- Daniel Baumann Sun, 26 Apr 2015 20:20:53 +0200 +live-build (5.0~a3-1tanglu4) staging; urgency=medium + + * Fix UEFI support patch + * Recommend syslinux-efi + + -- Matthias Klumpp Sat, 13 Jun 2015 21:48:04 +0200 + +live-build (5.0~a3-1tanglu3) staging; urgency=medium + + * 06_syslinux-append-union.patch: Set union= argument if the + union filesystem we want to use is not aufs. + + -- Matthias Klumpp Tue, 17 Feb 2015 22:34:00 +0100 + +live-build (5.0~a3-1tanglu2) staging; urgency=medium + + * Make OverlayFS the default unionfs for Tanglu + + -- Matthias Klumpp Sat, 14 Feb 2015 14:05:42 +0100 + +live-build (5.0~a3-1tanglu1) staging; urgency=medium + + * Merge with Debian experimental, remaining changes: + - win32-loader-path.patch: Search for win32-loader in the right + location (when not performing a chroot build) + - fix-resolvconf-truncate.patch: Ensure host resolv.conf doesn't + get truncated if chroot/etc/resolv.conf is a working symlink to the + host resolv.conf + - remove_elilo_on_i386.diff: Remove elilo from the required + packages on i386. It's gone from bartholomea + - tanglu-mode.patch: Add support for Tanglu + - add-efi-support.patch: Add support for UEFI + + -- Matthias Klumpp Thu, 12 Feb 2015 21:36:08 +0100 + live-build (5.0~a3-1) experimental; urgency=low [ Daniel Baumann ] @@ -213,6 +271,31 @@ -- Daniel Baumann Wed, 10 Dec 2014 08:23:55 +0100 +live-build (4.0.3-1tanglu2) staging; urgency=medium + + * Add x permission to binary_efi script + * Detect the right architecture in EFI script + * Refresh patches + + -- Matthias Klumpp Thu, 27 Nov 2014 10:46:48 +0100 + +live-build (4.0.3-1tanglu1) staging; urgency=medium + + * Merge with Debian unstable, remaining changes: + - win32-loader-path.patch: Search for win32-loader in the right + location (when not performing a chroot build) + - fix-resolvconf-truncate.patch: Ensure host resolv.conf doesn't + get truncated if chroot/etc/resolv.conf is a working symlink to the + host resolv.conf + - fix-isolinux-install.patch: Make sure isolinux is installed if + it's used as bootloader + - remove_elilo_on_i386.diff: Remove elilo from the required + packages on i386. It's gone from bartholomea + - tanglu-mode.patch: Add support for Tanglu + - add-efi-support.patch: Add support for UEFI + + -- Matthias Klumpp Wed, 26 Nov 2014 19:38:50 +0100 + live-build (4.0.3-1) unstable; urgency=low [ Richard Nelson ] @@ -288,6 +371,50 @@ -- Daniel Baumann Thu, 24 Jul 2014 05:05:17 +0200 +live-build (4.0~alpha38-1tanglu6) staging; urgency=medium + + * Set some defaults for Tanglu + + -- Matthias Klumpp Mon, 24 Nov 2014 22:28:50 +0100 + +live-build (4.0~alpha38-1tanglu5) staging; urgency=medium + + * Add Tanglu mode + * {binary|source}_disk: Add support for Tanglu + + -- Matthias Klumpp Mon, 24 Nov 2014 14:12:38 +0100 + +live-build (4.0~alpha38-1tanglu4) staging; urgency=medium + + * Add 05_remove_elilo_on_i386.diff to remove elilo from the required + packages on i386. It's gone from bartholomea + + -- Philip Muškovac Sat, 08 Nov 2014 21:40:24 +0100 + +live-build (4.0~alpha38-1tanglu3) staging; urgency=medium + + * Add 04_fix-isolinux-install.patch to make sure isolinux is installed if + it's used as bootloader + + -- Philip Muškovac Tue, 08 Jul 2014 01:35:35 +0200 + +live-build (4.0~alpha38-1tanglu2) staging; urgency=medium + + * Cherry pick 6cfcbbb as upstream_6cfcbbb.diff to fix syslinux 6 support + + -- Philip Muškovac Mon, 30 Jun 2014 22:42:53 +0200 + +live-build (4.0~alpha38-1tanglu1) staging; urgency=medium + + * Merge with debian unstable, remaining changes: + - Add 03_fix-resolvconf-truncate.patch so the host resolv.conf doesn't + get truncated if chroot/etc/resolv.conf is a working symlink to the host + resolv.conf + - Add 02_win32-loader-path.patch: Search for win32-loader in the right + location (when not performing a chroot build) + + -- Philip Muškovac Sat, 28 Jun 2014 21:55:19 +0200 + live-build (4.0~alpha38-1) unstable; urgency=low [ Daniel Baumann ] @@ -315,6 +442,17 @@ -- Daniel Baumann Wed, 25 Jun 2014 21:04:46 +0200 +live-build (4.0~alpha37-1tanglu1) staging; urgency=low + + * Merge with debian unstable, remaining changes: + - Add 03_fix-resolvconf-truncate.patch so the host resolv.conf doesn't + get truncated if chroot/etc/resolv.conf is a working symlink to the host + resolv.conf + - Add 02_win32-loader-path.patch: Search for win32-loader in the right + location (when not performing a chroot build) + + -- Valentin OVD Mon, 09 Jun 2014 12:01:35 +0200 + live-build (4.0~alpha37-1) unstable; urgency=low * Updating default boot parameters for live-config 4.x. @@ -6398,3 +6536,4 @@ * Initial release. -- Daniel Baumann Mon, 17 Jul 2006 00:00:00 +0200 + --- live-build-5.0~a9/debian/control 2015-06-06 04:37:34.000000000 +0000 +++ live-build-5.0~a9/debian/control 2015-06-15 12:35:09.000000000 +0000 @@ -1,7 +1,8 @@ Source: live-build Section: misc Priority: optional -Maintainer: Live Systems Maintainers +Maintainer: Tanglu Developers +XSBC-Original-Maintainer: Live Systems Maintainers Uploaders: Daniel Baumann Build-Depends: debhelper (>= 9) Standards-Version: 3.9.6 @@ -21,6 +22,8 @@ live-boot-doc, live-config-doc, live-manual-html | live-manual, + syslinux-efi, + mtools Suggests: gpgv, debian-keyring, --- live-build-5.0~a9/debian/patches/01_win32-loader-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-5.0~a9/debian/patches/01_win32-loader-path.patch 2015-02-12 22:34:27.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/scripts/build/binary_win32-loader ++++ b/scripts/build/binary_win32-loader +@@ -73,7 +73,7 @@ + # Copying win32-loader + cp -r chroot/usr/share/win32/* binary + else +- cp -r usr/share/win32/* binary ++ cp -r /usr/share/win32/* binary + fi + + mv binary/win32-loader.exe binary/setup.exe --- live-build-5.0~a9/debian/patches/02_fix-resolvconf-truncate.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-5.0~a9/debian/patches/02_fix-resolvconf-truncate.patch 2014-11-27 00:47:46.000000000 +0000 @@ -0,0 +1,26 @@ +--- a/scripts/build/chroot_resolv ++++ b/scripts/build/chroot_resolv +@@ -40,7 +40,11 @@ + # Creating lock file + Create_lockfile .lock + +- if [ -e chroot/etc/resolv.conf ] ++ if [ -L chroot/etc/resolv.conf ] ++ then ++ # Move resolv.conf aside if it's a symlink (likely resolvconf) ++ mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig ++ elif [ -e chroot/etc/resolv.conf ] + then + # Save resolv file or symlink + mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig +@@ -51,10 +55,6 @@ + # If you want to have a custom resolv.conf, please + # overwrite it with normal local_includes mechanism. + Truncate chroot/etc/resolv.conf.orig +- elif [ -L chroot/etc/resolv.conf ] +- then +- # Move resolv.conf aside if it's a symlink (likely resolvconf) +- mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig + fi + + if [ -f /etc/resolv.conf ] --- live-build-5.0~a9/debian/patches/03_remove_elilo_on_i386.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-5.0~a9/debian/patches/03_remove_elilo_on_i386.patch 2015-06-15 11:36:02.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/scripts/build/installer_debian-installer ++++ b/scripts/build/installer_debian-installer +@@ -321,7 +321,7 @@ + ;; + + i386) +- DI_REQ_PACKAGES="elilo lilo grub-pc" ++ DI_REQ_PACKAGES="lilo grub-pc" + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-586 linux-image-686-pae" + ;; + --- live-build-5.0~a9/debian/patches/04_tanglu-mode.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-5.0~a9/debian/patches/04_tanglu-mode.patch 2015-06-15 12:08:39.000000000 +0000 @@ -0,0 +1,198 @@ +Description: Add Tanglu mode + * {binary|source}_disk: Add support for Tanglu +Author: Matthias Klumpp + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- a/scripts/build/binary_disk ++++ b/scripts/build/binary_disk +@@ -60,6 +60,12 @@ + TRACE="project/trace/ftp-master.debian.org" + ;; + ++ tanglu) ++ TITLE="Tanglu" ++ STRING="Build ${ARCHITECTURE}" ++ TRACE="" ++ ;; ++ + progress-linux) + TITLE="Progress Linux" + STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}" +--- a/scripts/build/binary_syslinux ++++ b/scripts/build/binary_syslinux +@@ -254,6 +254,10 @@ + _PROJECT="Progress Linux" + ;; + ++ tanglu) ++ _PROJECT="Tanglu" ++ ;; ++ + *) + _PROJECT="Debian GNU/Linux" + ;; +--- a/scripts/build/chroot_archives ++++ b/scripts/build/chroot_archives +@@ -91,7 +91,7 @@ + if [ "${LB_SECURITY}" = "true" ] + then + case "${LB_MODE}" in +- debian|progress-linux) ++ debian|tanglu|progress-linux) + case "${LB_PARENT_DISTRIBUTION}" in + sid) + +@@ -580,7 +580,7 @@ + if [ "${LB_SECURITY}" = "true" ] + then + case "${LB_MODE}" in +- debian|progress-linux) ++ debian|tanglu|progress-linux) + case "${LB_PARENT_DISTRIBUTION}" in + sid) + +--- a/scripts/build/source_disk ++++ b/scripts/build/source_disk +@@ -60,6 +60,12 @@ + TRACE="project/trace/ftp-master.debian.org" + ;; + ++ tanglu) ++ TITLE="Tanglu" ++ STRING="Build ${ARCHITECTURE}" ++ TRACE="" ++ ;; ++ + progress-linux) + TITLE="Progress Linux" + STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}" +--- a/scripts/build/bootstrap_archives ++++ b/scripts/build/bootstrap_archives +@@ -90,7 +90,7 @@ + if [ "${LB_SECURITY}" = "true" ] + then + case "${LB_MODE}" in +- debian|progress-linux) ++ debian|tanglu|progress-linux) + case "${LB_PARENT_DISTRIBUTION}" in + sid) + +--- a/functions/releases.sh ++++ b/functions/releases.sh +@@ -16,3 +16,8 @@ + # Progress Linux releases + RELEASE_baureo="2" + RELEASE_cairon="3" ++ ++# Tanglu releases ++RELEASE_aequorea="1" ++RELEASE_bartholomea="2" ++RELEASE_chromodoris="3" +--- a/functions/defaults.sh ++++ b/functions/defaults.sh +@@ -98,7 +98,7 @@ + _DISTRIBUTOR="$(lsb_release -is | tr "[A-Z]" "[a-z]")" + + case "${_DISTRIBUTOR}" in +- debian|progress-linux) ++ debian|progress-linux|tanglu) + LB_MODE="${LB_MODE:-${_DISTRIBUTOR}}" + ;; + +@@ -123,6 +123,12 @@ + LB_DERIVATIVE_IS_BASED_ON="debian" + ;; + ++ tanglu) ++ LB_DISTRIBUTION="${LB_DISTRIBUTION:-chromodoris}" ++ LB_DERIVATIVE="true" ++ LB_DERIVATIVE_IS_BASED_ON="debian" ++ ;; ++ + *) + LB_DISTRIBUTION="${LB_DISTRIBUTION:-stretch}" + LB_DERIVATIVE="false" +@@ -246,6 +252,18 @@ + esac + ;; + ++ tanglu) ++ case "${LB_SYSTEM}" in ++ live) ++ LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}" ++ ;; ++ ++ normal) ++ LB_INITSYSTEM="${LB_INITSYSTEM:-none}" ++ ;; ++ esac ++ ;; ++ + *) + case "${LB_SYSTEM}" in + live) +@@ -330,6 +348,11 @@ + LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}" + ;; + ++ tanglu) ++ LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.tanglu.org/tanglu/}" ++ LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}" ++ ;; ++ + progress-linux) + LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}" + LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/packages/}" +@@ -363,6 +386,11 @@ + LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ftp.debian.org/debian/}" + LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}" + ;; ++ ++ tanglu) ++ LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://archive.tanglu.org/tanglu/}" ++ LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}" ++ ;; + esac + + # Setting security mirror which ends up in the image +@@ -396,7 +424,16 @@ + LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM:-squashfs}" + + # Setting union filesystem +- LB_UNION_FILESYSTEM="${LB_UNION_FILESYSTEM:-aufs}" ++ case "${LB_MODE}" in ++ tanglu) ++ LB_UNION_FILESYSTEM="overlay" ++ ;; ++ ++ *) ++ LB_UNION_FILESYSTEM="${LB_UNION_FILESYSTEM:-aufs}" ++ ;; ++ esac ++ + + # Setting interactive shell/X11/Xnest + LB_INTERACTIVE="${LB_INTERACTIVE:-false}" +@@ -654,6 +691,10 @@ + progress-linux) + LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Progress Linux}" + ;; ++ ++ tanglu) ++ LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Tanglu Live}" ++ ;; + esac + + # Set iso preparer --- live-build-5.0~a9/debian/patches/05_add-efi-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-5.0~a9/debian/patches/05_add-efi-support.patch 2015-06-16 20:28:59.000000000 +0000 @@ -0,0 +1,364 @@ +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 +Bug-Tanglu: http://tracker.tanglu.org/issues/9 +--- + scripts/build/binary | 3 + + scripts/build/binary_efi | 278 +++++++++++++++++++++++++++++++++++++++++++++++ + scripts/build/binary_iso | 37 +++++++ + 3 files changed, 318 insertions(+) + create mode 100644 scripts/build/binary_efi + +--- a/scripts/build/binary ++++ b/scripts/build/binary +@@ -68,6 +68,9 @@ + 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" ] +--- /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 @@ + ;; + 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}" --- live-build-5.0~a9/debian/patches/06_syslinux-append-union.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-5.0~a9/debian/patches/06_syslinux-append-union.patch 2015-06-15 11:40:56.000000000 +0000 @@ -0,0 +1,15 @@ +--- a/scripts/build/binary_syslinux ++++ b/scripts/build/binary_syslinux +@@ -179,6 +179,12 @@ + ;; + esac + ++# Setting boot parameters ++if [ "${LB_UNION_FILESYSTEM}" != "aufs" ] ++then ++ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}" ++fi ++ + # Configuring files + if [ -e "${_TARGET}/live.cfg.in" ] + then --- live-build-5.0~a9/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ live-build-5.0~a9/debian/patches/series 2015-06-15 12:17:37.000000000 +0000 @@ -0,0 +1,6 @@ +01_win32-loader-path.patch +02_fix-resolvconf-truncate.patch +03_remove_elilo_on_i386.patch +04_tanglu-mode.patch +05_add-efi-support.patch +06_syslinux-append-union.patch --- live-build-5.0~a9/debian/rules 2015-06-06 04:37:34.000000000 +0000 +++ live-build-5.0~a9/debian/rules 2015-06-15 12:28:53.000000000 +0000 @@ -4,6 +4,10 @@ dh ${@} --parallel override_dh_auto_install: + # correct permissions on the new EFI script + chmod 755 scripts/build/binary_efi + + # install lb dh_auto_install -- DESTDIR=debian/live-build # Removing unused files