From patchwork Wed Jul 18 10:05:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 142259 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp348636ljj; Wed, 18 Jul 2018 03:10:35 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdH5DRAqldLzDLaw+ecC7YsYg+JLD/FPWpeyQfvece9JDEN0mA4jt/ya2EsVkhsysfNzrni X-Received: by 2002:a37:849:: with SMTP id 70-v6mr4723442qki.200.1531908635579; Wed, 18 Jul 2018 03:10:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908635; cv=none; d=google.com; s=arc-20160816; b=l1B8XQh2a+xm9+GBWSN1NDvDv/AO0nkWnfUuXQmE6pL8ULcPNUymjbSpENoeYr28V2 OOoTNLQQpJTyDVOTmwGwWZM/sUqnKmHzS7nlmVnlYxPxTrCro5aGQn61w081gqD/Emf+ Dx68s0H/zIGmTWWOqAkj1agmM7pjc6Xg+kzpbzeRea+/swCFP5qF1e7KCEsrpNIJn8CA W+DVArqqtuFxTcG3o1n/QJ8CH/DIXGt7MEpBr/3bI2PcgH8MJ5an2lt/PwpE/UUdmYaP T8ddS+2p0CzL0msiFeaLYGP+3ue+Ev5VEB2VR38e0FLQyaH/EoRXMeMmrcoy0mWlNd9v aNbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=R7WJlgOC/Eb7eHKtYMd9nlXsHtszE6zXBbaOOm4XzFw=; b=qhPgDnIYcxk4T+uhsryqwlc0DylviykJqfRTJ0U/UTFpNwUuOrhZHjgxt5u0VdcbEa ailn3p+wPGf8nBLkHsjzB2KB3BhoTEE7nwoehDhs+3IMqa4oilDGxdlZ6H68PgR5hWD9 vWcLv4sfu0jKkBauelcJmY77IAvkP8+yAc+k37RDzLPKo0OgTC35CB7K0cvU8NdKr+21 8OjqGSaalSUgsLLrxJL8s6CK5wEPi/fe3q9DU8hP3sFuE4BBHxruUJr5lHSWEiCp1Wn1 X/eOCcq5D32L9SNGzzNwceesLsQcXARj00ibRIdX543Baw080GVq04Zr3YvrJvIoBMJb 9nzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QX8Obcwy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o63-v6si395984qkh.329.2018.07.18.03.10.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:10:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QX8Obcwy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjPn-0006Ya-3X for patch@linaro.org; Wed, 18 Jul 2018 06:10:35 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R7WJlgOC/Eb7eHKtYMd9nlXsHtszE6zXBbaOOm4XzFw=; b=QX8Obcwy3JUbx/mhE0kPKc5N595iV9kw+IXzaIJmYWQVG6qeDGO9/SvSSp5IA5UFnR BlJt+Ps3qaRYZCCys9YIohV/wo4ZtuX6jafRILz63tbydAR8+FUDWr3+7UMkYwn8RBl5 oMRRMJQaATyoW/soM2No6k9gdceBmeQhm8KBs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R7WJlgOC/Eb7eHKtYMd9nlXsHtszE6zXBbaOOm4XzFw=; b=B+5mGI8UD5R5kmPzNhD0QndeH4EsMLsvnXt1iUbwJu3cujxxEvBlIcMXuIIjmI1UXY zKusmLqAKjkPMoROJ1kCQTTm3dotIMgZhfSstSdLoV3/ek9vp1uh/Em192xKSvfUdjhO J4kRQqk9Jzi1yQ5jO2E8lGHXNVo8wPMl0tqtngiBgdX7XQnh/vXLI/HVzTx2ZOV/r1ak QDYpTvb4FU7sTIzQebJTWX1vckB8tkj44/ANjEYXpCMkQanp7QzoW4V6ZJ4OshZuESRW /5GQWSnI90A9019RimkGfJuHPh9GDifwhrgFg170f15k4nu1+iRWTJlpwpMqut0F6XyT h89Q== X-Gm-Message-State: AOUpUlGpUDAdbSd+Wkuda5JApPJFYUiMxdus1ju0IELangzJaZmvlN1A pBjn09zVyryv7pRx5/XpxNbndw== X-Received: by 2002:adf:b2f4:: with SMTP id g107-v6mr4069541wrd.53.1531908312169; Wed, 18 Jul 2018 03:05:12 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v15-v6sm1860868wmc.16.2018.07.18.03.05.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:07 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 936153E053E; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= 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 Date: Wed, 18 Jul 2018 11:05:00 +0100 Message-Id: <20180718100505.7546-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PATCH RFC 05/10] docker: fall-back to binfmt_misc debian-mips64el-user-cross on non-x86 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 -- 2.17.1 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