aboutsummaryrefslogtreecommitdiff
path: root/opal-ci
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.vnet.ibm.com>2017-02-10 13:12:51 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2017-02-16 15:22:30 +1100
commit2ca064df7da39ad5009b46e1ddeddabf8ff17a08 (patch)
tree8e5aadeb08d981517aca19c60f15e5eeb8e41074 /opal-ci
parent0e386883f797ee6fd7023ba24329cb115014973b (diff)
downloadskiboot-2ca064df7da39ad5009b46e1ddeddabf8ff17a08.zip
skiboot-2ca064df7da39ad5009b46e1ddeddabf8ff17a08.tar.gz
skiboot-2ca064df7da39ad5009b46e1ddeddabf8ff17a08.tar.bz2
hdata_to_dt: Only output dtb
convert test cases to diff DTS rather than DTB. This means we also have to build dtc on CentOS 7 to be able to run the test suite. Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com> [oohall@gmail.com moved the test cases into seperate patches] Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'opal-ci')
-rw-r--r--opal-ci/Dockerfile-centos62
-rw-r--r--opal-ci/Dockerfile-centos75
-rw-r--r--opal-ci/Dockerfile-fedora-rawhide2
-rw-r--r--opal-ci/Dockerfile-fedora242
-rw-r--r--opal-ci/Dockerfile-fedora252
-rw-r--r--opal-ci/Dockerfile-ubuntu-12.042
-rw-r--r--opal-ci/Dockerfile-ubuntu-16.042
-rw-r--r--opal-ci/Dockerfile-ubuntu-latest2
8 files changed, 11 insertions, 8 deletions
diff --git a/opal-ci/Dockerfile-centos6 b/opal-ci/Dockerfile-centos6
index 6fa069c..162b32b 100644
--- a/opal-ci/Dockerfile-centos6
+++ b/opal-ci/Dockerfile-centos6
@@ -1,6 +1,6 @@
FROM centos:6
RUN yum -y update && yum clean all
-RUN yum -y install wget curl xterm gcc git xz ccache
+RUN yum -y install wget curl xterm gcc git xz ccache dtc
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
diff --git a/opal-ci/Dockerfile-centos7 b/opal-ci/Dockerfile-centos7
index 1f4d829..1708a74 100644
--- a/opal-ci/Dockerfile-centos7
+++ b/opal-ci/Dockerfile-centos7
@@ -1,6 +1,6 @@
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
+RUN yum -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc
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
@@ -8,6 +8,9 @@ RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v
RUN yum install -y systemsim-p8-1.0-2.el7.x86_64.rpm
RUN curl -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 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)
COPY . /build/
WORKDIR /build
ENTRYPOINT ./opal-ci/build-centos7.sh
diff --git a/opal-ci/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide
index 2fe4e09..443e409 100644
--- a/opal-ci/Dockerfile-fedora-rawhide
+++ b/opal-ci/Dockerfile-fedora-rawhide
@@ -1,5 +1,5 @@
FROM fedora:rawhide
-RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache
+RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc
RUN dnf -y install gcc-powerpc64-linux-gnu
RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.f22.x86_64.rpm
COPY . /build/
diff --git a/opal-ci/Dockerfile-fedora24 b/opal-ci/Dockerfile-fedora24
index 8110a2d..a120640 100644
--- a/opal-ci/Dockerfile-fedora24
+++ b/opal-ci/Dockerfile-fedora24
@@ -1,5 +1,5 @@
FROM fedora:24
-RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache
+RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc
RUN dnf -y install gcc-powerpc64-linux-gnu
RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.f22.x86_64.rpm
COPY . /build/
diff --git a/opal-ci/Dockerfile-fedora25 b/opal-ci/Dockerfile-fedora25
index eabb6e7..dcc683f 100644
--- a/opal-ci/Dockerfile-fedora25
+++ b/opal-ci/Dockerfile-fedora25
@@ -1,5 +1,5 @@
FROM fedora:25
-RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache
+RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc
RUN dnf -y install gcc-powerpc64-linux-gnu
RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.f22.x86_64.rpm
COPY . /build/
diff --git a/opal-ci/Dockerfile-ubuntu-12.04 b/opal-ci/Dockerfile-ubuntu-12.04
index ee64e92..f38c482 100644
--- a/opal-ci/Dockerfile-ubuntu-12.04
+++ b/opal-ci/Dockerfile-ubuntu-12.04
@@ -3,7 +3,7 @@ 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
+RUN sudo apt-get install -y gcc-4.8 libstdc++6 valgrind expect xterm ccache expect device-tree-compiler
RUN sudo apt-get install -y gcc-arm-linux-gnueabi gcc-powerpc64le-linux-gnu gcc
RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50
RUN sudo apt-get install -y wget curl
diff --git a/opal-ci/Dockerfile-ubuntu-16.04 b/opal-ci/Dockerfile-ubuntu-16.04
index 03cd5c5..11bd1ce 100644
--- a/opal-ci/Dockerfile-ubuntu-16.04
+++ b/opal-ci/Dockerfile-ubuntu-16.04
@@ -1,7 +1,7 @@
FROM ubuntu:16.04
RUN apt-get update -qq
RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect
-RUN apt-get install -y wget curl xterm
+RUN apt-get install -y wget curl xterm device-tree-compiler
RUN apt-get install -y gcc-arm-linux-gnueabi
RUN curl -O ftp://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
diff --git a/opal-ci/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest
index dc9a57f..2b9b038 100644
--- a/opal-ci/Dockerfile-ubuntu-latest
+++ b/opal-ci/Dockerfile-ubuntu-latest
@@ -1,7 +1,7 @@
FROM ubuntu:latest
RUN apt-get update -qq
RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect
-RUN apt-get install -y wget xterm curl
+RUN apt-get install -y wget xterm curl device-tree-compiler
RUN apt-get install -y gcc-arm-linux-gnueabi
RUN curl -O ftp://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