From patchwork Wed Sep 4 20:29:58 2019 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: 173052 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp439097ilq; Wed, 4 Sep 2019 14:06:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzSRSC7sB+F8rWVgRswFsq25QQ+jjapz562UiP6632KjWeKG68Qviz8dFmUxv4OUg3qx8nD X-Received: by 2002:a50:ba2d:: with SMTP id g42mr311630edc.288.1567631196794; Wed, 04 Sep 2019 14:06:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567631196; cv=none; d=google.com; s=arc-20160816; b=Va73rvuRe4RLtzFDHDsINVM7xklIEFpfh0shGV+5TFuUM5PPTF7Rfih2TSQi1aVHYQ GFnfThNlVu3iwbb+oGxkZBw41Nif0lhtia0fwMHYn7K5xOBk3Cc/XZAShvmUgqwsJflA tnxDmbYcR7ajM0wFzwzfwDFYCieRru2GIZg7NpLp0DlbkMOaEoBx4IWV3GrLdMVCcFSF AXkYtgzwZy3xwglO6pg3LOMeq9ElWkKZSMPqB/xqne+x9d270bdSuMN54cOqfYXlrZ8U bxYlgD24qtw7pbEpj5xAqUGL+nkvllTp9EyzYKCZF13ijtcTLVAWqQbjJFYTw0Reqhld JEyw== 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; bh=g7I0s4Lie1qYSELayH6y2qb5FHFQ5/ovNGMk3oUpNFw=; b=wStX4YIOlkF2MafozKZ2x8VdJIAuduzCMxFBTqikMjLWlcqHkMbvgu2gQJd3Dvi6/L C6I8IVRIPhk84y1dl//TuS/nVz0H05W+isAtOhMGOJwUwE1sdzPcEHOgR4sDSuTx7zHR YuB5NzfP3qsg4ni4UhoFQX8Rw6G/ZLnM4GnnKQGMjkoSdPlB17Y3EkrpcCpc2xP+AGMm bP2OdsRwxj7FF+Uf4QE53DFR5O8/6lk6+n8CIXYlPjUjLoB4R2w2FYPzt2HOMlgkZ5dp /dJvXyDBcEZxSc1WBXu3yzpwMc7B6FtXsl/o+IxhdNksmadT8Cl7xMEv2TpMF2rZSMh2 r6gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ltyBU1t7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id k9si1928249edb.56.2019.09.04.14.06.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 14:06:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ltyBU1t7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:39840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cU6-0002yj-VE for patch@linaro.org; Wed, 04 Sep 2019 17:06:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51701) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c46-00016d-4K for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5c43-0003c3-GN for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:42 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:39891) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5c42-0003aL-07 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:39:38 -0400 Received: by mail-wr1-x42a.google.com with SMTP id t16so204166wra.6 for ; Wed, 04 Sep 2019 13:39:37 -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=g7I0s4Lie1qYSELayH6y2qb5FHFQ5/ovNGMk3oUpNFw=; b=ltyBU1t7HZ3qIO6jg9Jfphp5bLDFjArmZKITbVl8ayqv+TO+dfY7qKqTPGES3MDjw8 fHQEPVhxh8eLkmoqTKFtRnJZiXrqckt7Kfj5fQP01LMXlWcPDX89/3IZ5HJekHN2r89m xkX32vJ3dJjgupiPe+P1w3loxBSNzZP68x+L+7mDHLwjI8Ie/FEQsNpvGHwJ1UNmvkKt H02+fouSdqpD2mO3I1PaRRcVcP9St3GKfq8K59AsX9ssiRC13IZl9TABSGUGuX3bZT7v KC0U6DOBFnNv3XD0apv1jeRaDNtgAGGJJX1GqtEgfHqgiLusC+i53Je6yUJiyJiJIDjN kNjQ== 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=g7I0s4Lie1qYSELayH6y2qb5FHFQ5/ovNGMk3oUpNFw=; b=iJId2TG0dAoMByQutBiwWSpOzLjR4+6YlKiHjKiXH1qH9FWbqrHfmNrD9yHxxxgyq+ 3sZmLYzx1MJcA2ET5IhI0AaF8TJmMerSYrJKRbHV+4uF2gOMDdmcEWikB9+uJTGpSaEm nGVahclOE4tb5zBIWOYMxHIAu9BWwft2EVsy3jOwypqG3fe4mG9Cwg1VLtafQjg/EMI2 XMyeVDVk2yOZvmfqtRuegiHzeIFzl4Y9TfV8dXOlo1Xe1TVBLbLFvaza7G6u+yC6Wg7l aEyr939ZPbvtBhI3MqE6gMv5O+lKjkGwgLU2wk6hPxOzzsT5m/5nHE9gmQwf2RHhIFXM JPtw== X-Gm-Message-State: APjAAAU2mCA+GfPLeaVCy96UN3lTT58Fc+e1kTxHRbhW7r3zsywhCl/u OiJWkk5GmEj6YNuTnG0UbK2F9A== X-Received: by 2002:adf:fe0f:: with SMTP id n15mr29857667wrr.343.1567629576119; Wed, 04 Sep 2019 13:39:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y3sm5604231wmg.2.2019.09.04.13.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:39:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E8B691FFB1; Wed, 4 Sep 2019 21:30:15 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:58 +0100 Message-Id: <20190904203013.9028-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-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::42a Subject: [Qemu-devel] [PATCH v1 27/42] tests/docker: use --arch-only for installing deps X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- 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(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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é @@ -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-