From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 14/45] tests/docker: move our arm64 cross compile to Buster
Date: Tue, 10 Sep 2019 09:43:18 +0100 [thread overview]
Message-ID: <20190910084349.28817-15-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org>
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>
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
next prev parent reply other threads:[~2019-09-10 9:03 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-10 8:43 [Qemu-devel] [PULL 00/45] testing updates (fixes, upgrades, caching) Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 01/45] hw/misc: Mark most objects as "common" code to speed up compilation a litte bit Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 02/45] configure: clean-up container cross compile detect Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 03/45] tests/docker: Use --userns=keep-id for podman Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 04/45] tests/docker: fix "cc" command to work with podman Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 05/45] tests/docker: handle missing encoding keyword for subprocess.check_output Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 06/45] tests/docker: fix final missing .encode when parsing solibs Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 08/45] tests/tcg: cleanup Makefile inclusions Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 09/45] tests/tcg: move configuration to a sub-shell script Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 10/45] tests/tcg: add .gitignore for in source builds Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 11/45] tests/docker: move DEF_TARGET_LIST setting to common.rc Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 12/45] tests/docker: set DEF_TARGET_LIST for some containers Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 13/45] tests/docker: add Buster to DOCKER_PARTIAL_IMAGES Alex Bennée
2019-09-10 8:43 ` Alex Bennée [this message]
2019-09-10 8:43 ` [Qemu-devel] [PULL 15/45] tests/docker: move our powerpc cross compile to Buster Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 16/45] tests/docker: move our Alpha " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 17/45] tests/docker: move our HPPA " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 18/45] tests/docker: move our m68k " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 19/45] tests/docker: move our sparc64 " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 20/45] tests/docker: move our sh4 " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 21/45] tests/docker: move our mips64 " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 22/45] tests/docker: move our riscv64 " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 23/45] tests/docker: move our ppc64 " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 24/45] tests/docker: update Debian Sid image Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snapshot Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 26/45] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 27/45] tests/docker: add debian9-mxe " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 28/45] tests/docker: avoid $SHELL invoke bash directly Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 29/45] tests/docker: add debian-amd64-cross for non-x86 hosts Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 30/45] tests/docker: use --arch-only for installing deps Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 31/45] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64 Alex Bennée
2019-09-19 20:18 ` Philippe Mathieu-Daudé
2019-09-20 6:23 ` Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 32/45] tests/docker: --disable-libssh on ubuntu1804 builds Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 33/45] configure: check if --no-pie is supported first Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 34/45] .travis.yml: Enable multiple caching features Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 35/45] .travis.yml: Increase cache timeout from 3min to 20min Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 36/45] .travis.yml: Cache Python PIP packages Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 37/45] .travis.yml: Cache Avocado cache Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 38/45] .travis.yml: Improve ccache use Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 39/45] .travis.yml: Enable ccache on OSX Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 40/45] .travis.yml: Document how the build matrix use caches Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 41/45] .travis.yml: Cache Linux/GCC 'debug profile' jobs together Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 42/45] .travis.yml: Cache Linux/GCC 'non-debug " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 43/45] .travis.yml: Cache Linux/Clang " Alex Bennée
2019-09-10 8:43 ` [Qemu-devel] [PULL 44/45] Fedora images: use URLs from stable "archives.fedoraproject.org" Alex Bennée
2019-09-10 9:07 ` Daniel P. Berrangé
2019-09-10 9:37 ` Alex Bennée
2019-09-10 9:39 ` Peter Maydell
2019-09-10 11:11 ` Philippe Mathieu-Daudé
2019-09-10 8:43 ` [Qemu-devel] [PULL 45/45] travis.yml: Install libcap-dev for testing virito-9p Alex Bennée
2019-09-10 9:58 ` [Qemu-devel] [PULL 00/45] testing updates (fixes, upgrades, caching) Peter Maydell
2019-09-10 11:27 ` Alex Bennée
2019-09-10 11:30 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190910084349.28817-15-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).