[kernel] r21827 - in dists/sid/linux/debian: . patches patches/features/arm

[Ben Hutchings]

Author: benh
Date: Fri Sep 12 14:29:43 2014
New Revision: 21827

Log:
[armhf] deb-pkg: Add automatic support for armhf architecture

Added:
   dists/sid/linux/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Fri Sep 12 14:24:52 2014	(r21826)
+++ dists/sid/linux/debian/changelog	Fri Sep 12 14:29:43 2014	(r21827)
@@ -63,6 +63,7 @@
     spectrum_cs to nic-wireless-modules
   * builddeb: put the dbg files into the correct directory
   * [ppc64el] deb-pkg: Add support for powerpc little endian
+  * [armhf] deb-pkg: Add automatic support for armhf architecture
 
   [ Ian Campbell ]
   * [armel/orion5x] udeb: Include mvmdio in nic-modules udeb.

Added: dists/sid/linux/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch	Fri Sep 12 14:29:43 2014	(r21827)
@@ -0,0 +1,44 @@
+Subject: deb-pkg: Add automatic support for armhf architecture
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 09 Jun 2014 01:21:34 +0100
+Forwarded: http://mid.gmane.org/1402273294.23860.59.camel@deadeye.wl.decadent.org.uk
+
+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 at decadent.org.uk>
+---
+v2: rebased
+
+After discussion with Hector, we agreed this would be a worthwhile
+change.  Hector may later improve this by using gcc specs.
+
+Ben.
+
+ scripts/package/builddeb | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -45,7 +45,16 @@ create_package() {
+ 	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
++		;;
+ 	*)
+ 		echo "" >&2
+ 		echo "** ** **  WARNING  ** ** **" >&2

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Fri Sep 12 14:24:52 2014	(r21826)
+++ dists/sid/linux/debian/patches/series	Fri Sep 12 14:29:43 2014	(r21827)
@@ -95,6 +95,7 @@
 features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.patch
 features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
 features/x86/x86-make-x32-syscall-support-conditional.patch
+features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
 
 # Miscellaneous bug fixes
 bugfix/all/misc-bmp085-Enable-building-as-a-module.patch