From: "Alex Bennée" <alex.bennee@linaro.org>
To: cota@braap.org, famz@redhat.com, berrange@redhat.com,
f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com,
aurelien@aurel32.net, agraf@suse.de
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH RFC 07/10] docker: fall-back to binfmt_misc debian-s390x-user-cross on non-x86
Date: Wed, 18 Jul 2018 11:05:02 +0100 [thread overview]
Message-ID: <20180718100505.7546-8-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org>
The Debian archives don't package their large array of cross compilers
for all host architectures. For s390x let's fall back to a linux-user
based image when we can't use the native ones.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/Makefile.include | 9 ++++++++-
.../dockerfiles/debian-s390x-user-cross.docker | 16 ++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 tests/docker/dockerfiles/debian-s390x-user-cross.docker
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 879bacde93..e1eba21f06 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -169,8 +169,15 @@ docker-image-debian-ppc64el-user-cross: docker-binfmt-image-debian-ppc64el-user
DOCKER_USER_IMAGES += debian-ppc64el-user-cross
DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross
+# No s390x cross-compilers in non-x86 Debian images, so use linux-user
+docker-binfmt-image-debian-s390x-user: DEB_ARCH = s390x
+docker-binfmt-image-debian-s390x-user: DEB_TYPE = stretch
+docker-binfmt-image-debian-s390x-user: EXECUTABLE = ${BUILD_DIR}/s390x-linux-user/qemu-s390x
+docker-image-debian-s390x-user-cross: docker-binfmt-image-debian-s390x-user
+DOCKER_USER_IMAGES += debian-s390x-user-cross
+DOCKER_PARTIAL_IMAGES += debian-s390x-cross
else
-DOCKER_PARTIAL_IMAGES += debian-mips64el-user-cross debian-ppc64el-user-cross
+DOCKER_PARTIAL_IMAGES += debian-mips64el-user-cross debian-ppc64el-user-cross debian-s390x-user-cross
endif
diff --git a/tests/docker/dockerfiles/debian-s390x-user-cross.docker b/tests/docker/dockerfiles/debian-s390x-user-cross.docker
new file mode 100644
index 0000000000..396763f10e
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-s390x-user-cross.docker
@@ -0,0 +1,16 @@
+#
+# Docker s390x user cross-compiler target
+#
+# This is a binfmt image for when the s390x cross compilers are not
+# available in the host architecture archives. This image is based of
+# the debootstrapped qemu:debian-s390x-user but doesn't need any
+# extra magic once it is setup.
+#
+
+FROM qemu:debian-s390x-user
+
+MAINTAINER Alex Bennee <alex.bennee@linaro.org>
+
+RUN echo man-db man-db/auto-update boolean false | debconf-set-selections
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu
--
2.17.1
next prev parent reply other threads:[~2018-07-18 10:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 10:04 [Qemu-devel] [PATCH RFC 00/10] docker on non-x86 hosts Alex Bennée
2018-07-18 10:04 ` [Qemu-devel] [PATCH RFC 01/10] docker: rename docker-amd64 to docker-host Alex Bennée
2018-07-27 7:56 ` Fam Zheng
2018-07-30 8:22 ` Alex Bennée
2018-07-18 10:04 ` [Qemu-devel] [PATCH RFC 02/10] docker: change docker-image to docker-all-images target Alex Bennée
2018-07-18 10:04 ` [Qemu-devel] [PATCH RFC 03/10] docker: add a placeholder for handling non-x86 hosts Alex Bennée
2018-07-18 10:04 ` [Qemu-devel] [PATCH RFC 04/10] docker: don't include docker-arm64-cross on aarch64 hosts Alex Bennée
2018-07-18 10:05 ` [Qemu-devel] [PATCH RFC 05/10] docker: fall-back to binfmt_misc debian-mips64el-user-cross on non-x86 Alex Bennée
2018-07-18 10:05 ` [Qemu-devel] [PATCH RFC 06/10] docker: fall-back to binfmt_misc debian-ppc64el-user-cross " Alex Bennée
2018-07-18 10:05 ` Alex Bennée [this message]
2018-07-18 10:05 ` [Qemu-devel] [PATCH RFC 08/10] docker: disable additional non-x86 images Alex Bennée
2018-07-18 10:05 ` [Qemu-devel] [PATCH RFC 09/10] tests: tcg skip docker images we can't build Alex Bennée
2018-07-18 10:05 ` [Qemu-devel] [PATCH RFC 10/10] tests/tcg: debian-mips64el-user-cross fallback Alex Bennée
2018-07-27 8:26 ` [Qemu-devel] [PATCH RFC 00/10] docker on non-x86 hosts Fam Zheng
2018-07-30 8:21 ` 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=20180718100505.7546-8-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=agraf@suse.de \
--cc=aurelien@aurel32.net \
--cc=balrogg@gmail.com \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).