From patchwork Fri Apr 20 00:24:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 901571 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40RxS70StKz9s1w for ; Fri, 20 Apr 2018 10:24:23 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40RxS64wLZzF24D for ; Fri, 20 Apr 2018 10:24:22 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=stewart@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40RxRx42RHzF22T for ; Fri, 20 Apr 2018 10:24:13 +1000 (AEST) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w3K0O3Vv154154 for ; Thu, 19 Apr 2018 20:24:10 -0400 Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151]) by mx0b-001b2d01.pphosted.com with ESMTP id 2hf2k2entt-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Thu, 19 Apr 2018 20:24:10 -0400 Received: from localhost by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 19 Apr 2018 18:24:09 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (9.17.130.17) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 19 Apr 2018 18:24:08 -0600 Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w3K0O76Z13763036; Thu, 19 Apr 2018 17:24:07 -0700 Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B5ECC13603A; Thu, 19 Apr 2018 18:24:07 -0600 (MDT) Received: from birb.localdomain (unknown [9.102.50.46]) by b03ledav002.gho.boulder.ibm.com (Postfix) with SMTP id AB07B13603C; Thu, 19 Apr 2018 18:24:06 -0600 (MDT) Received: by birb.localdomain (Postfix, from userid 1000) id DE9F64EC649; Fri, 20 Apr 2018 10:24:02 +1000 (AEST) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Fri, 20 Apr 2018 10:24:01 +1000 X-Mailer: git-send-email 2.14.3 X-TM-AS-GCONF: 00 x-cbid: 18042000-0008-0000-0000-000009A053E4 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008885; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000257; SDB=6.01020405; UDB=6.00520653; IPR=6.00799642; MB=3.00020674; MTD=3.00000008; XFM=3.00000015; UTC=2018-04-20 00:24:08 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18042000-0009-0000-0000-000046E167AD Message-Id: <20180420002401.25201-1-stewart@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-04-19_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1804200002 Subject: [Skiboot] [PATCH] travis: Enable ppc64le builds X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stewart Smith MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" From: Stewart Smith At least on the IBM Travis Enterprise instance, we can now do ppc64le builds! We can only build a subset of our matrix due to availability of ppc64le distros. The Dockerfiles need some tweaking to only attempt to install (x86_64 only) Mambo binaries, as well as the build scripts. Signed-off-by: Stewart Smith --- .travis.yml | 16 ++++++++++++++++ opal-ci/Dockerfile-centos7 | 10 ++++------ opal-ci/Dockerfile-debian-stretch | 12 ++++-------- opal-ci/Dockerfile-debian-unstable | 15 +++++---------- opal-ci/Dockerfile-fedora-rawhide | 2 +- opal-ci/Dockerfile-fedora26 | 2 +- opal-ci/Dockerfile-fedora27 | 2 +- opal-ci/Dockerfile-ubuntu-12.04 | 15 +++++---------- opal-ci/Dockerfile-ubuntu-16.04 | 15 +++++---------- opal-ci/Dockerfile-ubuntu-latest | 15 +++++---------- opal-ci/build-centos7.sh | 9 +++++++-- opal-ci/build-ubuntu-16.04.sh | 10 +++++++++- 12 files changed, 63 insertions(+), 60 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0deda307d3dc..e68c9151f69c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: c +os: + - linux + - linux-ppc64le + cache: ccache env: @@ -25,6 +29,18 @@ matrix: allow_failures: - env: RUN_ON_CONTAINER=fedora-rawhide - env: RUN_ON_CONTAINER=debian-unstable + exclude: + - os: linux-ppc64le + env: RUN_ON_CONTAINER=ubuntu-12.04 + - os: linux-ppc64le + env: RUN_ON_CONTAINER=fedora24 + - os: linux-ppc64le + env: RUN_ON_CONTAINER=fedora25 + - os: linux-ppc64le + env: RUN_ON_CONTAINER=centos6 + - os: linux-ppc64le + env: RUN_ON_CONTAINER=centos7 + sudo: required services: docker diff --git a/opal-ci/Dockerfile-centos7 b/opal-ci/Dockerfile-centos7 index be6f6a333c64..06456b9a777e 100644 --- a/opal-ci/Dockerfile-centos7 +++ b/opal-ci/Dockerfile-centos7 @@ -1,13 +1,11 @@ FROM centos:7 RUN yum -y update && yum clean all RUN yum -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel openssl -RUN wget https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz RUN mkdir /opt/cross -RUN tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8-1.0-2.el7.x86_64.rpm -RUN yum install -y systemsim-p8-1.0-2.el7.x86_64.rpm -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.el7.x86_64.rpm -RUN yum install -y systemsim-p9-1.0-0.el7.x86_64.rpm +RUN if [ `arch` == "x86_64" ]; then wget https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz; tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz; fi +RUN if [ `arch` == "ppc64le" ]; then wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/ppc64le/4.9.4/ppc64le-gcc-4.9.4-nolibc-powerpc64-linux.tar.xz; tar -C /opt/cross -xf ppc64le-gcc-4.9.4-nolibc-powerpc64-linux.tar.xz; fi +RUN if [ `arch` == "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8-1.0-2.el7.x86_64.rpm; yum install -y systemsim-p8-1.0-2.el7.x86_64.rpm; fi +RUN if [ `arch` == "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.el7.x86_64.rpm; yum install -y systemsim-p9-1.0-0.el7.x86_64.rpm; fi RUN yum install -y flex bison RUN curl -L https://github.com/dgibson/dtc/archive/v1.4.2.tar.gz|tar xfz - RUN (cd dtc-1.4.2; make PREFIX=/usr/local install) diff --git a/opal-ci/Dockerfile-debian-stretch b/opal-ci/Dockerfile-debian-stretch index 780f92b2d2a3..9478a45bf594 100644 --- a/opal-ci/Dockerfile-debian-stretch +++ b/opal-ci/Dockerfile-debian-stretch @@ -1,13 +1,9 @@ FROM debian:stretch RUN apt-get update -qq -RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect libssl-dev -RUN apt-get install -y wget xterm curl device-tree-compiler -RUN apt-get install -y gcc-arm-linux-gnueabi -RUN apt-get install -y libtcl8.6 -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb -RUN dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb -RUN apt-get -y install eatmydata -RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind +RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi +RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget xterm curl device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 +RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true +RUN if [ `arch` == "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb; fi COPY . /build/ WORKDIR /build ENTRYPOINT ./opal-ci/build-ubuntu-16.04.sh diff --git a/opal-ci/Dockerfile-debian-unstable b/opal-ci/Dockerfile-debian-unstable index ab4c81b4ba2a..4c2145f98ca5 100644 --- a/opal-ci/Dockerfile-debian-unstable +++ b/opal-ci/Dockerfile-debian-unstable @@ -1,15 +1,10 @@ FROM debian:unstable RUN apt-get update -qq -RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect libssl-dev -RUN apt-get install -y wget xterm curl device-tree-compiler -RUN apt-get install -y gcc-arm-linux-gnueabi -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb -RUN dpkg -i systemsim-p8_1.0-2_amd64.deb -RUN apt-get install -y libtcl8.6 -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb -RUN dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb -RUN apt-get -y install eatmydata -RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind +RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi +RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget xterm curl device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 +RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true +RUN if [ `arch` == "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi +RUN if [ `arch` == "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb; fi COPY . /build/ WORKDIR /build ENTRYPOINT ./opal-ci/build-ubuntu-16.04.sh diff --git a/opal-ci/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide index 7d2a28de28f5..7413a58e7dc1 100644 --- a/opal-ci/Dockerfile-fedora-rawhide +++ b/opal-ci/Dockerfile-fedora-rawhide @@ -1,7 +1,7 @@ FROM fedora:rawhide RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel RUN dnf -y install gcc-powerpc64-linux-gnu -RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm +RUN if [ `arch` == "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi COPY . /build/ WORKDIR /build ENTRYPOINT ./opal-ci/build-fedora24.sh diff --git a/opal-ci/Dockerfile-fedora26 b/opal-ci/Dockerfile-fedora26 index 78ed3b89d38b..3cb66f33c67c 100644 --- a/opal-ci/Dockerfile-fedora26 +++ b/opal-ci/Dockerfile-fedora26 @@ -1,7 +1,7 @@ FROM fedora:26 RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel RUN dnf -y install gcc-powerpc64-linux-gnu -RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm +RUN if [ `arch` == "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi COPY . /build/ WORKDIR /build ENTRYPOINT ./opal-ci/build-fedora24.sh diff --git a/opal-ci/Dockerfile-fedora27 b/opal-ci/Dockerfile-fedora27 index c166213b287a..770220bc9db0 100644 --- a/opal-ci/Dockerfile-fedora27 +++ b/opal-ci/Dockerfile-fedora27 @@ -1,7 +1,7 @@ FROM fedora:27 RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel RUN dnf -y install gcc-powerpc64-linux-gnu -RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm +RUN if [ `arch` == "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi COPY . /build/ WORKDIR /build ENTRYPOINT ./opal-ci/build-fedora24.sh diff --git a/opal-ci/Dockerfile-ubuntu-12.04 b/opal-ci/Dockerfile-ubuntu-12.04 index 64731879e5db..beaa71308470 100644 --- a/opal-ci/Dockerfile-ubuntu-12.04 +++ b/opal-ci/Dockerfile-ubuntu-12.04 @@ -3,20 +3,15 @@ RUN sudo apt-get update -qq RUN sudo apt-get install -y software-properties-common RUN sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test RUN sudo apt-get update -qq -RUN sudo apt-get install -y gcc-4.8 libstdc++6 valgrind expect xterm ccache expect device-tree-compiler libssl-dev -RUN sudo apt-get install -y gcc-arm-linux-gnueabi gcc-powerpc64le-linux-gnu gcc +RUN sudo apt-get install -y gcc-4.8 libstdc++6 valgrind expect xterm ccache expect device-tree-compiler libssl-dev gcc wget curl build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 libtcl8.6 +RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true +RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50 -RUN sudo apt-get install -y wget curl RUN curl -L -O https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz RUN sudo mkdir /opt/cross RUN sudo tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb -RUN sudo dpkg -i systemsim-p8_1.0-2_amd64.deb -RUN apt-get install -y libtcl8.6 -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb -RUN sudo dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb -RUN sudo apt-get -y install eatmydata -RUN sudo eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 +RUN if [ `arch` == "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi +RUN if [ `arch` == "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/ WORKDIR /build ENTRYPOINT ./opal-ci/build-ubuntu-12.04.sh diff --git a/opal-ci/Dockerfile-ubuntu-16.04 b/opal-ci/Dockerfile-ubuntu-16.04 index 94d7e3aaa32e..5e6ddac51338 100644 --- a/opal-ci/Dockerfile-ubuntu-16.04 +++ b/opal-ci/Dockerfile-ubuntu-16.04 @@ -1,15 +1,10 @@ FROM ubuntu:16.04 RUN apt-get update -qq -RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect libssl-dev -RUN apt-get install -y wget curl xterm device-tree-compiler -RUN apt-get install -y gcc-arm-linux-gnueabi -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb -RUN dpkg -i systemsim-p8_1.0-2_amd64.deb -RUN apt-get install -y libtcl8.6 -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb -RUN dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb -RUN apt-get -y install eatmydata -RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind +RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi +RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 +RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true +RUN if [ `arch` == "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi +RUN if [ `arch` == "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/ WORKDIR /build ENTRYPOINT ./opal-ci/build-ubuntu-16.04.sh diff --git a/opal-ci/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest index 6fc2312d60ce..5cb62ce938ce 100644 --- a/opal-ci/Dockerfile-ubuntu-latest +++ b/opal-ci/Dockerfile-ubuntu-latest @@ -1,15 +1,10 @@ FROM ubuntu:latest RUN apt-get update -qq -RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect libssl-dev -RUN apt-get install -y wget xterm curl device-tree-compiler -RUN apt-get install -y gcc-arm-linux-gnueabi -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb -RUN dpkg -i systemsim-p8_1.0-2_amd64.deb -RUN apt-get install -y libtcl8.6 -RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb -RUN dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb -RUN apt-get -y install eatmydata -RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind +RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi +RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 +RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true +RUN if [ `arch` == "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi +RUN if [ `arch` == "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/ WORKDIR /build ENTRYPOINT ./opal-ci/build-ubuntu-16.04.sh diff --git a/opal-ci/build-centos7.sh b/opal-ci/build-centos7.sh index f51222f32743..b1234b37eec2 100755 --- a/opal-ci/build-centos7.sh +++ b/opal-ci/build-centos7.sh @@ -7,8 +7,13 @@ set -vx # We're limited as to what we want to bother to run on CentOS7 # It's fairly old and some of the things (e.g. build+run qemu) we don't # want to bother doing. - -export CROSS=/opt/cross/gcc-4.8.0-nolibc/powerpc64-linux/bin/powerpc64-linux- +if [ `arch` == "x86_64" ]; then + export CROSS=/opt/cross/gcc-4.8.0-nolibc/powerpc64-linux/bin/powerpc64-linux- +fi +# Note that this doesn't work on centos7 because "/lib64/ld64.so.2: version `GLIBC_2.22' not found" +if [ `arch` == "ppc64le" ]; then + export CROSS=/opt/cross/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- +fi MAKE_J=`grep -c processor /proc/cpuinfo` diff --git a/opal-ci/build-ubuntu-16.04.sh b/opal-ci/build-ubuntu-16.04.sh index 71781e41061e..989b7480165a 100755 --- a/opal-ci/build-ubuntu-16.04.sh +++ b/opal-ci/build-ubuntu-16.04.sh @@ -13,7 +13,15 @@ make -j${MAKE_J} all ./opal-ci/fetch-debian-jessie-installer.sh make -j${MAKE_J} check (make clean; cd external/gard && CROSS= make -j${MAKE_J}) -(cd external/pflash; ./build-all-arch.sh) +# because some ppc64le versions don't have arm cross compiler +if which arm-linux-gnueabi-gcc; then + ( cd external/pflash; + echo "Building for ARM..." + make clean && make distclean + CROSS_COMPILE=arm-linux-gnueabi- make || { echo "ARM build failed"; exit 1; } + ) +fi +(cd external/pflash; make clean && make distclean && make) make clean SKIBOOT_GCOV=1 make -j${MAKE_J} SKIBOOT_GCOV=1 make -j${MAKE_J} check