[linux] 01/08: debian/rules.d/Makefile: Override architecture detection when building userland headers

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 7d8366f3754c3a44a2f6cca7409297bab7ed15d3
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jun 12 18:50:32 2016 +0100

    debian/rules.d/Makefile: Override architecture detection when building userland headers
    
    Martin Michlmayr found that userland builds fail if 'uname -m' reports
    the native kernel architecture, and that's because we don't explicitly
    set ARCH for the headers_install target.  That's fine for most cases
    of a 32-bit chroot on a 64-bit kernel because a single source
    architecture covers both, but arm/arm64 is an exception.
    
    This doesn't make actual cross-builds of userland tools work.
---
 debian/changelog        | 2 ++
 debian/rules.d/Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aab6079..1518313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ linux (4.7~rc2-1~exp1) UNRELEASED; urgency=medium
     later be signed
   * [rt] Disable until it is updated for 4.7 or later
   * cpupower: Bump soname version and rename library package accordingly
+  * debian/rules.d/Makefile: Override architecture detection when building
+    userland headers
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 07 Jun 2016 19:37:55 +0100
 
diff --git a/debian/rules.d/Makefile b/debian/rules.d/Makefile
index b03a795..6fab0dc 100644
--- a/debian/rules.d/Makefile
+++ b/debian/rules.d/Makefile
@@ -11,6 +11,6 @@ include $(top_rulesdir)/Makefile.inc
 # Build userland headers first
 unexport VERSION
 all-local:
-	$(MAKE) -C $(top_srcdir) O=$(CURDIR) \
+	$(MAKE) -C $(top_srcdir) ARCH=$(KERNEL_ARCH) O=$(CURDIR) \
 		INSTALL_HDR_PATH=$(CURDIR) headers_install
 all-recursive: all-local

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git