From patchwork Fri Mar 10 07:20:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 95132 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp735438qgd; Thu, 9 Mar 2017 23:23:33 -0800 (PST) X-Received: by 10.55.164.208 with SMTP id n199mr18941510qke.163.1489130613476; Thu, 09 Mar 2017 23:23:33 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o14si7519202qta.16.2017.03.09.23.23.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 Mar 2017 23:23:33 -0800 (PST) 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; 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 Received: from localhost ([::1]:37758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmEtf-0001AQ-4H for patch@linaro.org; Fri, 10 Mar 2017 02:23:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmErE-0008TK-Q0 for qemu-devel@nongnu.org; Fri, 10 Mar 2017 02:21:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cmErD-0005Yj-HB for qemu-devel@nongnu.org; Fri, 10 Mar 2017 02:21:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57646) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cmErD-0005YY-Ai for qemu-devel@nongnu.org; Fri, 10 Mar 2017 02:20:59 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8042581F03; Fri, 10 Mar 2017 07:20:59 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-30.pek2.redhat.com [10.72.8.30]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2A7KrM2010861; Fri, 10 Mar 2017 02:20:58 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 10 Mar 2017 15:20:51 +0800 Message-Id: <20170310072051.15704-3-famz@redhat.com> In-Reply-To: <20170310072051.15704-1-famz@redhat.com> References: <20170310072051.15704-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 10 Mar 2017 07:20:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] docker/dockerfiles/debian-s390-cross: include clang 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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée It's a silly little limitation on Shippable that is looks for clang in the container even though we won't use it. The arm/aarch64 cross builds inherit this from debian.docker but as we needed to use debian-testing for this we add it here. We also collapse the update step into one RUN line to remove and intermediate layer of the docker build. Signed-off-by: Alex Bennée Message-Id: <20170306112848.659-1-alex.bennee@linaro.org> Signed-off-by: Fam Zheng --- tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.3 diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index bbb21ed..3a687fe 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -13,8 +13,8 @@ RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list RUN dpkg --add-architecture s390x # Grab the updated list of packages -RUN apt update -RUN apt dist-upgrade -yy +RUN apt update && apt dist-upgrade -yy +RUN apt install -yy build-essential clang RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch