From patchwork Tue Jul 18 10:44: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: 108078 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp5728364obm; Tue, 18 Jul 2017 03:47:37 -0700 (PDT) X-Received: by 10.55.138.67 with SMTP id m64mr1196491qkd.192.1500374857425; Tue, 18 Jul 2017 03:47:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500374857; cv=none; d=google.com; s=arc-20160816; b=h2PNYP3KRY/W+IWPkm6pEPFTzhTAd7JoMDzyqs4cilSjosvxfVn5+s38xwccE//F/8 SQkt0atD0fwvRINS4Ua5zIhj5D3W2vCy0C8WOAamW9yqYvs7O+qyHcVl4HmsKjKhR/9I 2+PkBYvUvsywnrShzgs6N7PNnIY3ZYT/zKJui/OndHPIRE4HLLYTa7Wh1cpcsnHvGVsr IMNnmQFjtMA6I8DpK08pLYa3f67J8Nw87PrVMEUgjTsjcC9J6v0/Gl1prG0gQ5hR+laG m9RhnB+OoSntwKlrYVIfE0DxMxHdSkTJzXa1kgKUmYqryr0do6lME3D138Gi1FebUOWF NZVg== 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=5avzHYLyGSCN8PG/h6gQEhCaH0NsRu3mgRfaram+nS8=; b=PGDVOi7I6LQvFs32xj4h/SxAgo0+J07y5691l22IRy/1G41tZxNS3/uUxODDJbsE4G 64xUetqnV1wxJY2pL2V94LzoJKQjqlcFpBSTLLezdOmA7tqI/jmFwoecAYRYBOHvx0Xt 83RKT93KazfR1/CbPPlMl0Z1iZ8/YzTTsxRFzwGqKUfUnV4aSG6G2sVXw9KldgRtAptk FzC1rlFMMx/+XBMYqcaYGLdgBrKeH7ZBRbTCJ5p3T+OwIKuw3OXVL7SxogtyrETtQeBg AUBOsspBe2a/kB1qti49qsG6qznk/T16qThbYlZo0IAUkIH0jK/ySKkR3Ws3/R6uk+fH K2wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=j0AD+5SU; 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 o7si1739790qtg.133.2017.07.18.03.47.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 18 Jul 2017 03:47:37 -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.b=j0AD+5SU; 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]:55377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXQ2R-0000KI-08 for patch@linaro.org; Tue, 18 Jul 2017 06:47:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXQ0N-0007XG-Ti for qemu-devel@nongnu.org; Tue, 18 Jul 2017 06:45:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXQ0N-0003Aa-0Y for qemu-devel@nongnu.org; Tue, 18 Jul 2017 06:45:28 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:36261) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXQ0M-0003AK-Py for qemu-devel@nongnu.org; Tue, 18 Jul 2017 06:45:26 -0400 Received: by mail-wr0-x230.google.com with SMTP id y43so23109647wrd.3 for ; Tue, 18 Jul 2017 03:45:26 -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=5avzHYLyGSCN8PG/h6gQEhCaH0NsRu3mgRfaram+nS8=; b=j0AD+5SUXi8U87lRFDANRyFqJfmA49XfUr9SswV+rA8buxTeLRP8owrJBa7oI8jGlh 16sCY1FgPrWnyuPO7QluPQCbKyV5zDzHAEI+YzINckwN6Y/LqucouDgTO2nRlCXQqEPJ 3feilqO2XrLuCYBk1ZMWHIVXfPOrajkytErnI= 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=5avzHYLyGSCN8PG/h6gQEhCaH0NsRu3mgRfaram+nS8=; b=CfUgesKHXqgBVLXNoZHH9y9JB72TAbL0ENjEsCAP+LyiEyFuzLsLA0k3HRTCozJOu9 DbjDdbIEJ1Pwr16lB3mdqo8IFvqErv578H2OfYIXqywBojdTZN+jQrUkfqoS/REOTNgP vWKg0wpEb/Y2WHQ2OuHEDiykHZnuqpkwiEJSrTvONIV1tKHeQYjQVAa42WqQRer5LdKU iZ3aRlXlrJng4BfLig874YZieLttSA2Mz0h+1/KFMfOjyjZIRB0Q0bC8DAHEqh/SBH0/ /2GRptHGrtzXo8jF85X7iX9JvaQCdAQj2J79GrkEYw+k9Fz9KKybqFQ2DjH5fAMnYJ1L tndQ== X-Gm-Message-State: AIVw11385A0W0rkObnMT05OJDRGW3yrUgDUIqzHpKa31R5+wLwmGI54z aZm9xwmDR8U5K+fL X-Received: by 10.223.175.229 with SMTP id y37mr772417wrd.61.1500374725690; Tue, 18 Jul 2017 03:45:25 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y35sm2246483wrc.51.2017.07.18.03.45.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 03:45:20 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 778573E04F1; Tue, 18 Jul 2017 11:45:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 18 Jul 2017 11:44:48 +0100 Message-Id: <20170718104513.23947-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170718104513.23947-1-alex.bennee@linaro.org> References: <20170718104513.23947-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:400c:c0c::230 Subject: [Qemu-devel] [PULL 07/32] docker: debian/s390x no more in unstable, now available in Stretch 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "open list:-----------------..." Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.13.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 72bb52ad7b..84dce49655 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -59,6 +59,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker docker-image-debian-armhf-cross: docker-image-debian9 docker-image-debian-arm64-cross: docker-image-debian9 docker-image-debian-mipsel-cross: docker-image-debian9 +docker-image-debian-s390x-cross: docker-image-debian9 # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(DOCKER_IMAGES), \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index cfc354ce5d..667e428a4c 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -1,27 +1,27 @@ # # Docker s390 cross-compiler target # -# This docker target is based on stretch (testing) as the stable build -# doesn't have the cross compiler available. +# This docker target builds on the debian Stretch base image. # -FROM debian:testing-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list +FROM qemu:debian9 # Add the s390x architecture RUN dpkg --add-architecture s390x # Grab the updated list of packages 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 +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + gcc-multilib-s390x-linux-gnu + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get build-dep -yy -a s390x qemu # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu- -RUN DEBIAN_FRONTEND=noninteractive \ +# Install extra libraries to increase code coverage +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ glusterfs-common:s390x \ libbz2-dev:s390x \