From patchwork Tue Feb 28 12:44:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 94611 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1312760qgi; Tue, 28 Feb 2017 05:09:58 -0800 (PST) X-Received: by 10.31.94.204 with SMTP id s195mr879538vkb.76.1488287398891; Tue, 28 Feb 2017 05:09:58 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e27si580514uaf.253.2017.02.28.05.09.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 28 Feb 2017 05:09:58 -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]:60847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cihXQ-0007e4-HY for patch@linaro.org; Tue, 28 Feb 2017 08:09:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cih9N-0003Xu-DU for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:45:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cih9L-0001Cf-VW for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:45:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51078) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cih9L-0001CX-PG for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:45:03 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 D5F60C054911; Tue, 28 Feb 2017 12:45:03 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1SCj07b022115; Tue, 28 Feb 2017 07:45:02 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 28 Feb 2017 20:44:57 +0800 Message-Id: <20170228124458.31307-2-famz@redhat.com> In-Reply-To: <20170228124458.31307-1-famz@redhat.com> References: <20170228124458.31307-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 28 Feb 2017 12:45:03 +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 1/2] new: dockerfiles/debian-s390-cross 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 This adds an s390 cross build target to our library of docker setups. There is an issue with the xfslibs-dev:s390x package having a clash so we do a || apt-get -f install to fixup the rest of the dependencies. This doesn't build on the debian.docker file as we are using the multilib compiler which is only available in stretch (the current testing repo). Signed-off-by: Alex Bennée CC: Christian Borntraeger Message-Id: <20170227143028.16428-2-alex.bennee@linaro.org> Reviewed-by: Fam Zheng Signed-off-by: Fam Zheng --- tests/docker/dockerfiles/debian-s390x-cross.docker | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-s390x-cross.docker -- 2.9.3 diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker new file mode 100644 index 0000000..bbb21ed --- /dev/null +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -0,0 +1,22 @@ +# +# Docker s390 cross-compiler target +# +# This docker target is based on stretch (testing) as the stable build +# doesn't have the cross compiler available. +# +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 + +# Add the s390x architecture +RUN dpkg --add-architecture s390x + +# Grab the updated list of packages +RUN apt update +RUN apt dist-upgrade -yy +RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install +RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu- From patchwork Tue Feb 28 12:44:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 94613 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1314563qgi; Tue, 28 Feb 2017 05:14:10 -0800 (PST) X-Received: by 10.55.104.134 with SMTP id d128mr2230428qkc.86.1488287650360; Tue, 28 Feb 2017 05:14:10 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i93si1389391qtb.262.2017.02.28.05.14.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 28 Feb 2017 05:14:10 -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]:60870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cihbT-0004Eg-3v for patch@linaro.org; Tue, 28 Feb 2017 08:14:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cih9O-0003Yk-8J for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:45:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cih9N-0001D1-Im for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:45:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43826) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cih9N-0001Ck-DO for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:45:05 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 84B763A769B; Tue, 28 Feb 2017 12:45:05 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1SCj07c022115; Tue, 28 Feb 2017 07:45:04 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 28 Feb 2017 20:44:58 +0800 Message-Id: <20170228124458.31307-3-famz@redhat.com> In-Reply-To: <20170228124458.31307-1-famz@redhat.com> References: <20170228124458.31307-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 28 Feb 2017 12:45:05 +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] .shippable: add s390x-cross target 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 Use the new debian-s390x-cross.docker target to cross compile for s390. Signed-off-by: Alex Bennée Message-Id: <20170227143028.16428-3-alex.bennee@linaro.org> Reviewed-by: Fam Zheng Signed-off-by: Fam Zheng --- .shippable.yml | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.3 diff --git a/.shippable.yml b/.shippable.yml index 1a1fd7a..653bd75 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -5,6 +5,8 @@ env: TARGET_LIST=arm-softmmu,arm-linux-user - IMAGE=debian-arm64-cross TARGET_LIST=aarch64-softmmu,aarch64-linux-user + - IMAGE=debian-s390x-cross + TARGET_LIST=s390x-softmmu,s390x-linux-user build: pre_ci: - make docker-image-${IMAGE}