summaryrefslogtreecommitdiffstats
path: root/tests/docker/Makefile.include
diff options
context:
space:
mode:
authorAlex Bennée2019-08-12 16:08:28 +0200
committerAlex Bennée2019-09-10 15:14:31 +0200
commit18b6be432650ccad7c7d94c4e62ea4b7f1a15e29 (patch)
tree95b999939fe8ba118c4dc15fe547cfec23054cd1 /tests/docker/Makefile.include
parenttests/docker: add Buster to DOCKER_PARTIAL_IMAGES (diff)
downloadqemu-18b6be432650ccad7c7d94c4e62ea4b7f1a15e29.tar.gz
qemu-18b6be432650ccad7c7d94c4e62ea4b7f1a15e29.tar.xz
qemu-18b6be432650ccad7c7d94c4e62ea4b7f1a15e29.zip
tests/docker: move our arm64 cross compile to Buster
Now Buster is released we can unify our cross build images for both QEMU and tests. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'tests/docker/Makefile.include')
-rw-r--r--tests/docker/Makefile.include5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 89881fb5f5..48c22ae40c 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -86,13 +86,10 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
endif
# Enforce dependencies for composite images
-docker-image-debian: docker-image-debian9
docker-image-debian9-mxe: docker-image-debian9
docker-image-debian-amd64: docker-image-debian9
docker-image-debian-armel-cross: docker-image-debian9
docker-image-debian-armhf-cross: docker-image-debian9
-docker-image-debian-arm64-cross: docker-image-debian9
-docker-image-debian-buster-arm64-cross: docker-image-debian10
docker-image-debian-mips-cross: docker-image-debian9
docker-image-debian-mipsel-cross: docker-image-debian9
docker-image-debian-mips64el-cross: docker-image-debian9
@@ -101,6 +98,8 @@ 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
+docker-image-debian-arm64-cross: docker-image-debian10
+
docker-image-debian-alpha-cross: docker-image-debian-sid
docker-image-debian-hppa-cross: docker-image-debian-sid
docker-image-debian-m68k-cross: docker-image-debian-sid