[PATCH 4.9 82/83] builddeb: fix cross-building to arm64 producing host-arch debs

From: Greg Kroah-Hartman
Date: Wed Jan 04 2017 - 15:14:20 EST


4.9-stable review patch. If anyone has any objections, please let me know.

------------------

From: Adam Borowski <kilobyte@xxxxxxxxxx>

commit 152b695d74376bfe55cd2a6265ccc75b0d39dd19 upstream.

Both Debian and kernel archs are "arm64" but UTS_MACHINE and gcc say
"aarch64". Recognizing just the latter should be enough but let's
accept both in case something regresses again or an user sets
UTS_MACHINE=arm64.

Regressed in cfa88c7: arm64: Set UTS_MACHINE in the Makefile.

Signed-off-by: Adam Borowski <kilobyte@xxxxxxxxxx>
Acked-by: Riku Voipio <riku.voipio@xxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
scripts/package/builddeb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -51,7 +51,7 @@ set_debarch() {
debarch=hppa ;;
mips*)
debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
- arm64)
+ aarch64|arm64)
debarch=arm64 ;;
arm*)
if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then