Bug#980360: u-boot: Encode the GNU type instead of the Debian arch alias for qemu

[Nicolas Boulenguez]

Source: u-boot
Severity: wishlist
Tags: patch

This removes an unneeded dpkg-architecture-like conversion.

If the attached solution is refused, I suggest
# dpkg-architecture -a$ARCH -qDEB_HOST_GNU_TYPE
instead of a hard-coded case statement.

The attached patch follows 980236 but is easily adapted if necessary.

>From 970c82463306e99342d160e9774c09c584bb44df Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Sun, 17 Jan 2021 11:25:08 +0100
Subject: Encode the GNU type instead of the Debian arch alias for qemu

This removes an unneeded dpkg-architecture-like conversion.

diff --git a/debian/rules b/debian/rules
index 1e82ad0a6b..43cabad022 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,15 +76,7 @@ build-targets: configs/novena-rawsd_defconfig 
configs/am335x_boneblack_defconfig
                                ;; \
                esac;\
                case $$arch in \
-                       all:armhf) CROSS_COMPILE=arm-linux-gnueabihf- ;;\
-                       all:arm64) CROSS_COMPILE=aarch64-linux-gnu- ;;\
-                       all:mips) CROSS_COMPILE=mips-linux-gnu- ;;\
-                       all:mipsel) CROSS_COMPILE=mipsel-linux-gnu- ;;\
-                       all:mips64el) CROSS_COMPILE=mips64el-linux-gnuabi64- ;;\
-                       all:powerpc) CROSS_COMPILE=powerpc-linux-gnu- ;;\
-                       all:riscv64) CROSS_COMPILE=riscv64-linux-gnu- ;;\
-                       all:i386) CROSS_COMPILE=i686-linux-gnu- ;;\
-                       all:amd64) CROSS_COMPILE=x86_64-linux-gnu- ;;\
+                       all:*) CROSS_COMPILE=$${arch#all:}- ;;\
                        *) CROSS_COMPILE=$(CROSS_COMPILE) ;; \
                esac;\
                case $$subarch in \
diff --git a/debian/targets b/debian/targets
index d8aeaac582..451740b752 100644
--- a/debian/targets
+++ b/debian/targets
@@ -271,10 +271,10 @@ riscv64   sifive  sifive_fu540    u-boot.bin
 
 sh4    -               r2dplus         u-boot.bin
 
-all:amd64      qemu    qemu-x86_64     u-boot.bin u-boot.rom
-all:armhf      qemu    qemu_arm        u-boot.bin
-all:arm64      qemu    qemu_arm64      u-boot.bin
-all:i386       qemu    qemu-x86        u-boot.bin u-boot.rom
-all:powerpc    qemu    qemu-ppce500    u-boot.bin
-all:riscv64    qemu    qemu-riscv64    u-boot.bin
-all:riscv64    qemu    qemu-riscv64_smode      u-boot.bin
+all:x86_64-linux-gnu   qemu    qemu-x86_64     u-boot.bin u-boot.rom
+all:arm-linux-gnueabihf        qemu    qemu_arm        u-boot.bin
+all:aarch64-linux-gnu  qemu    qemu_arm64      u-boot.bin
+all:i686-linux-gnu     qemu    qemu-x86        u-boot.bin u-boot.rom
+all:powerpc-linux-gnu  qemu    qemu-ppce500    u-boot.bin
+all:riscv64-linux-gnu  qemu    qemu-riscv64    u-boot.bin
+all:riscv64-linux-gnu  qemu    qemu-riscv64_smode      u-boot.bin