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 <[email protected]>
Acked-by: Ian Campbell <[email protected]>
Acked-by: Fathi Boudra <[email protected]>
Reviewed-by: Riku Voipio <[email protected]>
Signed-off-by: Michal Marek <[email protected]>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 0cd46e129920e8ad114eb335ae92ce85230d068d..2194a95e0904d323abb99f84c10d16da999d8c5d 100755 (executable)
--- 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