From patchwork Mon Jul 17 14:48:32 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: 107979 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp4663794obm; Mon, 17 Jul 2017 07:56:06 -0700 (PDT) X-Received: by 10.237.52.161 with SMTP id x30mr29005528qtd.55.1500303366725; Mon, 17 Jul 2017 07:56:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500303366; cv=none; d=google.com; s=arc-20160816; b=oz/DvWEY9UooQRxAPcdjeFQr0YdwPfec1S/XJliPw0oUG1++ljhyhSsWdpI6OtreXf Sspip5xnG4wMsmtOmP7IV/9EQGjsWkib3sY1PNW1LfO+oueewXnsknOvcQfpH+IiOT9D YMojUIFjr8nCSFr7q2332XSUpp58B+ICQ34j6CxNAphwPNcQHCafEWfBnj2wjXvxMNP2 Z40P8KkltQ18DQzHrlhbaFifg6u1zYi4GEVgpnW2zdmG0E7DQqpdeyFbb1kD0YnLY+rb pK4rN7EsV3hyRrgK12VKIjuOYgXVtlzTtlHSR5+KWgJjQS0ZYVyWOYhagCrBNA/wTezi 8IXw== 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=ybfIhjAsIjsss/CN/bO9NpOXcczftE/ibIkDwr0JQ48=; b=SBygA9VcFrIayZYJiM2+hKnAWVJrKtKPFJmN94h/AZCkVKPCOvKOIitzoSauPbKtfR bHrmlju6jJduqUeQ2YfSTRLEEs27jisTcWUJWLZU0W908PwfAiezgigCn47AHKdUYdvi B/nCaEeKBgv5sqz2eIa4m74JXHRi8kTNJeLvxcTwKhb/L1wD9/S0IcemYPVH4ehwf3Cm 1Uwkcuv3dSOKOkzTw8r26ctuhdlCu8mcAS0VXgb8eGNLuCWcBA35zZ/9EdC7wRLL0YJE MMDqWI8TV4d8qHbekDXhYkG5qf7j8hJ0bTWVFcU+AoQ+arS3+BcyGK9Y3NEaDiHkDuWz SKaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=GKeUnfjv; 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 q23si15439852qtq.155.2017.07.17.07.56.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Jul 2017 07:56:06 -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=GKeUnfjv; 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]:50869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX7RM-0003uW-4P for patch@linaro.org; Mon, 17 Jul 2017 10:56:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX7Kc-00062v-KO for qemu-devel@nongnu.org; Mon, 17 Jul 2017 10:49:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX7KX-0002Ao-Uq for qemu-devel@nongnu.org; Mon, 17 Jul 2017 10:49:06 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:35602) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dX7KX-0002A0-Or for qemu-devel@nongnu.org; Mon, 17 Jul 2017 10:49:01 -0400 Received: by mail-wm0-x229.google.com with SMTP id w126so78418734wme.0 for ; Mon, 17 Jul 2017 07:49:01 -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=ybfIhjAsIjsss/CN/bO9NpOXcczftE/ibIkDwr0JQ48=; b=GKeUnfjvenxEhiRhY2EWRSy1MviqQQ1PPs8AeQra1/No1O/JqCYx15imkGrXMiHO+N 9d8vezzbo5NJ2THkrVaqmrWoMmB8SUGNG5eEGINuBFmVjySW65gY0MMzmFILsXqd9LIQ kwSlJyU247BNXMDu0CtvM5g+jmdVun4wRNMNg= 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=ybfIhjAsIjsss/CN/bO9NpOXcczftE/ibIkDwr0JQ48=; b=TxEUmBsbCox153GwSaz8XYavfAZZZ2qcAMNcZmc1zvc9iXoycuRUKG6RVnHQxj4G5P vv/N5VEVlSYrRD8MkVaTyZwGmDKPU4ZxOUfQjhGUh1bjMKZEzwfzqKeGCB3O6uolQgMs jHSARwOYONnalSlbjyiJ4F+5f1TSnhhpW1sz9369YSBP4nNs0wTXtJDAxFaUVJzVVGz2 Bu0tm1K/F+nfEfYfQ23Pv0GTS7acXjjf9/xclsRRhq/mONzvJ/UM6mnav9dj7obhf0Kv XiJCdqQ7WfMEmmW5KHeyJyYbNP1KtLooc6QjpZ4txBVc5VABXF4Musze9bpAuMAKiw+e agPg== X-Gm-Message-State: AIVw113XqgyoHN+i+Atg+0ryAN4ZSw4qwKKe7zlkYVTfNt6bqdcBha/a wUfN6j1spJ2wIJSZ X-Received: by 10.28.140.84 with SMTP id o81mr4930935wmd.76.1500302940471; Mon, 17 Jul 2017 07:49:00 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q17sm12511418wmd.4.2017.07.17.07.48.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 07:48:55 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D5AF43E046F; Mon, 17 Jul 2017 15:48:48 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 17 Jul 2017 15:48:32 +0100 Message-Id: <20170717144848.11793-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170717144848.11793-1-alex.bennee@linaro.org> References: <20170717144848.11793-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:c09::229 Subject: [Qemu-devel] [PATCH v1 07/23] 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?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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 --- tests/docker/Makefile.include | 1 + tests/docker/dockerfiles/debian-s390x-cross.docker | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) -- 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..18fe813aa7 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 \ + binutils-multiarch \ + 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 \ +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ glusterfs-common:s390x \ libbz2-dev:s390x \