diff options
| author | Vasant Hegde <hegdevasant@linux.vnet.ibm.com> | 2020-06-10 15:22:17 +0530 |
|---|---|---|
| committer | Oliver O'Halloran <oohall@gmail.com> | 2020-06-11 10:25:24 +1000 |
| commit | e126deb2de831d559c49a8c3b0f4edd1b1291bb0 (patch) | |
| tree | dcb2f9f26bca14535f965e23acdfed310537687d /opal-ci | |
| parent | 00eab15c40ecf4472693d973b16bde64c3f2a7f7 (diff) | |
| download | skiboot-e126deb2de831d559c49a8c3b0f4edd1b1291bb0.zip skiboot-e126deb2de831d559c49a8c3b0f4edd1b1291bb0.tar.gz skiboot-e126deb2de831d559c49a8c3b0f4edd1b1291bb0.tar.bz2 | |
opal-ci: Add Ubuntu20.04 support
And drop Ubuntu 16.04.
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Reviewed-by: Dan Horák <dan@danny.cz>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Diffstat (limited to 'opal-ci')
| -rw-r--r-- | opal-ci/Dockerfile-ubuntu-20.04 (renamed from opal-ci/Dockerfile-ubuntu-16.04) | 6 | ||||
| -rwxr-xr-x | opal-ci/build-ubuntu-20.04.sh (renamed from opal-ci/build-ubuntu-16.04.sh) | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/opal-ci/Dockerfile-ubuntu-16.04 b/opal-ci/Dockerfile-ubuntu-20.04 index c53bf03..2770951 100644 --- a/opal-ci/Dockerfile-ubuntu-16.04 +++ b/opal-ci/Dockerfile-ubuntu-20.04 @@ -1,11 +1,9 @@ -FROM ubuntu:16.04 +FROM ubuntu:20.04 ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -qq 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 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 -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 - diff --git a/opal-ci/build-ubuntu-16.04.sh b/opal-ci/build-ubuntu-20.04.sh index 39fb3f1..48eb825 100755 --- a/opal-ci/build-ubuntu-16.04.sh +++ b/opal-ci/build-ubuntu-20.04.sh @@ -9,8 +9,6 @@ MAKE_J=$(grep -c processor /proc/cpuinfo) export CROSS="ccache powerpc64le-linux-gnu-" make -j${MAKE_J} all -(cd opal-ci; ./build-qemu-powernv.sh) -export QEMU_BIN=$(pwd)/opal-ci/qemu/ppc64-softmmu/qemu-system-ppc64 make -j${MAKE_J} check (make clean; cd external/gard && CROSS= make -j${MAKE_J}) # because some ppc64le versions don't have arm cross compiler |