Update on top of live-build 4.0.4-1

Remaining changes:
  - skip comments in package list
  - EFI support
  - disable ixp4xx flavour on armel

debian/changelog

+live-build (4.0.4-1kali1) kali-dev; urgency=medium
+
+  * Update on top of live-build 4.0.4-1. Remaining changes:
+    - skip comments in package list
+    - EFI support
+    - disable ixp4xx flavour on armel
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Wed, 10 Dec 2014 09:14:54 +0100
+
 live-build (4.0.4-1) unstable; urgency=low
 
   [ Daniel Baumann ]

debian/patches/0001-Update-linux-flavours-for-armhf-armel.patch

-From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
-Date: Fri, 5 Dec 2014 09:36:27 +0100
-Subject: Update linux flavours for armhf/armel
-
-With linux 3.16 of Debian Jessie, armmp and armmp-lpae are the
-only armhf flavours availale. On armel, we lost the support of
-the iop32x flavors.
-
-Linux 3.14 used in Kali doesn't build the ixp4xx flavor, so keep that
-one disabled too.
----
- functions/defaults.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/functions/defaults.sh b/functions/defaults.sh
-index feebdee..0d5fa4f 100755
---- a/functions/defaults.sh
-+++ b/functions/defaults.sh
-@@ -525,15 +525,29 @@ Set_defaults ()
- 				*)
- 					# 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:-iop32x ixp4xx kirkwood orion5x versatile}"
-+					case "${LB_DISTRIBUTION}" in
-+						wheezy)
-+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}"
-+							;;
-+						*)
-+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-kirkwood orion5x versatile}"
-+							;;
-+					esac
- 					;;
- 			esac
- 			;;
- 
- 		armhf)
- 			# armhf 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:-mx5 omap}"
-+			# therefore we default to all available armhf flavours
-+			case "${LB_DISTRIBUTION}" in
-+				wheezy)
-+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}"
-+					;;
-+				*)
-+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}"
-+					;;
-+			esac
- 			;;
- 
- 		amd64)

debian/patches/0003-Lookup-LIVE_IMAGE_-foo-and-LB_-foo-for-if-tests-in-p.patch

-From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
-Date: Fri, 5 Dec 2014 09:41:16 +0100
-Subject: Lookup $LIVE_IMAGE_<foo> and $LB_<foo> for #if tests in package lists
-
-The old LB_ARCHITECTURES and LB_ARCHIVE_AREAS got renamed to
-LIVE_IMAGE_ARCHITECTURE and LIVE_IMAGE_ARCHIVE_AREAS in live-build 4.x
-whereas LB_DISTRIBUTION has not been renamed. Is thus required
-to lookup variables with both prefixes.
----
- functions/packagelists.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/functions/packagelists.sh b/functions/packagelists.sh
-index 8470d9a..3660f0f 100755
---- a/functions/packagelists.sh
-+++ b/functions/packagelists.sh
-@@ -63,7 +63,8 @@ Expand_packagelist ()
- 					_LB_NESTED=1
- 
- 					_LB_NEEDLE="$(echo "${_LB_LINE}" | cut -d' ' -f3-)"
--					_LB_HAYSTACK="$(eval "echo \$LB_$(echo "${_LB_LINE}" | cut -d' ' -f2)")"
-+					_LB_HAYSTACK_VAR="$(echo "${_LB_LINE}" | cut -d' ' -f2)"
-+					_LB_HAYSTACK="$(eval "echo \${LB_$_LB_HAYSTACK_VAR:-\$LIVE_IMAGE_$_LB_HAYSTACK_VAR}")"
- 
- 					_LB_ENABLED=0
- 					for _LB_NEEDLE_PART in ${_LB_NEEDLE}
-@@ -87,7 +88,8 @@ Expand_packagelist ()
- 					_LB_NESTED=1
- 
- 					_LB_NEEDLE="$(echo "${_LB_LINE}" | cut -d' ' -f3-)"
--					_LB_HAYSTACK="$(eval "echo \$LB_$(echo "${_LB_LINE}" | cut -d' ' -f2)")"
-+					_LB_HAYSTACK_VAR="$(echo "${_LB_LINE}" | cut -d' ' -f2)"
-+					_LB_HAYSTACK="$(eval "echo \${LB_$_LB_HAYSTACK_VAR:-\$LIVE_IMAGE_$_LB_HAYSTACK_VAR}")"
- 
- 					_LB_ENABLED=0
- 					for _LB_NEEDLE_PART in ${_LB_NEEDLE}

debian/patches/0005-Properly-support-empty-package-lists.patch

-From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
-Date: Fri, 5 Dec 2014 09:53:13 +0100
-Subject: Properly support empty package lists
-
-The user might not have created any package list or it might have
-created a packages list that end up being empty due to various #if tests.
-We should not fail in those cases.
----
- scripts/build/binary_package-lists | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
-index 0584c59..496d631 100755
---- a/scripts/build/binary_package-lists
-+++ b/scripts/build/binary_package-lists
-@@ -101,7 +101,7 @@ then
- 			Expand_packagelist "${LIST}" "config/package-lists" > chroot/root/"$(basename ${LIST})"
- 
- 			# Downloading additional packages
--			Chroot chroot "xargs --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
-+			Chroot chroot "xargs --no-run-if-empty --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
- 
- 			# Remove package list
- 			rm chroot/root/"$(basename ${LIST})"
-@@ -110,6 +110,10 @@ then
- 
- 	for FILE in chroot/binary.deb/archives/*.deb
- 	do
-+		if [ ! -e ${FILE} ]; then
-+			break # Do nothing if the package lists were empty...
-+		fi
-+
- 		SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
- 		SECTION="$(dpkg -f ${FILE} Section | awk '{ print $1 }')"
- 

debian/patches/0006-binary_syslinux-correct-the-path-used-to-check-if-th.patch

-From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
-Date: Tue, 9 Dec 2014 16:48:00 +0100
-Subject: binary_syslinux: correct the path used to check if the bootloader is
- available
-
-The {iso,pxe,ext,sys}linux packages use /usr/lib/{ISO,PXE,EXT,SYS}LINUX/
-directories and not /share/{ISO,PXE,EXT,SYS}LINUX/.
----
- scripts/build/binary_syslinux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
-index abd900a..f0dba0e 100755
---- a/scripts/build/binary_syslinux
-+++ b/scripts/build/binary_syslinux
-@@ -143,7 +143,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
- 				;;
- 
- 			*)
--				Check_package chroot/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
-+				Check_package chroot/usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
- 				Check_package chroot/usr/lib/syslinux syslinux-common
- 				;;
- 		esac

debian/patches/0002-Add-support-for-EFI-boot-with-syslinux-efi.patch → debian/patches/Add-support-for-EFI-boot-with-syslinux-efi.patch

@@ -310,7 +310,7 @@ index 0000000..f98a5bf
 +# Creating stage file
 +Create_stagefile .build/binary_efi
 diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
-index 7abfc69..62fcf9c 100755
+index ddb3e64..8ced525 100755
 --- a/scripts/build/binary_iso
 +++ b/scripts/build/binary_iso
 @@ -82,6 +82,23 @@ fi

debian/patches/Drop-the-ixp4xx-flavour-on-armel-as-Kali-does-not-ha.patch

+From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
+Date: Fri, 5 Dec 2014 09:36:27 +0100
+Subject: Drop the ixp4xx flavour on armel as Kali does not have it
+
+The main kali release includes linux 3.14 which had this flavour disabled.
+
+This patch should be dropped once the main kali release is based on
+Debian 8 with Linux 3.16 or newer.
+
+Forwarded: not-needed
+Origin: vendor
+---
+ functions/defaults.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions/defaults.sh b/functions/defaults.sh
+index b419232..bff4cc8 100755
+--- a/functions/defaults.sh
++++ b/functions/defaults.sh
+@@ -538,7 +538,7 @@ Set_defaults ()
+ 							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}"
+ 							;;
+ 						*)
+-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}"
++							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-kirkwood orion5x versatile}"
+ 							;;
+ 					esac
+ 					;;

debian/patches/0004-Skip-comments-in-package-lists.patch → debian/patches/Skip-comments-in-package-lists.patch

@@ -7,15 +7,20 @@ possibly only as a side-effect of some other logic) and being able to
 comment package is a useful feature (to explain why some packages are
 included and to make it easy to uncomment some lines to add more useful
 packages).
+
+This patch has been merged in live-build 5.x.
+
+Applied-Upstream: 5.0~a1
+Forwarded: directly committed upstream
 ---
  functions/packagelists.sh | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/functions/packagelists.sh b/functions/packagelists.sh
-index 3660f0f..5327591 100755
+index 8470d9a..02a879d 100755
 --- a/functions/packagelists.sh
 +++ b/functions/packagelists.sh
-@@ -109,6 +109,10 @@ Expand_packagelist ()
+@@ -107,6 +107,10 @@ Expand_packagelist ()
  					_LB_ENABLED=1
  					;;
  

debian/patches/series

-0001-Update-linux-flavours-for-armhf-armel.patch
-0002-Add-support-for-EFI-boot-with-syslinux-efi.patch
-0003-Lookup-LIVE_IMAGE_-foo-and-LB_-foo-for-if-tests-in-p.patch
-0004-Skip-comments-in-package-lists.patch
-0005-Properly-support-empty-package-lists.patch
-0006-binary_syslinux-correct-the-path-used-to-check-if-th.patch
+Add-support-for-EFI-boot-with-syslinux-efi.patch
+Skip-comments-in-package-lists.patch
+Drop-the-ixp4xx-flavour-on-armel-as-Kali-does-not-ha.patch