Commit e4ec5a27 authored by Sophie Brun's avatar Sophie Brun
Browse files

Import new version from debian and refresh patches

parent c26b4561
live-build (5.0~a11-1kali1) kali-dev; urgency=medium
* Import new version from debian
* Drop the patches Drop-the-ixp4xx-flavour-on-armel-as-Kali-does-not-ha.patch
as it's not needed anymore with new kernel version
* Drop patches Do-not-pass-the-version-to-apt-ftprelease-when-we-do.patch
Use-linux-image-586-instead-of-linux-image-486-for-k.patch and
Drop-elilo-from-list-of-d-i-required-packages-on-i38.patch:
now included in debian
* Drop the patch Add-versions-for-Kali-releases.patch: fixed in debian (bug
790860)
* Remaining changes compared to debian: three patches including one for
supporting EFI boot
-- Sophie Brun <sophie@freexian.com> Wed, 09 Sep 2015 11:20:20 +0200
live-build (5.0~a11-1) unstable; urgency=low
[ Daniel Baumann ]
......
......@@ -11,11 +11,9 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
3 files changed, 322 insertions(+)
create mode 100644 scripts/build/binary_efi
diff --git a/scripts/build/binary b/scripts/build/binary
index c1f9ec6..b893988 100755
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -69,6 +69,9 @@ lb binary_loadlin ${@}
@@ -68,6 +68,9 @@ lb binary_loadlin ${@}
lb binary_win32-loader ${@}
lb binary_includes ${@}
lb binary_hooks ${@}
......@@ -25,9 +23,6 @@ index c1f9ec6..b893988 100755
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 @@
......@@ -313,13 +308,11 @@ index 0000000..038a7de
+
+# Creating stage file
+Create_stagefile .build/binary_efi
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index ddb3e64..8ced525 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -82,6 +82,23 @@ fi
@@ -71,6 +71,23 @@ fi
# Handle xorriso generic options
XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes"
XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes -iso-level 3"
+case "${LB_BUILD_WITH_CHROOT}" in
+ true)
......@@ -341,7 +334,7 @@ index ddb3e64..8ced525 100755
# Handle xorriso live-build specific options
if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
then
@@ -155,6 +172,26 @@ case "${LB_BOOTLOADER}" in
@@ -144,6 +161,26 @@ case "${LB_BOOTLOADER}" in
;;
esac
......
From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
Date: Wed, 24 Jun 2015 18:07:53 +0200
Subject: Add versions for Kali releases
---
functions/releases.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/functions/releases.sh b/functions/releases.sh
index 4c679cd..ca564f1 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -7,6 +7,10 @@
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
+# Kali releases
+RELEASE_kali="1.0"
+RELEASE_moto="1.0"
+RELEASE_sana="2.0"
# Debian releases
RELEASE_wheezy="7"
......@@ -9,11 +9,9 @@ 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 ff19c3c..970de4f 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -153,6 +153,10 @@ then
@@ -145,6 +145,10 @@ then
for SECTION in ${POOL}/*
do
......
From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
Date: Wed, 24 Jun 2015 17:39:55 +0200
Subject: Do not pass the version to apt-ftprelease when we don't have one
---
scripts/build/installer_debian-installer | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index 1f137eb..f8457b1 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -731,6 +731,9 @@ then
mv binary chroot/root
eval _VERSION="$`echo RELEASE_${LB_PARENT_DISTRIBUTION}`"
+ if [ -n "${_VERSION}" ]; then
+ _LB_APT_VERSION_OPT='-o APT::FTPArchive::Release::Version="'"${_VERSION}"'"'
+ fi
case "${LB_PARENT_DISTRIBUTION}" in
sid)
@@ -747,7 +750,7 @@ cd /root/binary && apt-ftparchive \
-o APT::FTPArchive::Release::Origin="Debian" \
-o APT::FTPArchive::Release::Label="Debian" \
-o APT::FTPArchive::Release::Suite="${_SUITE}" \
- -o APT::FTPArchive::Release::Version="${_VERSION}" \
+ ${_LB_APT_VERSION_OPT} \
-o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \
-o APT::FTPArchive::Release::Date="$(date -R)" \
-o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \
From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
Date: Wed, 15 Jul 2015 12:15:25 +0200
Subject: Drop elilo from list of d-i required packages on i386
It's gone from unstable/testing and has never been really useful on
non-ia64 systems.
---
scripts/build/installer_debian-installer | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index f8457b1..5e78ab2 100755
--- a/scripts/build/installer_debian-installer
+++ b/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)
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
;;
......@@ -16,12 +16,10 @@ Forwarded: directly committed upstream
functions/packagelists.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/functions/packagelists.sh b/functions/packagelists.sh
index 8470d9a..02a879d 100755
--- a/functions/packagelists.sh
+++ b/functions/packagelists.sh
@@ -107,6 +107,10 @@ Expand_packagelist ()
_LB_ENABLED=1
@@ -111,6 +111,10 @@ Expand_packagelist ()
# Skip comments
;;
+ \#*)
......
From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
Date: Thu, 18 Jun 2015 10:38:42 +0200
Subject: Use linux-image-586 instead of linux-image-486 for kali 2
---
scripts/build/installer_debian-installer | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index 5f6b3ca..1f137eb 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -369,7 +369,14 @@ then
;;
*)
- DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-486 linux-image-686-pae"
+ case "${LB_DISTRIBUTION}" in
+ kali-dev|kali-rolling|kali-next|sana)
+ DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-586 linux-image-686-pae"
+ ;;
+ *)
+ DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-486 linux-image-686-pae"
+ ;;
+ esac
;;
esac
;;
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
Better-handle-empty-package-lists.patch
Use-linux-image-586-instead-of-linux-image-486-for-k.patch
Do-not-pass-the-version-to-apt-ftprelease-when-we-do.patch
Add-versions-for-Kali-releases.patch
Drop-elilo-from-list-of-d-i-required-packages-on-i38.patch
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