From patchwork Mon Mar 6 11:28:48 2017 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: 94918 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1339831qgd; Mon, 6 Mar 2017 03:29:28 -0800 (PST) X-Received: by 10.200.49.129 with SMTP id h1mr14967520qte.277.1488799768273; Mon, 06 Mar 2017 03:29:28 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l48si15237880qtb.285.2017.03.06.03.29.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 06 Mar 2017 03:29:28 -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; dkim=fail header.i=@linaro.org; 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]:43021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckqpS-0004Tc-12 for patch@linaro.org; Mon, 06 Mar 2017 06:29:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckqot-0004TM-9x for qemu-devel@nongnu.org; Mon, 06 Mar 2017 06:28:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ckqoq-0001Rf-N8 for qemu-devel@nongnu.org; Mon, 06 Mar 2017 06:28:51 -0500 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:35611) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ckqoq-0001RT-Fa for qemu-devel@nongnu.org; Mon, 06 Mar 2017 06:28:48 -0500 Received: by mail-wr0-x230.google.com with SMTP id g10so114167304wrg.2 for ; Mon, 06 Mar 2017 03:28:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yLg+IHrdPuTV04832uf/X9L6Su69VRHxnW50RR+vPw8=; b=T/CrRQIEImG9mzmyfT+E7mS28CVFC45gQ6AEv745sEzQpxyfqi5CU36buOphgrC0T5 Go1J4Z1ODz9xtqN3CMS2zA0NKp9mTffT5oMLLRJ4SdW8Z7sxHzpRebELoyZJMn8fuA8d xmOy1W8dpB1v+wGIFCcrwo37rpk7Now7KtcS0= 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:mime-version :content-transfer-encoding; bh=yLg+IHrdPuTV04832uf/X9L6Su69VRHxnW50RR+vPw8=; b=qwmtd5favSxWpSszDzu+SadMUkAO05sH8JLu6WluHu/gUZIyxfuLBIm+6prEWoPZcC oEhLBvarMIZ1cAFZcJSlMJIc3gwZBcfvwhHQF0QsfRIApgmUZPUgpUl1RF81bSn7s0zp y2EtskEW/4OaNMP6WJCM6OYxgi9dXmjc8sY/+b2El/CI32ua1h0zQpd/NrDqJnx4R6aY BK2W08BTW+XT7n6wtcAA6KXon9oeh4T+hzwrLoDyHtpbGEathxoW5+7IU2O78zhJ+moI obSeMcwHcio7dJARnLvHSJZgestRuHqpEwGpEDu5h1pf0Jc5F+0yp3pYNX8PW7TbALhn 7sHA== X-Gm-Message-State: AMke39mtR1zmM4B2BYX8hOJowFlzowJpUBXGsdikGqZc0TE+CaM83EOK5N+3LpQWICRXkWpG X-Received: by 10.223.135.85 with SMTP id 21mr4024456wrz.93.1488799726932; Mon, 06 Mar 2017 03:28:46 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v186sm4892788wmv.2.2017.03.06.03.28.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 03:28:46 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B8CF93E00E9; Mon, 6 Mar 2017 11:28:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com Date: Mon, 6 Mar 2017 11:28:48 +0000 Message-Id: <20170306112848.659-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::230 Subject: [Qemu-devel] [PATCH] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.11.0 diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index bbb21ed088..3a687feda0 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