OSDN Git Service

builddeb: fix cross-building to arm64 producing host-arch debs
authorAdam Borowski <kilobyte@angband.pl>
Thu, 24 Nov 2016 01:27:03 +0000 (02:27 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jan 2017 09:40:17 +0000 (10:40 +0100)
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@angband.pl>
Acked-by: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
scripts/package/builddeb

index 8ea9fd2..3c575cd 100755 (executable)
@@ -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