UBUNTU: Set build_arch=x86 for amd64 and x32

The kernel build infrastructure expects the value of ARCH to be
the same as the architecture subdirectory in arch/*. The values
for amd64 and x32 are not, so fix them to be what the kernel
expects.

This fixes a build problem with the perf tools.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
index 3de7b6dfd61e59b6fd0f81e8bfc850c58eadad27..c6b57f7babe444282df9cf721d73110d775ab7af 100644 (file)
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -1,5 +1,5 @@
 human_arch     = 64 bit x86
-build_arch     = x86_64
+build_arch     = x86
 header_arch    = $(build_arch)
 defconfig      = defconfig
 flavours       = generic lowlatency

diff --git a/debian.master/rules.d/x32.mk b/debian.master/rules.d/x32.mk
index 94d4c8325104dd41c6ff1abc76e8904fe66be9d4..e0ccff961f02afdf400df04d62dc1ab92b11e372 100644 (file)
--- a/debian.master/rules.d/x32.mk
+++ b/debian.master/rules.d/x32.mk
@@ -1,5 +1,5 @@
 human_arch     = 64 bit x86 (32 bit userspace)
-build_arch     = x86_64
+build_arch     = x86
 header_arch    = $(build_arch)
 defconfig      = defconfig
 flavours       =