From patchwork Tue Jul 11 03:09:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 786443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x66hb30B4z9s74 for ; Tue, 11 Jul 2017 13:17:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ghXe2gRD"; dkim-atps=neutral Received: from localhost ([::1]:43933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUlg5-0006QX-6f for incoming@patchwork.ozlabs.org; Mon, 10 Jul 2017 23:17:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUla7-0001hH-O7 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 23:11:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUla3-0004X1-22 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 23:11:23 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:33576) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUla2-0004Wj-TZ for qemu-devel@nongnu.org; Mon, 10 Jul 2017 23:11:18 -0400 Received: by mail-qt0-f193.google.com with SMTP id c20so15134239qte.0 for ; Mon, 10 Jul 2017 20:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oZisyDKtJqjeRaPO6CSj+Z5koymErvrCpialR3lTbzU=; b=ghXe2gRDDY882XEa0Frco5+xQALfpthPwSnmbSfWlrz0EHqyLMGOpauNwA4tdZ4RIj mK7UDcp5gYmjun4BufTZ7D0l1JeUIqpss7vpDT7Ju9/Bj+0G6kvnGLx6QjJOv4ejPSQE 1O7GioJzrRq5hXrJ/LT4vPJsMGiJVmo9ATpLwstot67ZlQ1zIWFMhd8AurU/Qpvr3fRm b2R/ydEbt+OnYaZ5zBWBdP5jOIeTaSL5pfD6p0xNA2IZZb9kaelKpVNMXbcx0HbL6A3W PJYWlCE2HqSJadcwQobUflKcS34htXl+TlBBvT9boqS0ieuzo62SH5cOVI/wVvCSUYoy ov+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oZisyDKtJqjeRaPO6CSj+Z5koymErvrCpialR3lTbzU=; b=Z5qwIqAXpAJplj+jsUBy5NHt764Sn0vvncSskoEVJcVVl8+97ieZahvfNZAs+XUgfo l7AyT6kewRU7TiMvMvI9AVUQVOF6ugsZE0BtsmzrRhhC90cnpTMFiHlVrej614tMExOw moRCXxXtGlL14fyEmdT9sGeS4nNdpjz6/1ZgNVpkFymIR1W0pmtXruqV80FEJitsm3l4 +5M7KwvRioETt4Hh0yvcBbIMRQkbfEFEzvSEeO+1asL3EH4Oo5vWbV3rjQ9Ef/GgCNlo FQwXhYZBqbKJug3hEt+RwlUVJMrpOAyUjB9GnoJxrpDiAH+4xERyNd3/m4BFc9hrBQPB 2e8A== X-Gm-Message-State: AIVw111CE8AL+DN1Ns+lQMqkGfkkvutPvIXaosxhzY1/KB/6P2kanMKC yAPnPvl2f2X60XN0hm0= X-Received: by 10.200.48.237 with SMTP id w42mr8605692qta.54.1499742618063; Mon, 10 Jul 2017 20:10:18 -0700 (PDT) Received: from yoga.offpageads.com ([138.117.48.223]) by smtp.gmail.com with ESMTPSA id b13sm10702452qta.25.2017.07.10.20.10.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 20:10:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Tue, 11 Jul 2017 00:09:45 -0300 Message-Id: <20170711031000.24844-4-f4bug@amsat.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170711031000.24844-1-f4bug@amsat.org> References: <20170711031000.24844-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.216.193 Subject: [Qemu-devel] [PATCH v6 03/18] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 1 + tests/docker/dockerfiles/debian-s390x-cross.docker | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 01d7af9698..1eb32eebfa 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 \