From patchwork Wed Jul 18 10:05:02 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: 142256 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp346665ljj; Wed, 18 Jul 2018 03:08:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfh/IxpCLvLOYia9FhaW8lkqO1MaXqCQr2FBqgUaM4jOr5kt9mwCCU/ym4/dYZbGXuJGP05 X-Received: by 2002:a37:151f:: with SMTP id f31-v6mr4589820qkh.388.1531908502650; Wed, 18 Jul 2018 03:08:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908502; cv=none; d=google.com; s=arc-20160816; b=IjuQ1RU/BAo304+plZqquOt3eBJV4dcN230/cVuq5zhyLb0U/jIiLWQ3pmZ5nceBgD 9DS888QT9S0hwSTdt2xYBb+HEmOYRmw6R8t1yqbNWCAsv+Fujd5y8Xwojaf6WZ0wVKiS n4YRdk3ZwVYm/TaDHc7TBdDd5thEZBB/WQgy/vI8y/p0T0iECoIGHfzrVR4tVK9JkaSM AsZFgjxKRMBhOwmd+VMHhA8iHS4u++uv2mMYzOjh5VYlwqeUcAcaTPdhXq9LTTWGdrU6 cXzuha+RyQerE29ffH+i+xl0u/b6VXNImIl9Y0Ud3BMGUa0oTlLnO18foGKL6aJ64ql5 dvCA== 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=Qlo8pS+YMAruoQXF5J0rsqM9Ef58K4gYmOMlEODNVyQ=; b=AOTuEUUS4Hm/zr/MDuRDVFbZ3zweTr/X84eofdPvFZSKNRFeBawc6tMSlzSzY60u0/ KLGQ0dpWwBoIkWOahvk/kSS+ELd7qMCljkALrj74q+tbvzLNOR/ho3R6/g6B14N8XfrS Ia6urE4x68d2W3WJz0U1ntU51S3xa2smkVV1GYVRykO3gqhCrU+o/+Md08ziUF46mPT/ /YhtaCf5k+OwanQ/JLpzVuFxK2WrGeeEjKrmtJmXwnlIrnVq2ekC+sCXA/W7//EBgAn/ J7JzA5ivEHQUQ8iuA5c62op7lmtJa+yC9xzXF/PxFgdVdgDY7LdvwCpV4tbg730lfpAD 1G0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=As4BjlZr; 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 k45-v6si3184426qta.55.2018.07.18.03.08.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:08:22 -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=As4BjlZr; 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]:35671 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjNe-0004Rx-3y for patch@linaro.org; Wed, 18 Jul 2018 06:08:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKe-0003D6-BY for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKd-00018S-0G for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:16 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:42971) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKc-00017V-Nw for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:14 -0400 Received: by mail-wr1-x42d.google.com with SMTP id e7-v6so4043728wrs.9 for ; Wed, 18 Jul 2018 03:05:14 -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=Qlo8pS+YMAruoQXF5J0rsqM9Ef58K4gYmOMlEODNVyQ=; b=As4BjlZrOfA0gRE0F/6rFJN3xBahi2fHPU+/ipMczriLrF3lMVoy1aaUXchq5OLtLE 9BbRC54/eDnZlsCRpEFzlzRT+6Dqq+YqvBXzLLMeCZaBfocAcYABOFbNzEtvJ/i5n1CI ibhZIkFL87t3PPR5hV3G5BlCGvGSEAoH6W7k0= 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=Qlo8pS+YMAruoQXF5J0rsqM9Ef58K4gYmOMlEODNVyQ=; b=c8H82PXz/PsyQ5lmXUk0gVmqEPalzVsv/OBSmGm9/J/bDF14Yd7B5omVqiuHe5/no/ MMYvAlaQD9KyLGFp37LpMz7/Bm7Smsi80karcWy3sxaKeG5hs5PP06Jp0bt4IAG5Yx9e /Urqi+DzSqRDDYGLDTct6g7HAUD8BldEzFEi5F6NxUGGcVD4o9ljyCf6howxNKGpOVEC Jm9O8hG/3IJ2Vx8YLdCPN4UVJ1wUEuYRnCLoppOw14wu1E/2UoACxOdTJM/MFU1Ee/kj /lGC0JPXZNsAMUfYbQdp9EAcC2ppDVe7vSP+x0MpQ80Jgw6IxmF8CCWRCAnSTupuarbC q2PQ== X-Gm-Message-State: AOUpUlH8pjTyUd9DDIp+2ytkwGPAjuLFV4QiFHV13sjmwkKQj7QwEarw N1cAhjmUHzXKQ7U68MnNw8N8wg== X-Received: by 2002:adf:d08c:: with SMTP id y12-v6mr4070262wrh.152.1531908313647; Wed, 18 Jul 2018 03:05:13 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b11-v6sm4106107wrv.82.2018.07.18.03.05.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BA5933E056A; 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:02 +0100 Message-Id: <20180718100505.7546-8-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::42d Subject: [Qemu-devel] [PATCH RFC 07/10] docker: fall-back to binfmt_misc debian-s390x-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 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 --- 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 -- 2.17.1 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 + +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