[Skiboot] [PATCH] travis: Require Ubuntu 18.04 to pass, fix on ppc64le
Stewart Smith
stewart at linux.ibm.com
Thu May 10 10:58:58 AEST 2018
Signed-off-by: Stewart Smith <stewart at linux.ibm.com>
---
.travis.yml | 1 -
opal-ci/Dockerfile-ubuntu-18.04 | 3 ++-
opal-ci/build-ubuntu-18.04.sh | 13 ++++++++-----
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a8559856921a..53046d09fa4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,6 @@ matrix:
allow_failures:
- env: RUN_ON_CONTAINER=fedora-rawhide
- env: RUN_ON_CONTAINER=debian-unstable
- - env: RUN_ON_CONTAINER=ubuntu-18.04
exclude:
- os: linux-ppc64le
env: RUN_ON_CONTAINER=ubuntu-12.04
diff --git a/opal-ci/Dockerfile-ubuntu-18.04 b/opal-ci/Dockerfile-ubuntu-18.04
index 4c272d37c23f..6e860946c12a 100644
--- a/opal-ci/Dockerfile-ubuntu-18.04
+++ b/opal-ci/Dockerfile-ubuntu-18.04
@@ -1,7 +1,8 @@
FROM ubuntu:18.04
ENV DEBIAN_FRONTEND noninteractive
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 gcc-arm-linux-gnueabi clang qemu-system-ppc
+RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true
+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 clang qemu-system-ppc
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/
diff --git a/opal-ci/build-ubuntu-18.04.sh b/opal-ci/build-ubuntu-18.04.sh
index dc835507a38c..7bcd2d502769 100755
--- a/opal-ci/build-ubuntu-18.04.sh
+++ b/opal-ci/build-ubuntu-18.04.sh
@@ -12,11 +12,14 @@ 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;
- echo "Building for ARM..."
- make clean && make distclean
- CROSS_COMPILE=arm-linux-gnueabi- make || { echo "ARM build failed"; exit 1; }
-)
+# 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}
--
2.14.3
More information about the Skiboot
mailing list