diff options
| author | Vasant Hegde <hegdevasant@linux.vnet.ibm.com> | 2020-06-10 12:44:54 +0530 |
|---|---|---|
| committer | Oliver O'Halloran <oohall@gmail.com> | 2020-06-11 10:25:24 +1000 |
| commit | 00eab15c40ecf4472693d973b16bde64c3f2a7f7 (patch) | |
| tree | b4d2c55c9a214ac524f8e4c7bf7b3329cf9d8f97 /opal-ci | |
| parent | fe70fbb78d33abea788a3221bc409a7c50c019c3 (diff) | |
| download | skiboot-00eab15c40ecf4472693d973b16bde64c3f2a7f7.zip skiboot-00eab15c40ecf4472693d973b16bde64c3f2a7f7.tar.gz skiboot-00eab15c40ecf4472693d973b16bde64c3f2a7f7.tar.bz2 | |
opal-ci: Fix broken fedora builds
- Our device tree test cases are passing with fedora shipped `dtc`
command. Hence remove `dtc` build process.
- Replace fedora30 with fedora32.
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')
| l--------- | opal-ci/Dockerfile-docs | 2 | ||||
| -rw-r--r-- | opal-ci/Dockerfile-fedora32 (renamed from opal-ci/Dockerfile-fedora30) | 3 | ||||
| l--------- | opal-ci/build-fedora-rawhide.sh | 2 | ||||
| -rwxr-xr-x | opal-ci/build-fedora32.sh (renamed from opal-ci/build-fedora30.sh) | 6 |
4 files changed, 3 insertions, 10 deletions
diff --git a/opal-ci/Dockerfile-docs b/opal-ci/Dockerfile-docs index 900b2e8..923955e 120000 --- a/opal-ci/Dockerfile-docs +++ b/opal-ci/Dockerfile-docs @@ -1 +1 @@ -Dockerfile-fedora30
\ No newline at end of file +Dockerfile-fedora32
\ No newline at end of file diff --git a/opal-ci/Dockerfile-fedora30 b/opal-ci/Dockerfile-fedora32 index 17ba79b..5fbf468 100644 --- a/opal-ci/Dockerfile-fedora30 +++ b/opal-ci/Dockerfile-fedora32 @@ -1,4 +1,4 @@ -FROM fedora:30 +FROM fedora:32 RUN dnf -y update RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel gcc-powerpc64-linux-gnu # for building documentation @@ -10,4 +10,3 @@ RUN dnf -y install flex bison 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 - diff --git a/opal-ci/build-fedora-rawhide.sh b/opal-ci/build-fedora-rawhide.sh index 6ea4b3f..329cdbe 120000 --- a/opal-ci/build-fedora-rawhide.sh +++ b/opal-ci/build-fedora-rawhide.sh @@ -1 +1 @@ -build-fedora30.sh
\ No newline at end of file +build-fedora32.sh
\ No newline at end of file diff --git a/opal-ci/build-fedora30.sh b/opal-ci/build-fedora32.sh index e1120b9..9042256 100755 --- a/opal-ci/build-fedora30.sh +++ b/opal-ci/build-fedora32.sh @@ -7,12 +7,6 @@ set -vx MAKE_J=$(grep -c processor /proc/cpuinfo) export CROSS="ccache powerpc64-linux-gnu-" -# There's a bug in dtc v1.4.7 packaged on fedora 28 that makes our device tree -# tests fail, so for the moment, build a slightly older DTC -git clone --depth=1 -b v1.4.4 https://git.kernel.org/pub/scm/utils/dtc/dtc.git -(cd dtc; make -j${MAKE_J}) -export PATH=`pwd`/dtc:$PATH - make -j${MAKE_J} all make -j${MAKE_J} check (make clean; cd external/gard && CROSS= make -j${MAKE_J}) |