From patchwork Tue Sep 10 08:43:34 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: 173476 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5527747ilq; Tue, 10 Sep 2019 02:15:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxJQOjkkUsGGdlu0CYDNYyp17BKjk4ORpl+vC0rGJILLJpEFGDJYi7NgTKg3ILpx+eumOsN X-Received: by 2002:ac8:2bca:: with SMTP id n10mr9455407qtn.242.1568106918131; Tue, 10 Sep 2019 02:15:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106918; cv=none; d=google.com; s=arc-20160816; b=DJoSUcYSZxjvbijq0+OWFH0BWfN96LuzjmBexbSo5tKpaDiW7KbxsCasDimr3WjeL6 USMwCYuQJivgjaAmwwHJkZqbHmBrW/hy0mk8k0CArYjREPLhbJ/Ksn42ygMD0Cm48PFB f00AcrPHMtJogWj8YXRouxrHL5HANE97rMH5hJFPJjaxYurA68ZceNQ0YJsmacogQAlW skzHg2uKSd5VAQK1AFPuODRuzLov8LfSOk/dBgQFL47fnRuAmb5WfoRQiBzGpbgcRwp2 JLNduRCGZxM7pFZMMwFjtNJeGmGcHK4jAnmq4+e7isilA39y+9UmJuckKgi8tAF3sr9+ 8T9Q== 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=ARJkONkMBY8LeB1yLjlkzhVw30O5bw77o+QDas9FiKk=; b=Gb94Mfb9p9u1poz0OYhUM63YyNpiyyZEb7sJHj9HqKobpRo9eNeGtGHlswRXdGa5qV AqqB88wnZoYMW/ZQw4tgUicxMimRi32AMuKxrMnbTu1LW/NZ8hJZp9W+6AX0KDVmxfqr u8OzNLiqoP6I4ExVOhDhh/YrBDBbYc2O788XiYFdXTlRcFpQcZGwcCfenUCh/MrgQGbz mEsGS5ogx/QgTi+CnagBvtvhJyF8CuC7qXYyMTLm4GrYYF/TimEelcXfBlrqxySwsfKs 5fCKxG8LlDTPKXn/8tf+POKGWNjwDP+1IYSiHYOOrMkntnEPMsTVYLZYz8zW9QCFBZq5 PQYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="E/L6jT8B"; 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 21si13038968qvp.8.2019.09.10.02.15.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:15:18 -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="E/L6jT8B"; 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]:36280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cF3-0003tb-12 for patch@linaro.org; Tue, 10 Sep 2019 05:15:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37279) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bqv-0000mc-41 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bqt-0000bv-Lv for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:20 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42959) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bqt-0000bW-F0 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:50:19 -0400 Received: by mail-wr1-x42c.google.com with SMTP id q14so18391952wrm.9 for ; Tue, 10 Sep 2019 01:50:19 -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=ARJkONkMBY8LeB1yLjlkzhVw30O5bw77o+QDas9FiKk=; b=E/L6jT8B5elGgwyBLGAJkR1YvDGZJArgL0TGyHpeeifs0J+X+V3gw4O4QWVza80O1g pGp4D5Bv/z0lQ8JfvKxC1cAmAeE57FJu92gFnfyjIk/wscxPODfqF7Egu6Ca1EeVM4OY dOsWzIMWOBe2uLeiCUr/N2kMj8Jz5YBn1u8u3iIoSzb/zsJyDPPMZ9CXQ1X9vmQJ1bvi 7lCsk0YjTF4edL4Mt7xfQ99GPMqSJ1m7T9N+FUGKy0qq0hNoxH3qFVl2SLsj1qTMou+2 YOkSsUn4kL5qG0hsLdujwDpGXQ/lFgx+zDHiISdiv9bh3Dwo4eeTwnAWJwzo7JsPMwoK y7Og== 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=ARJkONkMBY8LeB1yLjlkzhVw30O5bw77o+QDas9FiKk=; b=a+r9hV/mBcTh3+p8/y6VYasTklWZLlRsceo9VqEa7y8PgR0L/BnCMbGG5DM75xGInn 6jmxWJqedg6DZuwCfPuA/xIQW36V1nveFj9sx7mCDvGnZfCPekzvLchp3wpSwpZWk9Yx a9C4BghMDCeNIlsskPeajifAAaD9iw3jqI1YxnXs7BDHM8HOz9LKSDLUBex/75BJ2ByW cSIXujQJFXoe3Bv6GhKKbdsR2iNuzfHprM1R44pLi73RcZe0rdO1Tvh2rojmkVJyb2lO nOMKobPU0BeQFVDJBBVKnZBsdQr7IG4L2VexuoTWa04UAE0j9tjJDOgI6GjCl9hmr2zG Wbaw== X-Gm-Message-State: APjAAAURTtorPsSYYxn9qWnE7nckumq7R0mkAZ+s3fRwBn5JWs3K3WO1 6kNGyjHACFXthZSImDTQ9gku0A== X-Received: by 2002:adf:fc4c:: with SMTP id e12mr26124485wrs.147.1568105418420; Tue, 10 Sep 2019 01:50:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z25sm1868449wmk.0.2019.09.10.01.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:50:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 616C11FFB4; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:34 +0100 Message-Id: <20190910084349.28817-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42c Subject: [Qemu-devel] [PULL 30/45] 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?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 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 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-