diffstat of debian/ for live-build_4.0~alpha38-1 live-build_4.0~alpha38-1tanglu4 changelog | 43 +++++++++++++++++++++++++++++++ control | 3 +- patches/02_win32-loader-path.patch | 11 +++++++ patches/03_fix-resolvconf-truncate.patch | 28 ++++++++++++++++++++ patches/04_fix-isolinux-install.patch | 15 ++++++++++ patches/05_remove_elilo_on_i386.diff | 13 +++++++++ patches/series | 5 +++ patches/upstream_6cfcbbb.diff | 43 +++++++++++++++++++++++++++++++ 8 files changed, 160 insertions(+), 1 deletion(-) --- live-build-4.0~alpha38/debian/changelog 2014-06-25 19:10:53.000000000 +0000 +++ live-build-4.0~alpha38/debian/changelog 2014-11-08 20:41:32.000000000 +0000 @@ -1,3 +1,34 @@ +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 ] @@ -25,6 +56,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. @@ -6108,3 +6150,4 @@ * Initial release. -- Daniel Baumann Mon, 17 Jul 2006 00:00:00 +0200 + --- live-build-4.0~alpha38/debian/control 2014-05-07 19:52:20.000000000 +0000 +++ live-build-4.0~alpha38/debian/control 2014-06-28 19:56:51.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.5 --- live-build-4.0~alpha38/debian/patches/02_win32-loader-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0~alpha38/debian/patches/02_win32-loader-path.patch 2014-06-09 10:20:46.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/scripts/build/binary_win32-loader ++++ b/scripts/build/binary_win32-loader +@@ -59,7 +59,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-4.0~alpha38/debian/patches/03_fix-resolvconf-truncate.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0~alpha38/debian/patches/03_fix-resolvconf-truncate.patch 2014-06-09 10:20:46.000000000 +0000 @@ -0,0 +1,28 @@ +Index: b/scripts/build/chroot_resolv +=================================================================== +--- a/scripts/build/chroot_resolv ++++ b/scripts/build/chroot_resolv +@@ -40,7 +40,11 @@ case "${1}" in + # 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 @@ case "${1}" in + # 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-4.0~alpha38/debian/patches/04_fix-isolinux-install.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0~alpha38/debian/patches/04_fix-isolinux-install.patch 2014-07-07 23:33:40.000000000 +0000 @@ -0,0 +1,15 @@ +Index: b/scripts/build/binary_syslinux +=================================================================== +--- a/scripts/build/binary_syslinux ++++ b/scripts/build/binary_syslinux +@@ -141,6 +141,10 @@ case "${LB_BUILD_WITH_CHROOT}" in + ;; + esac + ++ if [ "${_BOOTLOADER}" = "isolinux" ]; then ++ Check_package chroot/usr/lib/ISOLINUX isolinux ++ fi ++ + Check_package chroot/usr/lib/syslinux syslinux-common + + if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1 --- live-build-4.0~alpha38/debian/patches/05_remove_elilo_on_i386.diff 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0~alpha38/debian/patches/05_remove_elilo_on_i386.diff 2014-11-08 20:36:10.000000000 +0000 @@ -0,0 +1,13 @@ +Index: live-build-4.0~alpha38/scripts/build/installer_debian-installer +=================================================================== +--- live-build-4.0~alpha38.orig/scripts/build/installer_debian-installer ++++ live-build-4.0~alpha38/scripts/build/installer_debian-installer +@@ -353,7 +353,7 @@ then + ;; + + i386) +- DI_REQ_PACKAGES="elilo lilo grub-pc" ++ DI_REQ_PACKAGES="lilo grub-pc" + + case "${LB_MODE}" in + ubuntu) --- live-build-4.0~alpha38/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0~alpha38/debian/patches/series 2014-11-08 20:35:47.000000000 +0000 @@ -0,0 +1,5 @@ +02_win32-loader-path.patch +03_fix-resolvconf-truncate.patch +upstream_6cfcbbb.diff +04_fix-isolinux-install.patch +05_remove_elilo_on_i386.diff --- live-build-4.0~alpha38/debian/patches/upstream_6cfcbbb.diff 1970-01-01 00:00:00.000000000 +0000 +++ live-build-4.0~alpha38/debian/patches/upstream_6cfcbbb.diff 2014-06-30 20:43:59.000000000 +0000 @@ -0,0 +1,43 @@ +From: Daniel Baumann +Date: Mon, 30 Jun 2014 19:05:57 +0000 (+0200) +Subject: Updating isohdpfx handling for syslinux 6. +X-Git-Url: http://live.debian.net/gitweb/?p=live-build.git;a=commitdiff_plain;h=6cfcbbb + +Updating isohdpfx handling for syslinux 6. +--- + +diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso +index 9b4d6ea..1d36924 100755 +--- a/scripts/build/binary_iso ++++ b/scripts/build/binary_iso +@@ -55,10 +55,17 @@ Create_lockfile .lock + # Checking depends + Check_package chroot/usr/bin/xorriso xorriso + +-if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ] +-then +- Check_package chroot/usr/lib/syslinux/isohdpfx.bin syslinux-common +-fi ++case "${LB_PARENT_DISTRIBUTION}" in ++ wheezy|jessie) ++ _ISOHDPFX="/usr/lib/syslinux/isohdpfx.bin" ++ Check_package chroot/${_ISOHDPFX} syslinux-common ++ ;; ++ ++ *) ++ _ISOHDPFX="/usr/lib/ISOLINUX/isohdpfx.bin" ++ Check_package chroot/${_ISOHDPFX} isolinux ++ ;; ++esac + + # Restoring cache + Restore_cache cache/packages.binary +@@ -78,7 +85,7 @@ XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes" + # Handle xorriso live-build specific options + if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ] + then +- XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin -partition_offset 16" ++ XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr ${_ISOHDPFX} -partition_offset 16" + fi + + if [ "${_QUIET}" = "true" ]