diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2016-11-23 20:27:03 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-06 04:40:17 -0500 |
| commit | c728f2b5edf24bac22b0549e3a5b3622c35b9eba (patch) | |
| tree | e82d1c75dbc59e2fa1ef6b7e130a5784d2eb0844 /scripts | |
| parent | e12096297ea55330cabe576596ad3f0b0fa4b8f4 (diff) | |
builddeb: fix cross-building to arm64 producing host-arch debs
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/package/builddeb | 2 |
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 |