builddeb: fix cross-building to arm64 producing host-arch debs

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@angband.pl>
Acked-by: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Michal Marek <mmarek@suse.com>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 8ea9fd2b65736c42b055791ee88b9151a573a02d..3c575cd07888807d14693ad8475b6b5a953a1ca4 100755 (executable)
--- 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