From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKg-0003Hl-Lo for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKb-000179-D8 for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:18 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:44514) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKb-00016T-72 for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:13 -0400 Received: by mail-wr1-x429.google.com with SMTP id r16-v6so4039019wrt.11 for ; Wed, 18 Jul 2018 03:05:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 18 Jul 2018 11:05:00 +0100 Message-Id: <20180718100505.7546-6-alex.bennee@linaro.org> In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH RFC 05/10] docker: fall-back to binfmt_misc debian-mips64el-user-cross on non-x86 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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, =?UTF-8?q?Alex=20Benn=C3=A9e?= The Debian archives don't package their large array of cross compilers for all host architectures. For MIPS let's fall back to a linux-user based image when we can't use the native ones. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 11 +++++++++++ .../debian-mips64el-user-cross.docker | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-mips64el-user-cross.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 2cb180ff6c..5cfb1a57bb 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -153,8 +153,19 @@ ifeq ($(ARCH),aarch64) DOCKER_PARTIAL_IMAGES += debian-arm64-cross endif +# No MIPS cross-compilers in non-x86 Debian images, so use linux-user +docker-binfmt-image-debian-mips64el-user: DEB_ARCH = mips64el +docker-binfmt-image-debian-mips64el-user: DEB_TYPE = stretch +docker-binfmt-image-debian-mips64el-user: EXECUTABLE = ${BUILD_DIR}/mips64el-linux-user/qemu-mips64el +docker-image-debian-mips64el-user-cross: docker-binfmt-image-debian-mips64el-user +DOCKER_USER_IMAGES += debian-mips64el-user-cross +DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross + +else +DOCKER_PARTIAL_IMAGES += debian-mips64el-user-cross endif + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ diff --git a/tests/docker/dockerfiles/debian-mips64el-user-cross.docker b/tests/docker/dockerfiles/debian-mips64el-user-cross.docker new file mode 100644 index 0000000000..98284bc635 --- /dev/null +++ b/tests/docker/dockerfiles/debian-mips64el-user-cross.docker @@ -0,0 +1,16 @@ +# +# Docker mips64el user cross-compiler target +# +# This is a binfmt image for when the MIPS cross compilers are not +# available in the host architecture archives. This image is based of +# the debootstrapped qemu:debian-mips64el-user but doesn't need any +# extra magic once it is setup. +# + +FROM qemu:debian-mips64el-user + +MAINTAINER Alex Bennee + +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