The fact they are cross builds is known by virtue of where they are in
the system. Simplify the naming to a new scheme:
$(BASEOS)-$(ARCH)-build-(qemu|tests)
Ultimately we will be able to build again $ARCH with something like:
make docker-test-build@debian10-arm64-build-qemu
On whatever host architecture we are running on.
Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
---
.../debian10-alpha-test-build.docker | 1 +
...cker => debian10-alpha-build-tests.docker} | 0
...ocker => debian10-amd64-build-qemu.docker} | 0
...ocker => debian10-arm64-build-qemu.docker} | 0
...ocker => debian10-armel-build-qemu.docker} | 0
...ocker => debian10-armhf-build-qemu.docker} | 0
...ocker => debian10-hppa-build-tests.docker} | 0
...ocker => debian10-m68k-build-tests.docker} | 0
...docker => debian10-mips-build-qemu.docker} | 0
...ker => debian10-mips64-build-tests.docker} | 0
...er => debian10-mips64el-build-qemu.docker} | 0
...cker => debian10-mipsel-build-qemu.docker} | 0
...er => debian10-powerpc-build-tests.docker} | 0
...cker => debian10-ppc64-build-tests.docker} | 0
...ker => debian10-ppc64el-build-qemu.docker} | 0
...er => debian10-riscv64-build-tests.docker} | 0
...ocker => debian10-s390x-build-qemu.docker} | 0
...docker => debian10-sh4-build-tests.docker} | 0
...er => debian10-sparc64-build-tests.docker} | 0
...er => debian9-mxe-win32-build-qemu.docker} | 0
...er => debian9-mxe-win64-build-qemu.docker} | 0
...ker => debian9-tricore-build-tests.docker} | 0
...cker => debian9-xtensa-build-tests.docker} | 0
....docker => fedora-cris-build-tests.docker} | 0
...s.docker => fedora-i386-build-qemu.docker} | 0
tests/tcg/configure.sh | 38 +++++++++----------
26 files changed, 20 insertions(+), 19 deletions(-)
create mode 120000
tests/docker/dockerfiles.aarch64/debian10-alpha-test-build.docker
rename tests/docker/dockerfiles.cross/{debian-alpha-cross.docker =>
debian10-alpha-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-amd64-cross.docker =>
debian10-amd64-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-arm64-cross.docker =>
debian10-arm64-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-armel-cross.docker =>
debian10-armel-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-armhf-cross.docker =>
debian10-armhf-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-hppa-cross.docker =>
debian10-hppa-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-m68k-cross.docker =>
debian10-m68k-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-mips-cross.docker =>
debian10-mips-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-mips64-cross.docker =>
debian10-mips64-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-mips64el-cross.docker =>
debian10-mips64el-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-mipsel-cross.docker =>
debian10-mipsel-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-powerpc-cross.docker =>
debian10-powerpc-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-ppc64-cross.docker =>
debian10-ppc64-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-ppc64el-cross.docker =>
debian10-ppc64el-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-riscv64-cross.docker =>
debian10-riscv64-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-s390x-cross.docker =>
debian10-s390x-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-sh4-cross.docker =>
debian10-sh4-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-sparc64-cross.docker =>
debian10-sparc64-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-win32-cross.docker =>
debian9-mxe-win32-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-win64-cross.docker =>
debian9-mxe-win64-build-qemu.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-tricore-cross.docker =>
debian9-tricore-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{debian-xtensa-cross.docker =>
debian9-xtensa-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{fedora-cris-cross.docker =>
fedora-cris-build-tests.docker} (100%)
rename tests/docker/dockerfiles.cross/{fedora-i386-cross.docker =>
fedora-i386-build-qemu.docker} (100%)
diff --git a/tests/docker/dockerfiles.aarch64/debian10-alpha-test-build.docker
b/tests/docker/dockerfiles.aarch64/debian10-alpha-test-build.docker
new file mode 120000
index 0000000000..a3f037c624
--- /dev/null
+++ b/tests/docker/dockerfiles.aarch64/debian10-alpha-test-build.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian-alpha-cross.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.cross/debian-alpha-cross.docker
b/tests/docker/dockerfiles.cross/debian10-alpha-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-alpha-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-alpha-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/debian-amd64-cross.docker
b/tests/docker/dockerfiles.cross/debian10-amd64-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-amd64-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-amd64-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-arm64-cross.docker
b/tests/docker/dockerfiles.cross/debian10-arm64-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-arm64-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-arm64-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-armel-cross.docker
b/tests/docker/dockerfiles.cross/debian10-armel-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-armel-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-armel-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-armhf-cross.docker
b/tests/docker/dockerfiles.cross/debian10-armhf-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-armhf-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-armhf-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-hppa-cross.docker
b/tests/docker/dockerfiles.cross/debian10-hppa-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-hppa-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-hppa-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/debian-m68k-cross.docker
b/tests/docker/dockerfiles.cross/debian10-m68k-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-m68k-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-m68k-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/debian-mips-cross.docker
b/tests/docker/dockerfiles.cross/debian10-mips-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-mips-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-mips-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-mips64-cross.docker
b/tests/docker/dockerfiles.cross/debian10-mips64-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-mips64-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-mips64-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/debian-mips64el-cross.docker
b/tests/docker/dockerfiles.cross/debian10-mips64el-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-mips64el-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-mips64el-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-mipsel-cross.docker
b/tests/docker/dockerfiles.cross/debian10-mipsel-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-mipsel-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-mipsel-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-powerpc-cross.docker
b/tests/docker/dockerfiles.cross/debian10-powerpc-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-powerpc-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-powerpc-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/debian-ppc64-cross.docker
b/tests/docker/dockerfiles.cross/debian10-ppc64-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-ppc64-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-ppc64-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/debian-ppc64el-cross.docker
b/tests/docker/dockerfiles.cross/debian10-ppc64el-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-ppc64el-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-ppc64el-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-riscv64-cross.docker
b/tests/docker/dockerfiles.cross/debian10-riscv64-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-riscv64-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-riscv64-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/debian-s390x-cross.docker
b/tests/docker/dockerfiles.cross/debian10-s390x-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-s390x-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-s390x-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-sh4-cross.docker
b/tests/docker/dockerfiles.cross/debian10-sh4-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-sh4-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-sh4-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/debian-sparc64-cross.docker
b/tests/docker/dockerfiles.cross/debian10-sparc64-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-sparc64-cross.docker
rename to tests/docker/dockerfiles.cross/debian10-sparc64-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/debian-win32-cross.docker
b/tests/docker/dockerfiles.cross/debian9-mxe-win32-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-win32-cross.docker
rename to tests/docker/dockerfiles.cross/debian9-mxe-win32-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-win64-cross.docker
b/tests/docker/dockerfiles.cross/debian9-mxe-win64-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-win64-cross.docker
rename to tests/docker/dockerfiles.cross/debian9-mxe-win64-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian-tricore-cross.docker
b/tests/docker/dockerfiles.cross/debian9-tricore-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-tricore-cross.docker
rename to tests/docker/dockerfiles.cross/debian9-tricore-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/debian-xtensa-cross.docker
b/tests/docker/dockerfiles.cross/debian9-xtensa-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian-xtensa-cross.docker
rename to tests/docker/dockerfiles.cross/debian9-xtensa-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/fedora-cris-cross.docker
b/tests/docker/dockerfiles.cross/fedora-cris-build-tests.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/fedora-cris-cross.docker
rename to tests/docker/dockerfiles.cross/fedora-cris-build-tests.docker
diff --git a/tests/docker/dockerfiles.cross/fedora-i386-cross.docker
b/tests/docker/dockerfiles.cross/fedora-i386-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/fedora-i386-cross.docker
rename to tests/docker/dockerfiles.cross/fedora-i386-build-qemu.docker
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 210e68396f..0b2b62cfa0 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -97,80 +97,80 @@ for target in $target_list; do
case $target in
aarch64-*)
# We don't have any bigendian build tools so we only use this for AArch64
- container_image=debian-arm64-cross
+ container_image=debian-arm64-build-qemu
container_cross_cc=aarch64-linux-gnu-gcc
;;
alpha-*)
- container_image=debian-alpha-cross
+ container_image=debian10-alpha-build-tests
container_cross_cc=alpha-linux-gnu-gcc
;;
arm-*)
# We don't have any bigendian build tools so we only use this for ARM
- container_image=debian-armhf-cross
+ container_image=debian10-armhf-build-qemu
container_cross_cc=arm-linux-gnueabihf-gcc
;;
cris-*)
- container_image=fedora-cris-cross
+ container_image=fedora-cris-build-tests
container_cross_cc=cris-linux-gnu-gcc
;;
hppa-*)
- container_image=debian-hppa-cross
+ container_image=debian10-hppa-build-tests
container_cross_cc=hppa-linux-gnu-gcc
;;
i386-*)
- container_image=fedora-i386-cross
+ container_image=fedora-i386-build-qemu
container_cross_cc=gcc
;;
m68k-*)
- container_image=debian-m68k-cross
+ container_image=debian10-m68k-build-tests
container_cross_cc=m68k-linux-gnu-gcc
;;
mips64el-*)
- container_image=debian-mips64el-cross
+ container_image=debian10-mips64el-build-qemu
container_cross_cc=mips64el-linux-gnuabi64-gcc
;;
mips64-*)
- container_image=debian-mips64-cross
+ container_image=debian10-mips64-build-tests
container_cross_cc=mips64-linux-gnuabi64-gcc
;;
mipsel-*)
- container_image=debian-mipsel-cross
+ container_image=debian10-mipsel-build-qemu
container_cross_cc=mipsel-linux-gnu-gcc
;;
mips-*)
- container_image=debian-mips-cross
+ container_image=debian10-mips-build-qemu
container_cross_cc=mips-linux-gnu-gcc
;;
ppc-*|ppc64abi32-*)
- container_image=debian-powerpc-cross
+ container_image=debian10-powerpc-build-tests
container_cross_cc=powerpc-linux-gnu-gcc
;;
ppc64-*)
- container_image=debian-ppc64-cross
+ container_image=debian10-ppc64-build-tests
container_cross_cc=powerpc64-linux-gnu-gcc
;;
ppc64le-*)
- container_image=debian-ppc64el-cross
+ container_image=debian10-ppc64el-build-qemu
container_cross_cc=powerpc64le-linux-gnu-gcc
;;
riscv64-*)
- container_image=debian-riscv64-cross
+ container_image=debian10-riscv64-build-tests
container_cross_cc=riscv64-linux-gnu-gcc
;;
s390x-*)
- container_image=debian-s390x-cross
+ container_image=debian10-s390x-build-qemu
container_cross_cc=s390x-linux-gnu-gcc
;;
sh4-*)
- container_image=debian-sh4-cross
+ container_image=debian10-sh4-build-tests
container_cross_cc=sh4-linux-gnu-gcc
;;
sparc64-*)
- container_image=debian-sparc64-cross
+ container_image=debian10-sparc64-build-tests
container_cross_cc=sparc64-linux-gnu-gcc
;;
xtensa*-softmmu)
- container_image=debian-xtensa-cross
+ container_image=debian9-xtensa-build-tests
# default to the dc232b cpu
container_cross_cc=/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc
--
2.20.1
