From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com,
"Alex Bennée" <alex.bennee@linaro.org>,
richard.henderson@linaro.org, f4bug@amsat.org,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com,
pbonzini@redhat.com, aurelien@aurel32.net
Subject: [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts
Date: Fri, 24 Jan 2020 20:40:25 +0000 [thread overview]
Message-ID: <20200124204026.2107-13-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200124204026.2107-1-alex.bennee@linaro.org>
Now we have moved everything around we can re-enable the builds for
x86_64. Thanks to the descriptive names we are able to sort out QEMU
build and tests build dockerfiles and ensure the correct debian
dependencies.
Move the fedora, mxe and travis dockerfiles into the x86_64 directory
as they cannot be used on other architectures.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.../dockerfiles.x86_64/Makefile.include | 26 +++++++++++++++++++
.../debain10-x86_64-qemu-build.docker | 1 +
.../debian10-alpha-build-tests.docker | 1 +
.../debian10-amd64-build-qemu.docker | 1 +
.../debian10-arm64-build-qemu.docker | 1 +
.../debian10-armel-build-qemu.docker | 1 +
.../debian10-armhf-build-qemu.docker | 1 +
.../debian10-hppa-build-tests.docker | 1 +
.../debian10-m68k-build-tests.docker | 1 +
.../debian10-mips-build-qemu.docker | 1 +
.../debian10-mips64-build-tests.docker | 1 +
.../debian10-mips64el-build-qemu.docker | 1 +
.../debian10-mipsel-build-qemu.docker | 1 +
.../debian10-native-qemu-build.docker | 1 +
.../debian10-powerpc-build-tests.docker | 1 +
.../debian10-ppc64-build-tests.docker | 1 +
.../debian10-ppc64el-build-qemu.docker | 1 +
.../debian10-riscv64-build-tests.docker | 1 +
.../debian10-s390x-build-qemu.docker | 1 +
.../debian10-sh4-build-tests.docker | 1 +
.../debian10-sparc64-build-tests.docker | 1 +
.../debian9-mxe-win32-build-qemu.docker | 0
.../debian9-mxe-win64-build-qemu.docker | 0
.../debian9-mxe.docker | 0
.../debian9-tricore-build-tests.docker | 1 +
.../debian9-xtensa-build-tests.docker | 1 +
.../fedora-cris-build-tests.docker | 1 +
.../fedora-i386-build-tests.docker | 1 +
.../travis.docker | 0
29 files changed, 50 insertions(+)
create mode 100644 tests/docker/dockerfiles.x86_64/Makefile.include
create mode 120000 tests/docker/dockerfiles.x86_64/debain10-x86_64-qemu-build.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-alpha-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-amd64-build-qemu.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-arm64-build-qemu.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-armel-build-qemu.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-armhf-build-qemu.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-hppa-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-m68k-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-mips-build-qemu.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-mips64-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-mips64el-build-qemu.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-mipsel-build-qemu.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-native-qemu-build.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-powerpc-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-ppc64-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-ppc64el-build-qemu.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-riscv64-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-s390x-build-qemu.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-sh4-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian10-sparc64-build-tests.docker
rename tests/docker/{dockerfiles.cross => dockerfiles.x86_64}/debian9-mxe-win32-build-qemu.docker (100%)
rename tests/docker/{dockerfiles.cross => dockerfiles.x86_64}/debian9-mxe-win64-build-qemu.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.x86_64}/debian9-mxe.docker (100%)
create mode 120000 tests/docker/dockerfiles.x86_64/debian9-tricore-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/debian9-xtensa-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/fedora-cris-build-tests.docker
create mode 120000 tests/docker/dockerfiles.x86_64/fedora-i386-build-tests.docker
rename tests/docker/{dockerfiles => dockerfiles.x86_64}/travis.docker (100%)
diff --git a/tests/docker/dockerfiles.x86_64/Makefile.include b/tests/docker/dockerfiles.x86_64/Makefile.include
new file mode 100644
index 0000000000..6237eb500e
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/Makefile.include
@@ -0,0 +1,26 @@
+# -*- Mode: makefile -*-
+#
+# x86_64 Containers
+#
+# This architecture has by far the largest number of cross compilers
+# enabled for it.
+#
+
+X86_64_BASE = $(DOCKER_BASE)/dockerfiles.x86_64
+VPATH += $(X86_64_BASE)
+
+#
+# We have both QEMU build and TEST build containers we can access
+#
+QEMU_BUILD_CONTAINERS += $(call get-basenames,$(wildcard $(X86_64_BASE)/*-build-qemu.docker))
+TEST_BUILD_CONTAINERS += $(call get-basenames,$(wildcard $(X86_64_BASE)/*-build-tests.docker))
+
+# Generate build-deps based on names
+#
+# Most of this architecture are based on Debian images
+X86_64_CONTAINERS=$(call get-basenames,$(wildcard $(X86_64_BASE)/*.docker))
+$(filter-out,debian9,$(X86_64_CONTAINERS)): docker-image-debian9
+$(filter-out,debian10,$(X86_64_CONTAINERS)): docker-image-debian10
+
+# MXE windows cross compilers are all based on stretch
+debian9-mxe-%: docker-image-debian9-mxe
diff --git a/tests/docker/dockerfiles.x86_64/debain10-x86_64-qemu-build.docker b/tests/docker/dockerfiles.x86_64/debain10-x86_64-qemu-build.docker
new file mode 120000
index 0000000000..cd1caa0704
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debain10-x86_64-qemu-build.docker
@@ -0,0 +1 @@
+../dockerfiles/debian10-native-qemu-build.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-alpha-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian10-alpha-build-tests.docker
new file mode 120000
index 0000000000..614c8525ef
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-alpha-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-alpha-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-amd64-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian10-amd64-build-qemu.docker
new file mode 120000
index 0000000000..81aa695b35
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-amd64-build-qemu.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-amd64-build-qemu.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-arm64-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian10-arm64-build-qemu.docker
new file mode 120000
index 0000000000..911274674a
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-arm64-build-qemu.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-arm64-build-qemu.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-armel-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian10-armel-build-qemu.docker
new file mode 120000
index 0000000000..ad6302f721
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-armel-build-qemu.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-armel-build-qemu.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-armhf-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian10-armhf-build-qemu.docker
new file mode 120000
index 0000000000..a5111afb01
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-armhf-build-qemu.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-armhf-build-qemu.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-hppa-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian10-hppa-build-tests.docker
new file mode 120000
index 0000000000..4ce5da228d
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-hppa-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-hppa-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-m68k-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian10-m68k-build-tests.docker
new file mode 120000
index 0000000000..402972365f
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-m68k-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-m68k-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-mips-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian10-mips-build-qemu.docker
new file mode 120000
index 0000000000..9b4fc155f3
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-mips-build-qemu.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-mips-build-qemu.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-mips64-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian10-mips64-build-tests.docker
new file mode 120000
index 0000000000..89fef7d8ac
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-mips64-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-mips64-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-mips64el-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian10-mips64el-build-qemu.docker
new file mode 120000
index 0000000000..1ef8ccfec6
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-mips64el-build-qemu.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-mips64el-build-qemu.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-mipsel-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian10-mipsel-build-qemu.docker
new file mode 120000
index 0000000000..9c1a090aba
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-mipsel-build-qemu.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-mipsel-build-qemu.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-native-qemu-build.docker b/tests/docker/dockerfiles.x86_64/debian10-native-qemu-build.docker
new file mode 120000
index 0000000000..cd1caa0704
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-native-qemu-build.docker
@@ -0,0 +1 @@
+../dockerfiles/debian10-native-qemu-build.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-powerpc-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian10-powerpc-build-tests.docker
new file mode 120000
index 0000000000..2480077366
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-powerpc-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-powerpc-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-ppc64-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian10-ppc64-build-tests.docker
new file mode 120000
index 0000000000..e9290dcf63
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-ppc64-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-ppc64-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-ppc64el-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian10-ppc64el-build-qemu.docker
new file mode 120000
index 0000000000..6c1639cf6d
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-ppc64el-build-qemu.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-ppc64el-build-qemu.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-riscv64-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian10-riscv64-build-tests.docker
new file mode 120000
index 0000000000..06493c2663
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-riscv64-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-riscv64-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-s390x-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian10-s390x-build-qemu.docker
new file mode 120000
index 0000000000..f08338748e
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-s390x-build-qemu.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-s390x-build-qemu.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-sh4-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian10-sh4-build-tests.docker
new file mode 120000
index 0000000000..771ac25b23
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-sh4-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-sh4-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian10-sparc64-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian10-sparc64-build-tests.docker
new file mode 120000
index 0000000000..0187622e06
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian10-sparc64-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian10-sparc64-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.cross/debian9-mxe-win32-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian9-mxe-win32-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian9-mxe-win32-build-qemu.docker
rename to tests/docker/dockerfiles.x86_64/debian9-mxe-win32-build-qemu.docker
diff --git a/tests/docker/dockerfiles.cross/debian9-mxe-win64-build-qemu.docker b/tests/docker/dockerfiles.x86_64/debian9-mxe-win64-build-qemu.docker
similarity index 100%
rename from tests/docker/dockerfiles.cross/debian9-mxe-win64-build-qemu.docker
rename to tests/docker/dockerfiles.x86_64/debian9-mxe-win64-build-qemu.docker
diff --git a/tests/docker/dockerfiles/debian9-mxe.docker b/tests/docker/dockerfiles.x86_64/debian9-mxe.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian9-mxe.docker
rename to tests/docker/dockerfiles.x86_64/debian9-mxe.docker
diff --git a/tests/docker/dockerfiles.x86_64/debian9-tricore-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian9-tricore-build-tests.docker
new file mode 120000
index 0000000000..75f342fc01
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian9-tricore-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian9-tricore-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/debian9-xtensa-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian9-xtensa-build-tests.docker
new file mode 120000
index 0000000000..b531d9332d
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/debian9-xtensa-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian9-xtensa-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/fedora-cris-build-tests.docker b/tests/docker/dockerfiles.x86_64/fedora-cris-build-tests.docker
new file mode 120000
index 0000000000..4f260380a9
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/fedora-cris-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/fedora-cris-build-tests.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.x86_64/fedora-i386-build-tests.docker b/tests/docker/dockerfiles.x86_64/fedora-i386-build-tests.docker
new file mode 120000
index 0000000000..373f15ee40
--- /dev/null
+++ b/tests/docker/dockerfiles.x86_64/fedora-i386-build-tests.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/fedora-i386-build-qemu.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles.x86_64/travis.docker
similarity index 100%
rename from tests/docker/dockerfiles/travis.docker
rename to tests/docker/dockerfiles.x86_64/travis.docker
--
2.20.1
next prev parent reply other threads:[~2020-01-24 20:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
2020-01-24 20:40 ` [PATCH v1 01/13] tests/docker: move most cross compilers to buster base Alex Bennée
2020-01-24 20:40 ` [PATCH v1 02/13] tests/docker: better handle symlinked libs Alex Bennée
2020-01-27 19:24 ` Philippe Mathieu-Daudé
2020-01-24 20:40 ` [PATCH v1 03/13] gitlab-ci: Refresh the list of iotests Alex Bennée
2020-01-24 20:40 ` [PATCH v1 04/13] travis.yml: Install genisoimage package Alex Bennée
2020-01-24 20:40 ` [PATCH v1 05/13] .shippable: --disable-docs for cross-compile tests Alex Bennée
2020-01-24 20:40 ` [PATCH v1 06/13] tests/docker: move all cross-compilers images into dockerfiles.cross Alex Bennée
2020-01-24 20:40 ` [PATCH v1 07/13] tests/docker: move all multiarch containers into dockerfiles.multiarch Alex Bennée
2020-01-24 20:40 ` [PATCH v1 08/13] tests/docker: search the tests/docker tree to inline parent dockerfile Alex Bennée
2020-01-24 20:40 ` [PATCH v1 09/13] tests/docker: switch to multiarch aware container support Alex Bennée
2020-01-24 20:40 ` [PATCH v1 10/13] tests/docker: add debian10-native-qemu-build Alex Bennée
2020-01-27 19:41 ` Philippe Mathieu-Daudé
2020-01-24 20:40 ` [PATCH v1 11/13] tests/docker: rename the cross builds Alex Bennée
2020-01-24 20:40 ` Alex Bennée [this message]
2020-01-24 22:29 ` [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts Richard Henderson
2020-01-27 18:30 ` Alex Bennée
2020-01-27 19:38 ` Philippe Mathieu-Daudé
2020-01-27 19:43 ` Philippe Mathieu-Daudé
2020-01-24 20:40 ` [PATCH v1 13/13] tests/docker: enable cross-compilers for aarch64 Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200124204026.2107-13-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).