From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com,
"Alex Bennée" <alex.bennee@linaro.org>,
richard.henderson@linaro.org, f4bug@amsat.org,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com,
pbonzini@redhat.com, aurelien@aurel32.net
Subject: [Qemu-devel] [PATCH v1 27/42] tests/docker: use --arch-only for installing deps
Date: Wed, 4 Sep 2019 21:29:58 +0100 [thread overview]
Message-ID: <20190904203013.9028-28-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org>
The Debian QEMU packages require a bunch of cross compilers for
building firmware which aren't available on all host architectures.
Using --arch-only skips this particular requirement and allows us to
install just the dependencies we need.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/dockerfiles/debian-arm64-cross.docker | 2 +-
tests/docker/dockerfiles/debian-armel-cross.docker | 2 +-
tests/docker/dockerfiles/debian-armhf-cross.docker | 2 +-
tests/docker/dockerfiles/debian-mips-cross.docker | 6 +++---
tests/docker/dockerfiles/debian-mips64el-cross.docker | 2 +-
tests/docker/dockerfiles/debian-mipsel-cross.docker | 2 +-
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 2 +-
tests/docker/dockerfiles/debian-s390x-cross.docker | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 55045ff5d5a..09ca0a1ba79 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -13,7 +13,7 @@ RUN apt update && \
crossbuild-essential-arm64
RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
- apt build-dep -yy -a arm64 qemu
+ apt build-dep -yy -a arm64 --arch-only qemu
# Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=aarch64-linux-gnu-
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index 363a162a253..15378f8ea2c 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -11,7 +11,7 @@ RUN dpkg --add-architecture armel && \
apt update && \
apt install -yy crossbuild-essential-armel && \
DEBIAN_FRONTEND=noninteractive eatmydata \
- apt build-dep -yy -a armel qemu
+ apt build-dep -yy -a armel --arch-only qemu
# Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabi-
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index d5365881e79..4a20af6fe1a 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -13,7 +13,7 @@ RUN apt update && \
crossbuild-essential-armhf
RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
- apt build-dep -yy -a armhf qemu
+ apt build-dep -yy -a armhf --arch-only qemu
# Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabihf-
diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker
index a54efa7253a..08a8e1c29cc 100644
--- a/tests/docker/dockerfiles/debian-mips-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips-cross.docker
@@ -1,9 +1,9 @@
#
# Docker mips 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
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
@@ -16,7 +16,7 @@ RUN apt update && \
RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
- apt build-dep -yy -a mips qemu
+ apt build-dep -yy -a mips --arch-only qemu
# Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips-linux-gnu-
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index a1481e16e2c..2fca1124053 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -17,7 +17,7 @@ RUN dpkg --add-architecture mips64el && \
RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
- apt build-dep -yy -a mips64el qemu
+ apt build-dep -yy -a mips64el --arch-only qemu
# Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips64el-linux-gnuabi64-
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index 88accad2692..4abf7832ac6 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -16,7 +16,7 @@ RUN apt update && \
RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
- apt build-dep -yy -a mipsel qemu
+ apt build-dep -yy -a mipsel --arch-only qemu
# Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=mipsel-linux-gnu-
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index f10883c8188..9973df9ff74 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -12,7 +12,7 @@ RUN dpkg --add-architecture ppc64el && \
RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
- apt build-dep -yy -a ppc64el qemu
+ apt build-dep -yy -a ppc64el --arch-only qemu
# Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc64le-linux-gnu-
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index efa346007d6..eb73c988559 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -17,7 +17,7 @@ RUN apt update && \
RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
- apt build-dep -yy -a s390x qemu
+ apt build-dep -yy -a s390x --arch-only qemu
# Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu-
--
2.20.1
next prev parent reply other threads:[~2019-09-04 21:08 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-04 20:29 [Qemu-devel] [PATCH v1 00/42] current testing/next queue (podman, docker, ci) Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 01/42] hw/misc: Mark most objects as "common" code to speed up compilation a litte bit Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 02/42] configure: clean-up container cross compile detect Alex Bennée
2019-09-05 17:53 ` David Hildenbrand
2019-09-05 18:35 ` Alex Bennée
2019-09-05 18:37 ` David Hildenbrand
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 03/42] tests/docker: fix "cc" command to work with podman Alex Bennée
2019-09-04 23:31 ` John Snow
2019-09-05 9:51 ` Alex Bennée
2019-09-05 17:18 ` John Snow
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 04/42] tests/tcg: use EXTRA_CFLAGS everywhere Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 05/42] tests/tcg: cleanup Makefile inclusions Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 06/42] tests/tcg: move configuration to a sub-shell script Alex Bennée
2019-09-05 10:29 ` Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 07/42] tests/tcg: add .gitignore for in source builds Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 08/42] tests/docker: move DEF_TARGET_LIST setting to common.rc Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 09/42] tests/docker: set DEF_TARGET_LIST for some containers Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 10/42] tests/docker: add Buster to DOCKER_PARTIAL_IMAGES Alex Bennée
2019-09-05 10:34 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 11/42] tests/docker: move our arm64 cross compile to Buster Alex Bennée
2019-09-05 10:35 ` Philippe Mathieu-Daudé
2019-09-07 11:26 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 12/42] tests/docker: move our powerpc " Alex Bennée
2019-09-07 11:32 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 13/42] tests/docker: move our Alpha " Alex Bennée
2019-09-07 11:23 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 14/42] tests/docker: move our HPPA " Alex Bennée
2019-09-07 11:22 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 15/42] tests/docker: move our m68k " Alex Bennée
2019-09-07 11:28 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 16/42] tests/docker: move our sparc64 " Alex Bennée
2019-09-07 11:27 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 17/42] tests/docker: move our sh4 " Alex Bennée
2019-09-07 11:23 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 18/42] tests/docker: move our mips64 " Alex Bennée
2019-09-06 19:05 ` Aleksandar Markovic
2019-09-07 11:33 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 19/42] tests/docker: move our riscv64 " Alex Bennée
2019-09-07 11:24 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 20/42] tests/docker: move our ppc64 " Alex Bennée
2019-09-07 11:29 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 21/42] tests/docker: drop debian-sid image Alex Bennée
2019-09-07 20:02 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 22/42] tests/docker: drop powerpc-user image for QEMU cross builds Alex Bennée
2019-09-07 20:21 ` Philippe Mathieu-Daudé
2019-09-09 9:54 ` Alex Bennée
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 23/42] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES Alex Bennée
2019-09-07 12:06 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 24/42] tests/docker: add debian9-mxe " Alex Bennée
2019-09-05 10:36 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 25/42] tests/docker: avoid $SHELL invoke bash directly Alex Bennée
2019-09-05 10:40 ` Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 26/42] tests/docker: add debian-amd64-cross for non-x86 hosts Alex Bennée
2019-09-04 20:29 ` Alex Bennée [this message]
2019-09-07 11:40 ` [Qemu-devel] [PATCH v1 27/42] tests/docker: use --arch-only for installing deps Philippe Mathieu-Daudé
2019-09-04 20:29 ` [Qemu-devel] [PATCH v1 28/42] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64 Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 29/42] configure: check if --no-pie is supported first Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 30/42] .travis.yml: Enable multiple caching features Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 31/42] .travis.yml: Increase cache timeout from 3min to 20min Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 32/42] .travis.yml: Cache Python PIP packages Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 33/42] .travis.yml: Cache Avocado cache Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 34/42] .travis.yml: Improve ccache use Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 35/42] .travis.yml: Enable ccache on OSX Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 36/42] .travis.yml: Document how the build matrix use caches Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 37/42] .travis.yml: Cache Linux/GCC 'debug profile' jobs together Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 38/42] .travis.yml: Cache Linux/GCC 'non-debug " Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 39/42] .travis.yml: Cache Linux/Clang " Alex Bennée
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 40/42] Fedora images: use URLs from stable "archives.fedoraproject.org" Alex Bennée
2019-09-05 10:33 ` Philippe Mathieu-Daudé
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 41/42] tests/docker: --disable-libssh on ubuntu1804 builds Alex Bennée
2019-09-05 10:32 ` Philippe Mathieu-Daudé
2019-09-04 20:30 ` [Qemu-devel] [PATCH v1 42/42] tests/docker: don't always encoding for subprocess.check_output Alex Bennée
2019-09-04 22:16 ` [Qemu-devel] [PATCH v1 00/42] current testing/next queue (podman, docker, ci) no-reply
2019-09-06 10:20 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190904203013.9028-28-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).