summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2015-09-28 02:34:40 +0100
committerMichal Marek <mmarek@suse.com>2015-10-26 22:34:26 +0100
commit63a478fbc05cb0627b0a33a69f3aed8dcb965953 (patch)
tree4782ec0add16bf639545bcf52ff5c7ac81496c84
parent7c2aa6116b5bdc0cc09ae5917ea0b5ef3cc45cec (diff)
downloadlinux-stable-63a478fbc05cb0627b0a33a69f3aed8dcb965953.tar.gz
linux-stable-63a478fbc05cb0627b0a33a69f3aed8dcb965953.tar.bz2
linux-stable-63a478fbc05cb0627b0a33a69f3aed8dcb965953.zip
deb-pkg: Add automatic support for armhf architecture
The Debian armhf architecture uses the ARM EABI hard-float variant, whereas armel uses the soft-float variant. Although the kernel doesn't use FP itself, CONFIG_VFP must be enabled to support hard-float userland and will probably be disabled when supporting a soft-float userland. So set the architecture to armhf by default when CONFIG_AEABI and CONFIG_VFP are both enabled. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Acked-by: Ian Campbell <ijc@hellion.org.uk> Acked-by: Fathi Boudra <fathi.boudra@linaro.org> Reviewed-by: Riku Voipio <riku.voipio@linaro.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rwxr-xr-xscripts/package/builddeb11
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 0cd46e129920..2194a95e0904 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -52,7 +52,16 @@ set_debarch() {
arm64)
debarch=arm64 ;;
arm*)
- debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;;
+ if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
+ if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then
+ debarch=armhf
+ else
+ debarch=armel
+ fi
+ else
+ debarch=arm
+ fi
+ ;;
*)
debarch=$(dpkg --print-architecture)
echo "" >&2