[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/45] tests/docker: move our arm64 cross compile to
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 14/45] tests/docker: move our arm64 cross compile to Buster |
Date: |
Tue, 10 Sep 2019 09:43:18 +0100 |
Now Buster is released we can unify our cross build images for both
QEMU and tests.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 89881fb5f5d..48c22ae40c0 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
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker
b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 6b59ef0843a..55045ff5d5a 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -1,9 +1,9 @@
#
# Docker arm64 cross-compiler target
#
-# This docker target builds on the debian Stretch base image.
+# This docker target builds on the debian Buster base image.
#
-FROM qemu:debian9
+FROM qemu:debian10
# Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture arm64
diff --git a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker
b/tests/docker/dockerfiles/debian-buster-arm64-cross.docker
deleted file mode 100644
index 52787edcc2c..00000000000
--- a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Docker arm64 cross-compiler target
-#
-# This docker target builds on the Debian's Buster base image. There
-# are no QEMU pre-requistes so this image can only be used to build
-# test cases.
-#
-FROM qemu:debian10
-
-# Add the foreign architecture we want and install dependencies
-RUN dpkg --add-architecture arm64
-RUN apt update && \
- DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
- apt-get install -y --no-install-recommends \
- crossbuild-essential-arm64
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 8c648ef3c24..b8dae18d1cd 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -95,7 +95,7 @@ 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-buster-arm64-cross
+ container_image=debian-arm64-cross
container_cross_cc=aarch64-linux-gnu-gcc
;;
alpha-*)
--
2.20.1
- [Qemu-devel] [PULL 06/45] tests/docker: fix final missing .encode when parsing solibs, (continued)
- [Qemu-devel] [PULL 06/45] tests/docker: fix final missing .encode when parsing solibs, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 10/45] tests/tcg: add .gitignore for in source builds, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 03/45] tests/docker: Use --userns=keep-id for podman, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 04/45] tests/docker: fix "cc" command to work with podman, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 16/45] tests/docker: move our Alpha cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 13/45] tests/docker: add Buster to DOCKER_PARTIAL_IMAGES, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 18/45] tests/docker: move our m68k cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 08/45] tests/tcg: cleanup Makefile inclusions, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 15/45] tests/docker: move our powerpc cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 14/45] tests/docker: move our arm64 cross compile to Buster,
Alex Bennée <=
- [Qemu-devel] [PULL 09/45] tests/tcg: move configuration to a sub-shell script, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 21/45] tests/docker: move our mips64 cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 32/45] tests/docker: --disable-libssh on ubuntu1804 builds, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 41/45] .travis.yml: Cache Linux/GCC 'debug profile' jobs together, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 22/45] tests/docker: move our riscv64 cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 19/45] tests/docker: move our sparc64 cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 20/45] tests/docker: move our sh4 cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 42/45] .travis.yml: Cache Linux/GCC 'non-debug profile' jobs together, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 38/45] .travis.yml: Improve ccache use, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 44/45] Fedora images: use URLs from stable "archives.fedoraproject.org", Alex Bennée, 2019/09/10