aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2016-11-23 20:27:03 -0500
committerMichal Marek <mmarek@suse.com>2016-11-25 09:39:03 -0500
commit152b695d74376bfe55cd2a6265ccc75b0d39dd19 (patch)
tree6645c1606ce21541dc3d90e199c79c7bf0241089
parentc6a385539175ebc603da53aafb7753d39089f32e (diff)
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>
-rwxr-xr-xscripts/package/builddeb2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 8ea9fd2b6573..3c575cd07888 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -51,7 +51,7 @@ set_debarch() {
51 debarch=hppa ;; 51 debarch=hppa ;;
52 mips*) 52 mips*)
53 debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;; 53 debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
54 arm64) 54 aarch64|arm64)
55 debarch=arm64 ;; 55 debarch=arm64 ;;
56 arm*) 56 arm*)
57 if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then 57 if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then