* [PATCH v1 00/13] docker multiarch awareness
@ 2020-01-24 20:40 Alex Bennée
2020-01-24 20:40 ` [PATCH v1 01/13] tests/docker: move most cross compilers to buster base Alex Bennée
` (12 more replies)
0 siblings, 13 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, cota, stefanha, marcandre.lureau, pbonzini, aurelien
Hi,
This is a series I've had on the back-burner for awhile. The idea is
to make the docker build system fully multiarch aware. Much like the
check-tcg system this involves a bunch of included Makefile
fragments. It also tries to address the need to track docker
dependencies in the Makefile explicitly by allowing more automatic
resolution.
One area where I'd like advice is if we should bother to make the
build targets backwards compatible - or is it fair to ask developers
to go through the pain of retraining their brains for the more regular
naming:
make docker-test-build@debian10-arm64-build-qemu J=30
I've included testing/next out of completeness.
Alex Bennée (11):
tests/docker: move most cross compilers to buster base
tests/docker: better handle symlinked libs
.shippable: --disable-docs for cross-compile tests
tests/docker: move all cross-compilers images into dockerfiles.cross
tests/docker: move all multiarch containers into dockerfiles.multiarch
tests/docker: search the tests/docker tree to inline parent dockerfile
tests/docker: switch to multiarch aware container support
tests/docker: add debian10-native-qemu-build
tests/docker: rename the cross builds
tests/docker: re-enable cross-compiling for x86_64 hosts
tests/docker: enable cross-compilers for aarch64
Thomas Huth (1):
gitlab-ci: Refresh the list of iotests
Wainer dos Santos Moschetta (1):
travis.yml: Install genisoimage package
.gitlab-ci.yml | 12 +-
.shippable.yml | 2 +-
.travis.yml | 8 ++
tests/docker/Makefile.include | 126 +++++++-----------
tests/docker/docker.py | 12 +-
.../dockerfiles.aarch64/Makefile.include | 24 ++++
.../debian10-aarch64-qemu-build.docker | 1 +
.../debian10-alpha-test-build.docker | 1 +
.../debian10-x86_64-qemu-build.docker | 1 +
.../debian9-armel-qemu-build.docker | 1 +
.../debian10-alpha-build-tests.docker} | 0
.../debian10-amd64-build-qemu.docker} | 0
.../debian10-arm64-build-qemu.docker} | 0
.../debian10-armel-build-qemu.docker} | 2 +-
.../debian10-armhf-build-qemu.docker} | 2 +-
.../debian10-hppa-build-tests.docker} | 0
.../debian10-m68k-build-tests.docker} | 0
.../debian10-mips-build-qemu.docker} | 0
.../debian10-mips64-build-tests.docker} | 0
.../debian10-mips64el-build-qemu.docker} | 2 +-
.../debian10-mipsel-build-qemu.docker} | 2 +-
.../debian10-powerpc-build-tests.docker} | 0
.../debian10-ppc64-build-tests.docker} | 0
.../debian10-ppc64el-build-qemu.docker} | 2 +-
.../debian10-riscv64-build-tests.docker} | 0
.../debian10-s390x-build-qemu.docker} | 2 +-
.../debian10-sh4-build-tests.docker} | 0
.../debian10-sparc64-build-tests.docker} | 0
.../debian9-tricore-build-tests.docker} | 0
.../debian9-xtensa-build-tests.docker} | 0
.../fedora-cris-build-tests.docker} | 0
.../fedora-i386-build-qemu.docker} | 0
.../dockerfiles.multiarch/Makefile.include | 17 +++
.../debian10.docker | 0
.../debian9.docker | 0
.../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
tests/docker/dockerfiles/debian-amd64.docker | 2 +-
.../debian10-native-qemu-build.docker | 15 +++
tests/tcg/configure.sh | 38 +++---
67 files changed, 204 insertions(+), 118 deletions(-)
create mode 100644 tests/docker/dockerfiles.aarch64/Makefile.include
create mode 120000 tests/docker/dockerfiles.aarch64/debian10-aarch64-qemu-build.docker
create mode 120000 tests/docker/dockerfiles.aarch64/debian10-alpha-test-build.docker
create mode 120000 tests/docker/dockerfiles.aarch64/debian10-x86_64-qemu-build.docker
create mode 120000 tests/docker/dockerfiles.aarch64/debian9-armel-qemu-build.docker
rename tests/docker/{dockerfiles/debian-alpha-cross.docker => dockerfiles.cross/debian10-alpha-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/debian-amd64-cross.docker => dockerfiles.cross/debian10-amd64-build-qemu.docker} (100%)
rename tests/docker/{dockerfiles/debian-arm64-cross.docker => dockerfiles.cross/debian10-arm64-build-qemu.docker} (100%)
rename tests/docker/{dockerfiles/debian-armel-cross.docker => dockerfiles.cross/debian10-armel-build-qemu.docker} (97%)
rename tests/docker/{dockerfiles/debian-armhf-cross.docker => dockerfiles.cross/debian10-armhf-build-qemu.docker} (97%)
rename tests/docker/{dockerfiles/debian-hppa-cross.docker => dockerfiles.cross/debian10-hppa-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/debian-m68k-cross.docker => dockerfiles.cross/debian10-m68k-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/debian-mips-cross.docker => dockerfiles.cross/debian10-mips-build-qemu.docker} (100%)
rename tests/docker/{dockerfiles/debian-mips64-cross.docker => dockerfiles.cross/debian10-mips64-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/debian-mips64el-cross.docker => dockerfiles.cross/debian10-mips64el-build-qemu.docker} (98%)
rename tests/docker/{dockerfiles/debian-mipsel-cross.docker => dockerfiles.cross/debian10-mipsel-build-qemu.docker} (97%)
rename tests/docker/{dockerfiles/debian-powerpc-cross.docker => dockerfiles.cross/debian10-powerpc-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/debian-ppc64-cross.docker => dockerfiles.cross/debian10-ppc64-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/debian-ppc64el-cross.docker => dockerfiles.cross/debian10-ppc64el-build-qemu.docker} (97%)
rename tests/docker/{dockerfiles/debian-riscv64-cross.docker => dockerfiles.cross/debian10-riscv64-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/debian-s390x-cross.docker => dockerfiles.cross/debian10-s390x-build-qemu.docker} (98%)
rename tests/docker/{dockerfiles/debian-sh4-cross.docker => dockerfiles.cross/debian10-sh4-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/debian-sparc64-cross.docker => dockerfiles.cross/debian10-sparc64-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/debian-tricore-cross.docker => dockerfiles.cross/debian9-tricore-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/debian-xtensa-cross.docker => dockerfiles.cross/debian9-xtensa-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/fedora-cris-cross.docker => dockerfiles.cross/fedora-cris-build-tests.docker} (100%)
rename tests/docker/{dockerfiles/fedora-i386-cross.docker => dockerfiles.cross/fedora-i386-build-qemu.docker} (100%)
create mode 100644 tests/docker/dockerfiles.multiarch/Makefile.include
rename tests/docker/{dockerfiles => dockerfiles.multiarch}/debian10.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.multiarch}/debian9.docker (100%)
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/debian-win32-cross.docker => dockerfiles.x86_64/debian9-mxe-win32-build-qemu.docker} (100%)
rename tests/docker/{dockerfiles/debian-win64-cross.docker => 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%)
create mode 100644 tests/docker/dockerfiles/debian10-native-qemu-build.docker
--
2.20.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v1 01/13] tests/docker: move most cross compilers to buster base
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
@ 2020-01-24 20:40 ` Alex Bennée
2020-01-24 20:40 ` [PATCH v1 02/13] tests/docker: better handle symlinked libs Alex Bennée
` (11 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
This includes fixing up the dependencies (Which were already wrong for
one of the mips variants).
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/Makefile.include | 16 ++++++++--------
tests/docker/dockerfiles/debian-amd64.docker | 2 +-
.../docker/dockerfiles/debian-armel-cross.docker | 2 +-
.../docker/dockerfiles/debian-armhf-cross.docker | 2 +-
.../dockerfiles/debian-mips64el-cross.docker | 2 +-
.../dockerfiles/debian-mipsel-cross.docker | 2 +-
.../dockerfiles/debian-ppc64el-cross.docker | 2 +-
.../docker/dockerfiles/debian-s390x-cross.docker | 2 +-
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 19dbe26169..43a8678688 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -91,19 +91,12 @@ endif
# Enforce dependencies for composite images
docker-image-debian9-mxe: docker-image-debian9
ifeq ($(HOST_ARCH),x86_64)
-docker-image-debian-amd64: docker-image-debian9
+docker-image-debian-amd64: docker-image-debian10
DOCKER_PARTIAL_IMAGES += debian-amd64-cross
else
docker-image-debian-amd64-cross: docker-image-debian10
DOCKER_PARTIAL_IMAGES += debian-amd64
endif
-docker-image-debian-armel-cross: docker-image-debian9
-docker-image-debian-armhf-cross: docker-image-debian9
-docker-image-debian-mips-cross: docker-image-debian9
-docker-image-debian-mipsel-cross: docker-image-debian9
-docker-image-debian-mips64el-cross: docker-image-debian9
-docker-image-debian-ppc64el-cross: docker-image-debian9
-docker-image-debian-s390x-cross: docker-image-debian9
docker-image-debian-win32-cross: docker-image-debian9-mxe
docker-image-debian-win64-cross: docker-image-debian9-mxe
@@ -118,12 +111,19 @@ endif
docker-image-debian-alpha-cross: docker-image-debian10
docker-image-debian-arm64-cross: docker-image-debian10
+docker-image-debian-armel-cross: docker-image-debian10
+docker-image-debian-armhf-cross: docker-image-debian10
docker-image-debian-hppa-cross: docker-image-debian10
docker-image-debian-m68k-cross: docker-image-debian10
+docker-image-debian-mips-cross: docker-image-debian10
docker-image-debian-mips64-cross: docker-image-debian10
+docker-image-debian-mips64el-cross: docker-image-debian10
+docker-image-debian-mipsel-cross: docker-image-debian10
docker-image-debian-powerpc-cross: docker-image-debian10
docker-image-debian-ppc64-cross: docker-image-debian10
+docker-image-debian-ppc64el-cross: docker-image-debian10
docker-image-debian-riscv64-cross: docker-image-debian10
+docker-image-debian-s390x-cross: docker-image-debian10
docker-image-debian-sh4-cross: docker-image-debian10
docker-image-debian-sparc64-cross: docker-image-debian10
diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
index 431e947ebd..3b860af106 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -4,7 +4,7 @@
# This docker target builds on the debian Stretch base image. Further
# libraries which are not widely available are installed by hand.
#
-FROM qemu:debian9
+FROM qemu:debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
RUN apt update && \
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index 15378f8ea2..e3794a61c9 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -3,7 +3,7 @@
#
# This docker target builds on the debian Stretch base image.
#
-FROM qemu:debian9
+FROM qemu:debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
# Add the foreign architecture we want and install dependencies
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 4a20af6fe1..e163b8b956 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -3,7 +3,7 @@
#
# This docker target builds on the debian Stretch base image.
#
-FROM qemu:debian9
+FROM qemu:debian10
# Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture armhf
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 2fca112405..453b53ef72 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -4,7 +4,7 @@
# This docker target builds on the debian Stretch base image.
#
-FROM qemu:debian9
+FROM qemu:debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index 4abf7832ac..3b6e975c68 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -3,7 +3,7 @@
#
# This docker target builds on the debian Stretch base image.
#
-FROM qemu:debian9
+FROM qemu:debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 9973df9ff7..cd386f01d9 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -3,7 +3,7 @@
#
# This docker target builds on the debian Stretch base image.
#
-FROM qemu:debian9
+FROM qemu:debian10
# Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture ppc64el && \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index eb73c98855..43fe59836f 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -3,7 +3,7 @@
#
# This docker target builds on the debian Stretch base image.
#
-FROM qemu:debian9
+FROM qemu:debian10
# Add the s390x architecture
RUN dpkg --add-architecture s390x
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 02/13] tests/docker: better handle symlinked libs
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 ` 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
` (10 subsequent siblings)
12 siblings, 1 reply; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
When we are copying we want to ensure we grab the first
resolution (the found in path section). However even that binary might
be a symlink so lets make sure we chase the symlinks to copy the right
binary to where it can be found.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/docker.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 31d8adf836..7dfca63fe4 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -109,7 +109,7 @@ def _get_so_libs(executable):
ensure theright data is copied."""
libs = []
- ldd_re = re.compile(r"(/.*/)(\S*)")
+ ldd_re = re.compile(r"(?:\S+ => )?(\S*) \(:?0x[0-9a-f]+\)")
try:
ldd_output = subprocess.check_output(["ldd", executable]).decode('utf-8')
for line in ldd_output.split("\n"):
@@ -145,7 +145,8 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir):
if libs:
for l in libs:
so_path = os.path.dirname(l)
- _copy_with_mkdir(l, dest_dir, so_path)
+ real_l = os.path.realpath(l)
+ _copy_with_mkdir(real_l, dest_dir, so_path)
def _check_binfmt_misc(executable):
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 03/13] gitlab-ci: Refresh the list of iotests
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-24 20:40 ` Alex Bennée
2020-01-24 20:40 ` [PATCH v1 04/13] travis.yml: Install genisoimage package Alex Bennée
` (9 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, Thomas Huth, berrange, stefanb, richard.henderson, f4bug,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
From: Thomas Huth <thuth@redhat.com>
iotest 147 and 205 have recently been marked as "NBD-only", so they
are currently simply skipped and thus can be removed.
iotest 129 occasionally fails in the gitlab-CI, and according to Max,
there are some known issues with this test (see for example this URL:
https://lists.nongnu.org/archive/html/qemu-block/2019-06/msg00499.html ),
so for the time being, let's disable it until the problems are fixed.
The iotests 040, 127, 203 and 256 are scheduled to become part of "make
check-block", so we also do not have to test them seperately here anymore.
On the other side, new iotests have been added to the QEMU repository
in the past months, so we can now add some new test > 256 instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20200121131936.8214-1-thuth@redhat.com>
---
.gitlab-ci.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 228783993e..c15e394f09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,12 +54,12 @@ build-tcg-disabled:
- make check-qapi-schema
- cd tests/qemu-iotests/
- ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048
- 052 063 077 086 101 104 106 113 147 148 150 151 152 157 159 160
- 163 170 171 183 184 192 194 197 205 208 215 221 222 226 227 236
- - ./check -qcow2 028 040 051 056 057 058 065 067 068 082 085 091 095 096 102
- 122 124 127 129 132 139 142 144 145 147 151 152 155 157 165 194
- 196 197 200 202 203 205 208 209 215 216 218 222 227 234 246 247
- 248 250 254 255 256
+ 052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163
+ 170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277
+ - ./check -qcow2 028 051 056 057 058 065 067 068 082 085 091 095 096 102 122
+ 124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202
+ 208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258
+ 260 261 262 263 264 270 272 273 277 279
build-user:
script:
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 04/13] travis.yml: Install genisoimage package
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
` (2 preceding siblings ...)
2020-01-24 20:40 ` [PATCH v1 03/13] gitlab-ci: Refresh the list of iotests Alex Bennée
@ 2020-01-24 20:40 ` Alex Bennée
2020-01-24 20:40 ` [PATCH v1 05/13] .shippable: --disable-docs for cross-compile tests Alex Bennée
` (8 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Wainer dos Santos Moschetta, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
The genisoimage program is required for tests/cdrom-test
tests, otherwise they are skipped. The current Travis
environments do not provide it by default, so let's
explicitly require the genisoimage package.
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20200110191254.11303-2-wainersm@redhat.com>
---
.travis.yml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 6c1038a0f1..131c920255 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,6 +51,8 @@ addons:
- sparse
- uuid-dev
- gcovr
+ # Tests dependencies
+ - genisoimage
# The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
@@ -383,6 +385,8 @@ matrix:
- libusb-1.0-0-dev
- libvdeplug-dev
- libvte-2.91-dev
+ # Tests dependencies
+ - genisoimage
env:
- TEST_CMD="make check check-tcg V=1"
- CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS}"
@@ -412,6 +416,8 @@ matrix:
- libusb-1.0-0-dev
- libvdeplug-dev
- libvte-2.91-dev
+ # Tests dependencies
+ - genisoimage
env:
- TEST_CMD="make check check-tcg V=1"
- CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},ppc64le-linux-user"
@@ -441,6 +447,8 @@ matrix:
- libusb-1.0-0-dev
- libvdeplug-dev
- libvte-2.91-dev
+ # Tests dependencies
+ - genisoimage
env:
- TEST_CMD="make check check-tcg V=1"
- CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 05/13] .shippable: --disable-docs for cross-compile tests
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
` (3 preceding siblings ...)
2020-01-24 20:40 ` [PATCH v1 04/13] travis.yml: Install genisoimage package Alex Bennée
@ 2020-01-24 20:40 ` 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
` (7 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
The sphinx support is fairly new and we don't seem to have all the
bugs worked out for cross development environments right now.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.shippable.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.shippable.yml b/.shippable.yml
index 83aae08bb4..2cce7b5689 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -37,5 +37,5 @@ build:
- unset CC
- mkdir build
- cd build
- - ../configure ${QEMU_CONFIGURE_OPTS} --target-list=${TARGET_LIST}
+ - ../configure --disable-docs ${QEMU_CONFIGURE_OPTS} --target-list=${TARGET_LIST}
- make -j$(($(getconf _NPROCESSORS_ONLN) + 1))
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 06/13] tests/docker: move all cross-compilers images into dockerfiles.cross
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
` (4 preceding siblings ...)
2020-01-24 20:40 ` [PATCH v1 05/13] .shippable: --disable-docs for cross-compile tests Alex Bennée
@ 2020-01-24 20:40 ` Alex Bennée
2020-01-24 20:40 ` [PATCH v1 07/13] tests/docker: move all multiarch containers into dockerfiles.multiarch Alex Bennée
` (6 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, cota, stefanha, marcandre.lureau, pbonzini, aurelien
These images will no longer be visible to the main container build
process. This is because we will want to selectively include them for
each supported architecture later.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.../{dockerfiles => dockerfiles.cross}/debian-alpha-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-amd64-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-arm64-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-armel-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-armhf-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-hppa-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-m68k-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-mips-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-mips64-cross.docker | 0
.../debian-mips64el-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-mipsel-cross.docker | 0
.../debian-powerpc-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-ppc64-cross.docker | 0
.../debian-ppc64el-cross.docker | 0
.../debian-riscv64-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-s390x-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-sh4-cross.docker | 0
.../debian-sparc64-cross.docker | 0
.../debian-tricore-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-win32-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-win64-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/debian-xtensa-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/fedora-cris-cross.docker | 0
.../{dockerfiles => dockerfiles.cross}/fedora-i386-cross.docker | 0
24 files changed, 0 insertions(+), 0 deletions(-)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-alpha-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-amd64-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-arm64-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-armel-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-armhf-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-hppa-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-m68k-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-mips-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-mips64-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-mips64el-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-mipsel-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-powerpc-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-ppc64-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-ppc64el-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-riscv64-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-s390x-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-sh4-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-sparc64-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-tricore-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-win32-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-win64-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/debian-xtensa-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/fedora-cris-cross.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.cross}/fedora-i386-cross.docker (100%)
diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles.cross/debian-alpha-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-alpha-cross.docker
rename to tests/docker/dockerfiles.cross/debian-alpha-cross.docker
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles.cross/debian-amd64-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-amd64-cross.docker
rename to tests/docker/dockerfiles.cross/debian-amd64-cross.docker
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles.cross/debian-arm64-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-arm64-cross.docker
rename to tests/docker/dockerfiles.cross/debian-arm64-cross.docker
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles.cross/debian-armel-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-armel-cross.docker
rename to tests/docker/dockerfiles.cross/debian-armel-cross.docker
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles.cross/debian-armhf-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-armhf-cross.docker
rename to tests/docker/dockerfiles.cross/debian-armhf-cross.docker
diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles.cross/debian-hppa-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-hppa-cross.docker
rename to tests/docker/dockerfiles.cross/debian-hppa-cross.docker
diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles.cross/debian-m68k-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-m68k-cross.docker
rename to tests/docker/dockerfiles.cross/debian-m68k-cross.docker
diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles.cross/debian-mips-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-mips-cross.docker
rename to tests/docker/dockerfiles.cross/debian-mips-cross.docker
diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles.cross/debian-mips64-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-mips64-cross.docker
rename to tests/docker/dockerfiles.cross/debian-mips64-cross.docker
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles.cross/debian-mips64el-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-mips64el-cross.docker
rename to tests/docker/dockerfiles.cross/debian-mips64el-cross.docker
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles.cross/debian-mipsel-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-mipsel-cross.docker
rename to tests/docker/dockerfiles.cross/debian-mipsel-cross.docker
diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles.cross/debian-powerpc-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-powerpc-cross.docker
rename to tests/docker/dockerfiles.cross/debian-powerpc-cross.docker
diff --git a/tests/docker/dockerfiles/debian-ppc64-cross.docker b/tests/docker/dockerfiles.cross/debian-ppc64-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-ppc64-cross.docker
rename to tests/docker/dockerfiles.cross/debian-ppc64-cross.docker
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles.cross/debian-ppc64el-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-ppc64el-cross.docker
rename to tests/docker/dockerfiles.cross/debian-ppc64el-cross.docker
diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles.cross/debian-riscv64-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-riscv64-cross.docker
rename to tests/docker/dockerfiles.cross/debian-riscv64-cross.docker
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles.cross/debian-s390x-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-s390x-cross.docker
rename to tests/docker/dockerfiles.cross/debian-s390x-cross.docker
diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docker/dockerfiles.cross/debian-sh4-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-sh4-cross.docker
rename to tests/docker/dockerfiles.cross/debian-sh4-cross.docker
diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/docker/dockerfiles.cross/debian-sparc64-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-sparc64-cross.docker
rename to tests/docker/dockerfiles.cross/debian-sparc64-cross.docker
diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles.cross/debian-tricore-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-tricore-cross.docker
rename to tests/docker/dockerfiles.cross/debian-tricore-cross.docker
diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles.cross/debian-win32-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-win32-cross.docker
rename to tests/docker/dockerfiles.cross/debian-win32-cross.docker
diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles.cross/debian-win64-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-win64-cross.docker
rename to tests/docker/dockerfiles.cross/debian-win64-cross.docker
diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles.cross/debian-xtensa-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian-xtensa-cross.docker
rename to tests/docker/dockerfiles.cross/debian-xtensa-cross.docker
diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/docker/dockerfiles.cross/fedora-cris-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/fedora-cris-cross.docker
rename to tests/docker/dockerfiles.cross/fedora-cris-cross.docker
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles.cross/fedora-i386-cross.docker
similarity index 100%
rename from tests/docker/dockerfiles/fedora-i386-cross.docker
rename to tests/docker/dockerfiles.cross/fedora-i386-cross.docker
--
2.20.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v1 07/13] tests/docker: move all multiarch containers into dockerfiles.multiarch
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
` (5 preceding siblings ...)
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 ` 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
` (5 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
We define multiarch as base distributions that are likely to have
images for any given host architecture.
They will shortly be re-included in the make Makefile.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/Makefile.include | 4 +---
.../dockerfiles.multiarch/Makefile.include | 17 +++++++++++++++++
.../debian10.docker | 0
.../debian9.docker | 0
4 files changed, 18 insertions(+), 3 deletions(-)
create mode 100644 tests/docker/dockerfiles.multiarch/Makefile.include
rename tests/docker/{dockerfiles => dockerfiles.multiarch}/debian10.docker (100%)
rename tests/docker/{dockerfiles => dockerfiles.multiarch}/debian9.docker (100%)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 43a8678688..c9e8bc40a1 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -62,8 +62,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\
"BUILD","$*")
-# Special rule for debootstraped binfmt linux-user images
-docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
+docker-binfmt-image-debian-%: $(MULTARCH_BASE)/debian-bootstrap.docker
$(if $(EXECUTABLE),,\
$(error EXECUTABLE not set, debootstrap of debian-$* would fail))
$(if $(DEB_ARCH),,\
@@ -85,7 +84,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
$(DOCKER_SCRIPT) check --quiet qemu:debian-$* $< || \
{ echo "You will need to build $(EXECUTABLE)"; exit 1;},\
"CHECK", "debian-$* exists"))
-
endif
# Enforce dependencies for composite images
diff --git a/tests/docker/dockerfiles.multiarch/Makefile.include b/tests/docker/dockerfiles.multiarch/Makefile.include
new file mode 100644
index 0000000000..60617dd7db
--- /dev/null
+++ b/tests/docker/dockerfiles.multiarch/Makefile.include
@@ -0,0 +1,17 @@
+# -*- Mode: makefile -*-
+#
+# Multiarch Containers
+#
+# These containers are ones that will build on any of the major
+# architectures. As a result we can share the rules with whatever
+# system we are installed on.
+#
+
+MULTIARCH_BASE = $(DOCKER_BASE)/dockerfiles.multiarch
+VPATH += $(MULTIARCH_BASE)
+
+#
+# None of the multiarch images can build anything by themselves so
+# they are all BASE containers.
+#
+BASE_CONTAINERS += $(sort $(notdir $(basename $(wildcard $(MULTIARCH_BASE)/*.docker))))
diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles.multiarch/debian10.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian10.docker
rename to tests/docker/dockerfiles.multiarch/debian10.docker
diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles.multiarch/debian9.docker
similarity index 100%
rename from tests/docker/dockerfiles/debian9.docker
rename to tests/docker/dockerfiles.multiarch/debian9.docker
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 08/13] tests/docker: search the tests/docker tree to inline parent dockerfile
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
` (6 preceding siblings ...)
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 ` Alex Bennée
2020-01-24 20:40 ` [PATCH v1 09/13] tests/docker: switch to multiarch aware container support Alex Bennée
` (4 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
The changes to a multi-directory set of dockerfiles means we can't
rely on hardcoding any more. Just search down the tree until we find
the file we are looking for.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/docker.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 7dfca63fe4..892d70b568 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -189,9 +189,10 @@ def _read_qemu_dockerfile(img_name):
if img_name.startswith("debian") and img_name.endswith("user"):
img_name = "debian-bootstrap"
- df = os.path.join(os.path.dirname(__file__), "dockerfiles",
- img_name + ".docker")
- return _read_dockerfile(df)
+ dockerfile = img_name + ".docker"
+ for root, dirs, files in os.walk(os.path.dirname(__file__)):
+ if dockerfile in files:
+ return _read_dockerfile(os.path.join(root, dockerfile))
def _dockerfile_preprocess(df):
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 09/13] tests/docker: switch to multiarch aware container support
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
` (7 preceding siblings ...)
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 ` Alex Bennée
2020-01-24 20:40 ` [PATCH v1 10/13] tests/docker: add debian10-native-qemu-build Alex Bennée
` (3 subsequent siblings)
12 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
We drop support for DOCKER_PARTIAL_IMAGE and related hacks in favour
of explicit building of lists of images by type. Currently we can't do
any of the QEMU builds but the docker-image target will allow us to
test that every docker image we declare can actually be built.
Later commits will re-enable the builds for each host architecture we
support.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/Makefile.include | 124 +++++++++++++---------------------
1 file changed, 46 insertions(+), 78 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index c9e8bc40a1..b2b41c3e9b 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -5,12 +5,37 @@
HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
DOCKER_SUFFIX := .docker
-DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
-# we don't run tests on intermediate images (used as base by another image)
-DOCKER_PARTIAL_IMAGES := debian9 debian10
-DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap
-DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
-DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
+DOCKER_BASE := $(SRC_PATH)/tests/docker
+
+#
+# There are 3 classes of containers
+#
+# BASE_CONTAINERS - intermeadiate containers which are used to build others
+# TEST_BUILD_CONTAINERS - contain enough compiler support to build tests
+# QEMU_BUILD_CONTAINERS - contain build dependencies enough to build QEMU
+#
+
+BASE_CONTAINERS :=
+TEST_BUILD_CONTAINERS :=
+QEMU_BUILD_CONTAINERS :=
+
+#
+# Helpers for sub-arch includes
+#
+# $1 = list of dockerfile paths
+get-basenames = $(sort $(notdir $(basename $1)))
+
+#
+# Dealing with different host architectures.
+#
+# For x86_64 this is easy enough as most cross compilers are built for
+# x86. However for other build hosts we may have a limited choice. To
+# fully support all potential build hosts we can use QEMU's own
+# linux-user support to have a native version of the toolchain.
+#
+-include $(DOCKER_BASE)/dockerfiles.multiarch/Makefile.include
+-include $(DOCKER_BASE)/dockerfiles.$(HOST_ARCH)/Makefile.include
+
# Use a global constant ccache directory to speed up repetitive builds
DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
@@ -42,18 +67,21 @@ $(DOCKER_SRC_COPY):
docker-qemu-src: $(DOCKER_SRC_COPY)
-docker-image: ${DOCKER_TARGETS}
+# The global docker-image rule builds all docker images we are capable of building
+DOCKER_TARGETS := $(patsubst %,docker-image-%,$(BASE_CONTAINERS) $(TEST_BUILD_CONTAINERS) $(QEMU_BUILD_CONTAINERS))
+
+docker-image: $(DOCKER_TARGETS)
# General rule for building docker images. If we are a sub-make
# invoked with SKIP_DOCKER_BUILD we still check the image is up to date
# though
ifdef SKIP_DOCKER_BUILD
-docker-image-%: $(DOCKER_FILES_DIR)/%.docker
+docker-image-%: %.docker
$(call quiet-command, \
$(DOCKER_SCRIPT) check --quiet qemu:$* $<, \
"CHECK", "$*")
else
-docker-image-%: $(DOCKER_FILES_DIR)/%.docker
+docker-image-%: %.docker
$(call quiet-command,\
$(DOCKER_SCRIPT) build qemu:$* $< \
$(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \
@@ -62,7 +90,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\
"BUILD","$*")
-docker-binfmt-image-debian-%: $(MULTARCH_BASE)/debian-bootstrap.docker
+docker-binfmt-image-debian-%: $(DOCKER_BASE)/dockerfiles/debian-bootstrap.docker
$(if $(EXECUTABLE),,\
$(error EXECUTABLE not set, debootstrap of debian-$* would fail))
$(if $(DEB_ARCH),,\
@@ -86,69 +114,8 @@ docker-binfmt-image-debian-%: $(MULTARCH_BASE)/debian-bootstrap.docker
"CHECK", "debian-$* exists"))
endif
-# Enforce dependencies for composite images
-docker-image-debian9-mxe: docker-image-debian9
-ifeq ($(HOST_ARCH),x86_64)
-docker-image-debian-amd64: docker-image-debian10
-DOCKER_PARTIAL_IMAGES += debian-amd64-cross
-else
-docker-image-debian-amd64-cross: docker-image-debian10
-DOCKER_PARTIAL_IMAGES += debian-amd64
-endif
-docker-image-debian-win32-cross: docker-image-debian9-mxe
-docker-image-debian-win64-cross: docker-image-debian9-mxe
-
-# For non-x86 hosts not all cross-compilers have been packaged
-ifneq ($(HOST_ARCH),x86_64)
-DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross
-DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross
-DOCKER_PARTIAL_IMAGES += debian-s390x-cross
-DOCKER_PARTIAL_IMAGES += debian-win32-cross debian-win64-cross
-DOCKER_PARTIAL_IMAGES += fedora travis
-endif
-
-docker-image-debian-alpha-cross: docker-image-debian10
-docker-image-debian-arm64-cross: docker-image-debian10
-docker-image-debian-armel-cross: docker-image-debian10
-docker-image-debian-armhf-cross: docker-image-debian10
-docker-image-debian-hppa-cross: docker-image-debian10
-docker-image-debian-m68k-cross: docker-image-debian10
-docker-image-debian-mips-cross: docker-image-debian10
-docker-image-debian-mips64-cross: docker-image-debian10
-docker-image-debian-mips64el-cross: docker-image-debian10
-docker-image-debian-mipsel-cross: docker-image-debian10
-docker-image-debian-powerpc-cross: docker-image-debian10
-docker-image-debian-ppc64-cross: docker-image-debian10
-docker-image-debian-ppc64el-cross: docker-image-debian10
-docker-image-debian-riscv64-cross: docker-image-debian10
-docker-image-debian-s390x-cross: docker-image-debian10
-docker-image-debian-sh4-cross: docker-image-debian10
-docker-image-debian-sparc64-cross: docker-image-debian10
-
-docker-image-travis: NOUSER=1
-
-# Specialist build images, sometimes very limited tools
-docker-image-tricore-cross: docker-image-debian9
-
-# These images may be good enough for building tests but not for test builds
-DOCKER_PARTIAL_IMAGES += debian-alpha-cross
-DOCKER_PARTIAL_IMAGES += debian-hppa-cross
-DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
-DOCKER_PARTIAL_IMAGES += debian-powerpc-cross debian-ppc64-cross
-DOCKER_PARTIAL_IMAGES += debian-riscv64-cross
-DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross
-DOCKER_PARTIAL_IMAGES += debian-tricore-cross
-DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
-DOCKER_PARTIAL_IMAGES += fedora-i386-cross fedora-cris-cross
-
-# Rules for building linux-user powered images
-#
-# These are slower than using native cross compiler setups but can
-# work around issues with poorly working multi-arch systems and broken
-# packages.
-
# Expand all the pre-requistes for each docker image and test combination
-$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
+$(foreach i,$(QEMU_BUILD_CONTAINERS), \
$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
$(eval .PHONY: docker-$t@$i) \
$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
@@ -174,15 +141,16 @@ docker:
@echo ' "IMAGE" is one of the listed container name.'
@echo ' docker-image: Build all images.'
@echo ' docker-image-IMAGE: Build image "IMAGE".'
+ @echo ' docker-binfmt-image-debian-IMAGE:'
+ @echo ' Build a binfmt Debian bootstraped IMAGE'
+ @echo ' Specify DEB_ARCH, DEB_TYPE and EXECUTABLE.'
+ @echo ' Optionally specify DEB_URL'
@echo ' docker-run: For manually running a "TEST" with "IMAGE".'
@echo
@echo 'Available container images:'
- @echo ' $(DOCKER_IMAGES)'
-ifneq ($(DOCKER_USER_IMAGES),)
- @echo
- @echo 'Available linux-user images (docker-binfmt-image-debian-%):'
- @echo ' $(DOCKER_USER_IMAGES)'
-endif
+ @echo ' BASE: $(BASE_CONTAINERS)'
+ @echo ' BUILD TESTS: $(TEST_BUILD_CONTAINERS)'
+ @echo ' BUILD QEMU: $(QEMU_BUILD_CONTAINERS)'
@echo
@echo 'Available tests:'
@echo ' $(DOCKER_TESTS)'
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 10/13] tests/docker: add debian10-native-qemu-build
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
` (8 preceding siblings ...)
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 ` 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
` (2 subsequent siblings)
12 siblings, 1 reply; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
This is a new dockerfile which can build the native architecture QEMU
on a Debian 10 based image whatever architecture that may be.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.../dockerfiles/debian10-native-qemu-build.docker | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 tests/docker/dockerfiles/debian10-native-qemu-build.docker
diff --git a/tests/docker/dockerfiles/debian10-native-qemu-build.docker b/tests/docker/dockerfiles/debian10-native-qemu-build.docker
new file mode 100644
index 0000000000..71bd2b1d83
--- /dev/null
+++ b/tests/docker/dockerfiles/debian10-native-qemu-build.docker
@@ -0,0 +1,15 @@
+#
+# Debain Native Build
+#
+# This docker target builds on the Debian Buster base image. It is
+# deliberatly architecture agnostic as it can build on any Debian
+# supported architecture.
+#
+FROM qemu:debian10
+MAINTAINER Alex Bennée <alex.bennee@linaro.org>
+
+# We use --arch-only as not all hosts have what's needed to build all
+# the binpkg's that come with QEMU (roms etc).
+RUN apt update && \
+ DEBIAN_FRONTEND=noninteractive eatmydata \
+ apt build-dep --arch-only -yy qemu
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 11/13] tests/docker: rename the cross builds
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
` (9 preceding siblings ...)
2020-01-24 20:40 ` [PATCH v1 10/13] tests/docker: add debian10-native-qemu-build Alex Bennée
@ 2020-01-24 20:40 ` Alex Bennée
2020-01-24 20:40 ` [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts Alex Bennée
2020-01-24 20:40 ` [PATCH v1 13/13] tests/docker: enable cross-compilers for aarch64 Alex Bennée
12 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
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.bennee@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
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
` (10 preceding siblings ...)
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
2020-01-24 22:29 ` Richard Henderson
2020-01-27 19:38 ` Philippe Mathieu-Daudé
2020-01-24 20:40 ` [PATCH v1 13/13] tests/docker: enable cross-compilers for aarch64 Alex Bennée
12 siblings, 2 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
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
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v1 13/13] tests/docker: enable cross-compilers for aarch64
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
` (11 preceding siblings ...)
2020-01-24 20:40 ` [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts Alex Bennée
@ 2020-01-24 20:40 ` Alex Bennée
12 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-24 20:40 UTC (permalink / raw)
To: qemu-devel
Cc: fam, berrange, stefanb, Alex Bennée, richard.henderson,
f4bug, Philippe Mathieu-Daudé,
cota, stefanha, marcandre.lureau, pbonzini, aurelien
While Debian's aarch64 mainly only packages other ARM compilers we do
have access to x86_64 cross compilers and a few system compilers for
various micro controllers.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.../dockerfiles.aarch64/Makefile.include | 24 +++++++++++++++++++
.../debian10-aarch64-qemu-build.docker | 1 +
.../debian10-x86_64-qemu-build.docker | 1 +
.../debian9-armel-qemu-build.docker | 1 +
4 files changed, 27 insertions(+)
create mode 100644 tests/docker/dockerfiles.aarch64/Makefile.include
create mode 120000 tests/docker/dockerfiles.aarch64/debian10-aarch64-qemu-build.docker
create mode 120000 tests/docker/dockerfiles.aarch64/debian10-x86_64-qemu-build.docker
create mode 120000 tests/docker/dockerfiles.aarch64/debian9-armel-qemu-build.docker
diff --git a/tests/docker/dockerfiles.aarch64/Makefile.include b/tests/docker/dockerfiles.aarch64/Makefile.include
new file mode 100644
index 0000000000..791ddf856b
--- /dev/null
+++ b/tests/docker/dockerfiles.aarch64/Makefile.include
@@ -0,0 +1,24 @@
+# -*- Mode: makefile -*-
+#
+# AArch64 Containers
+#
+# The cross-compilers are not as well packaged for AArch64 although we
+# do have access to 32 bit ARM, x86 and a smattering of the
+# microcontrollers.
+#
+
+AARCH64_BASE = $(DOCKER_BASE)/dockerfiles.aarch64
+VPATH += $(AARCH64_BASE)
+
+#
+# We have both QEMU build and TEST build containers we can access
+#
+QEMU_BUILD_CONTAINERS += $(call get-basenames,$(wildcard $(AARCH64_BASE)/*-qemu-build.docker))
+TEST_BUILD_CONTAINERS += $(call get-basenames,$(wildcard $(AARCH64_BASE)/*-test-build.docker))
+
+# Generate build-deps based on names
+#
+# Most of this architecture are based on Debian images
+AARCH64_CONTAINERS=$(call get-basenames,$(wildcard $(AARCH64_BASE)/*.docker))
+$(filter-out,debian9,$(AARCH64_CONTAINERS)): docker-image-debian9
+$(filter-out,debian10,$(AARCH64_CONTAINERS)): docker-image-debian10
diff --git a/tests/docker/dockerfiles.aarch64/debian10-aarch64-qemu-build.docker b/tests/docker/dockerfiles.aarch64/debian10-aarch64-qemu-build.docker
new file mode 120000
index 0000000000..cd1caa0704
--- /dev/null
+++ b/tests/docker/dockerfiles.aarch64/debian10-aarch64-qemu-build.docker
@@ -0,0 +1 @@
+../dockerfiles/debian10-native-qemu-build.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.aarch64/debian10-x86_64-qemu-build.docker b/tests/docker/dockerfiles.aarch64/debian10-x86_64-qemu-build.docker
new file mode 120000
index 0000000000..63e9a69855
--- /dev/null
+++ b/tests/docker/dockerfiles.aarch64/debian10-x86_64-qemu-build.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian-amd64-full-cross.docker
\ No newline at end of file
diff --git a/tests/docker/dockerfiles.aarch64/debian9-armel-qemu-build.docker b/tests/docker/dockerfiles.aarch64/debian9-armel-qemu-build.docker
new file mode 120000
index 0000000000..b818459261
--- /dev/null
+++ b/tests/docker/dockerfiles.aarch64/debian9-armel-qemu-build.docker
@@ -0,0 +1 @@
+../dockerfiles.cross/debian-armel-full-cross.docker
\ No newline at end of file
--
2.20.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts
2020-01-24 20:40 ` [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts Alex Bennée
@ 2020-01-24 22:29 ` Richard Henderson
2020-01-27 18:30 ` Alex Bennée
2020-01-27 19:38 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 20+ messages in thread
From: Richard Henderson @ 2020-01-24 22:29 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: fam, berrange, stefanb, Philippe Mathieu-Daudé,
f4bug, cota, stefanha, marcandre.lureau, pbonzini, aurelien
On 1/24/20 10:40 AM, Alex Bennée wrote:
> +../dockerfiles.cross/fedora-i386-build-qemu.docker
> \ No newline at end of file
Lots of no trailing newlines. Probably not intentional?
r~
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts
2020-01-24 22:29 ` Richard Henderson
@ 2020-01-27 18:30 ` Alex Bennée
0 siblings, 0 replies; 20+ messages in thread
From: Alex Bennée @ 2020-01-27 18:30 UTC (permalink / raw)
To: Richard Henderson
Cc: fam, berrange, stefanb, Philippe Mathieu-Daudé,
qemu-devel, f4bug, cota, stefanha, marcandre.lureau, pbonzini,
aurelien
Richard Henderson <richard.henderson@linaro.org> writes:
> On 1/24/20 10:40 AM, Alex Bennée wrote:
>> +../dockerfiles.cross/fedora-i386-build-qemu.docker
>> \ No newline at end of file
>
> Lots of no trailing newlines. Probably not intentional?
I think that's just a vagary of the git symlink representation.
--
Alex Bennée
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1 02/13] tests/docker: better handle symlinked libs
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é
0 siblings, 0 replies; 20+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-01-27 19:24 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: fam, berrange, stefanb, richard.henderson, f4bug, cota, stefanha,
marcandre.lureau, pbonzini, aurelien
On 1/24/20 9:40 PM, Alex Bennée wrote:
> When we are copying we want to ensure we grab the first
> resolution (the found in path section). However even that binary might
> be a symlink so lets make sure we chase the symlinks to copy the right
> binary to where it can be found.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/docker/docker.py | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/docker/docker.py b/tests/docker/docker.py
> index 31d8adf836..7dfca63fe4 100755
> --- a/tests/docker/docker.py
> +++ b/tests/docker/docker.py
> @@ -109,7 +109,7 @@ def _get_so_libs(executable):
> ensure theright data is copied."""
>
> libs = []
> - ldd_re = re.compile(r"(/.*/)(\S*)")
> + ldd_re = re.compile(r"(?:\S+ => )?(\S*) \(:?0x[0-9a-f]+\)")
> try:
> ldd_output = subprocess.check_output(["ldd", executable]).decode('utf-8')
> for line in ldd_output.split("\n"):
> @@ -145,7 +145,8 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir):
> if libs:
> for l in libs:
> so_path = os.path.dirname(l)
> - _copy_with_mkdir(l, dest_dir, so_path)
> + real_l = os.path.realpath(l)
> + _copy_with_mkdir(real_l, dest_dir, so_path)
>
>
> def _check_binfmt_misc(executable):
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts
2020-01-24 20:40 ` [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts Alex Bennée
2020-01-24 22:29 ` Richard Henderson
@ 2020-01-27 19:38 ` Philippe Mathieu-Daudé
2020-01-27 19:43 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 20+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-01-27 19:38 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: fam, berrange, stefanb, richard.henderson, f4bug, cota, stefanha,
marcandre.lureau, pbonzini, aurelien
On 1/24/20 9:40 PM, Alex Bennée wrote:
> 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
On Aarch64:
$ make docker-image V=1
./tests/docker/docker.py --engine auto build qemu:debian10
./tests/docker/dockerfiles.multiarch/debian10.docker --add-current-user
Sending build context to Docker daemon 3.072kB
Step 1/5 : FROM debian:buster-slim
[...]
Successfully tagged qemu:debian10
./tests/docker/docker.py --engine auto build qemu:debian9
./tests/docker/dockerfiles.multiarch/debian9.docker --add-current-user
Image is up to date.
make: *** No rule to make target
'docker-image-debian10-alpha-test-build', needed by 'docker-image'. Stop.
> 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
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1 10/13] tests/docker: add debian10-native-qemu-build
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é
0 siblings, 0 replies; 20+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-01-27 19:41 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: fam, berrange, stefanb, richard.henderson, f4bug, cota, stefanha,
marcandre.lureau, pbonzini, aurelien
On 1/24/20 9:40 PM, Alex Bennée wrote:
> This is a new dockerfile which can build the native architecture QEMU
> on a Debian 10 based image whatever architecture that may be.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> .../dockerfiles/debian10-native-qemu-build.docker | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
> create mode 100644 tests/docker/dockerfiles/debian10-native-qemu-build.docker
>
> diff --git a/tests/docker/dockerfiles/debian10-native-qemu-build.docker b/tests/docker/dockerfiles/debian10-native-qemu-build.docker
> new file mode 100644
> index 0000000000..71bd2b1d83
> --- /dev/null
> +++ b/tests/docker/dockerfiles/debian10-native-qemu-build.docker
> @@ -0,0 +1,15 @@
> +#
> +# Debain Native Build
> +#
> +# This docker target builds on the Debian Buster base image. It is
> +# deliberatly architecture agnostic as it can build on any Debian
> +# supported architecture.
> +#
> +FROM qemu:debian10
> +MAINTAINER Alex Bennée <alex.bennee@linaro.org>
> +
> +# We use --arch-only as not all hosts have what's needed to build all
> +# the binpkg's that come with QEMU (roms etc).
> +RUN apt update && \
> + DEBIAN_FRONTEND=noninteractive eatmydata \
> + apt build-dep --arch-only -yy qemu
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts
2020-01-27 19:38 ` Philippe Mathieu-Daudé
@ 2020-01-27 19:43 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 20+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-01-27 19:43 UTC (permalink / raw)
To: Alex Bennée, QEMU Developers
Cc: Fam Zheng, Daniel P. Berrangé,
Stefan Berger, Richard Henderson, Philippe Mathieu-Daudé,
Emilio G. Cota, Stefan Hajnoczi, Marc-André Lureau,
Paolo Bonzini, Aurelien Jarno
On Mon, Jan 27, 2020 at 8:38 PM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
> On 1/24/20 9:40 PM, Alex Bennée wrote:
> > 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
>
> On Aarch64:
>
> $ make docker-image V=1
> ./tests/docker/docker.py --engine auto build qemu:debian10
> ./tests/docker/dockerfiles.multiarch/debian10.docker --add-current-user
> Sending build context to Docker daemon 3.072kB
> Step 1/5 : FROM debian:buster-slim
> [...]
> Successfully tagged qemu:debian10
> ./tests/docker/docker.py --engine auto build qemu:debian9
> ./tests/docker/dockerfiles.multiarch/debian9.docker --add-current-user
> Image is up to date.
> make: *** No rule to make target
> 'docker-image-debian10-alpha-test-build', needed by 'docker-image'. Stop.
FWIW:
$ make docker-image -k
BUILD debian10
BUILD debian10-aarch64-qemu-build
make: *** No rule to make target
'docker-image-debian10-alpha-test-build', needed by 'docker-image'.
make: *** No rule to make target
'docker-image-debian10-x86_64-qemu-build', needed by 'docker-image'.
BUILD debian9
make: *** No rule to make target
'docker-image-debian9-armel-qemu-build', needed by 'docker-image'.
make: Target 'docker-image' not remade because of errors.
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2020-01-27 19:44 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts Alex Bennée
2020-01-24 22:29 ` 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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.