Commit 550c009c authored by Raphaël Hertzog's avatar Raphaël Hertzog
Browse files

Make the armel/armhf patch upstreamable.

parent e4f26f5d
...@@ -9,6 +9,7 @@ live-build (4.0.3-1kali2) kali-dev; urgency=medium ...@@ -9,6 +9,7 @@ live-build (4.0.3-1kali2) kali-dev; urgency=medium
- fix the #if conditionals - fix the #if conditionals
- accept comments in those files - accept comments in those files
- do not fail on empty package lists - do not fail on empty package lists
* Make the armel/armhf patch upstreamable.
-- Sophie Brun <sophie@freexian.com> Tue, 02 Dec 2014 15:56:49 +0100 -- Sophie Brun <sophie@freexian.com> Tue, 02 Dec 2014 15:56:49 +0100
......
...@@ -2,25 +2,33 @@ From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org> ...@@ -2,25 +2,33 @@ From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <hertzog@debian.org>
Date: Fri, 5 Dec 2014 09:36:27 +0100 Date: Fri, 5 Dec 2014 09:36:27 +0100
Subject: Update linux flavours for armhf/armel Subject: Update linux flavours for armhf/armel
With 3.12+ kernels, on armhf, only armmp / armmp-lpae flavours are With linux 3.16 of Debian Jessie, armmp and armmp-lpae are the
available. With Linux 3.14, armel lost the support of the iop32x and only armhf flavours availale. On armel, we lost the support of
ixp4xx flavors. the iop32x flavors.
Kali has linux 3.14 (or newer) and needs to adapt to this. Linux 3.14 used in Kali doesn't build the ixp4xx flavor, so keep that
one disabled too.
--- ---
functions/defaults.sh | 6 +++--- functions/defaults.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh diff --git a/functions/defaults.sh b/functions/defaults.sh
index feebdee..715869c 100755 index feebdee..0d5fa4f 100755
--- a/functions/defaults.sh --- a/functions/defaults.sh
+++ b/functions/defaults.sh +++ b/functions/defaults.sh
@@ -525,15 +525,15 @@ Set_defaults () @@ -525,15 +525,29 @@ Set_defaults ()
*) *)
# armel will have special images: one rootfs image and many additional kernel images. # armel will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armel flavours # therefore we default to all available armel flavours
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}" - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}"
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-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 esac
;; ;;
...@@ -30,7 +38,14 @@ index feebdee..715869c 100755 ...@@ -30,7 +38,14 @@ index feebdee..715869c 100755
- # therefore we default to all available armel flavours - # therefore we default to all available armel flavours
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}" - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}"
+ # therefore we default to all available armhf flavours + # therefore we default to all available armhf flavours
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}" + case "${LB_DISTRIBUTION}" in
+ wheezy)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}"
+ ;;
+ *)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}"
+ ;;
+ esac
;; ;;
amd64) amd64)
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