diff options
author | Oliver O'Halloran <oohall@gmail.com> | 2020-10-01 14:19:07 +1000 |
---|---|---|
committer | Oliver O'Halloran <oohall@gmail.com> | 2020-10-01 14:19:09 +1000 |
commit | bcecf330f4f18893fbeca697de104258d071da51 (patch) | |
tree | 939bb68f23d615cdb3094327a795d6669458864d | |
parent | 6d6adea3e8daffeb3afa9fa3eb97fda0926e9169 (diff) | |
download | skiboot-bcecf330f4f18893fbeca697de104258d071da51.zip skiboot-bcecf330f4f18893fbeca697de104258d071da51.tar.gz skiboot-bcecf330f4f18893fbeca697de104258d071da51.tar.bz2 |
ci: Add mbedtls development files as a dependency
Needed for the secvar unit tests.
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
-rw-r--r-- | README.md | 5 | ||||
-rw-r--r-- | opal-ci/Dockerfile-centos7 | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-debian-stretch | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-debian-unstable | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-fedora-rawhide | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-fedora32 | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-ubuntu-18.04 | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-ubuntu-20.04 | 2 | ||||
-rw-r--r-- | opal-ci/Dockerfile-ubuntu-latest | 2 |
9 files changed, 11 insertions, 10 deletions
@@ -56,14 +56,15 @@ To build on Ubuntu: ``` apt-get install gcc-powerpc64le-linux-gnu gcc valgrind \ expect libssl-dev device-tree-compiler make \ - xz-utils + xz-utils libmbedtls-dev CROSS=powerpc64le-linux-gnu- make -j`nproc` ``` To build on Fedora: ``` dnf install gcc-powerpc64le-linux-gnu binutils-powerpc64-linux-gnu gcc make \ - diffutils findutils expect valgrind-devel dtc openssl-devel xz + diffutils findutils expect valgrind-devel dtc openssl-devel xz \ + mbedtls-devel CROSS=powerpc64le-linux-gnu- make -j`nproc` ``` diff --git a/opal-ci/Dockerfile-centos7 b/opal-ci/Dockerfile-centos7 index 826145e..93a0ede 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 dtc openssl-devel openssl +RUN yum -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel openssl mbedtls-devel RUN mkdir /opt/cross RUN if [ `arch` = "x86_64" ]; then wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.1.0/x86_64-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; tar -C /opt/cross -xf x86_64-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; fi RUN if [ `arch` = "ppc64le" ]; then wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/ppc64le/8.1.0/ppc64le-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; tar -C /opt/cross -xf ppc64le-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; fi diff --git a/opal-ci/Dockerfile-debian-stretch b/opal-ci/Dockerfile-debian-stretch index f9e4ae2..9c2c15a 100644 --- a/opal-ci/Dockerfile-debian-stretch +++ b/opal-ci/Dockerfile-debian-stretch @@ -2,7 +2,7 @@ FROM debian:stretch 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 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 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 libmbedtls-dev 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/ diff --git a/opal-ci/Dockerfile-debian-unstable b/opal-ci/Dockerfile-debian-unstable index 13c157f..eaf29a8 100644 --- a/opal-ci/Dockerfile-debian-unstable +++ b/opal-ci/Dockerfile-debian-unstable @@ -5,7 +5,7 @@ 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 qemu-system-ppc opal-utils + libtcl8.6 qemu-system-ppc opal-utils libmbedtls-dev 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/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide index 7108ade..cc652fd 100644 --- a/opal-ci/Dockerfile-fedora-rawhide +++ b/opal-ci/Dockerfile-fedora-rawhide @@ -1,6 +1,6 @@ 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 gcc-powerpc64-linux-gnu mbedtls-devel # below packages are for building dtc 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 diff --git a/opal-ci/Dockerfile-fedora32 b/opal-ci/Dockerfile-fedora32 index 9238027..1fdcdc5 100644 --- a/opal-ci/Dockerfile-fedora32 +++ b/opal-ci/Dockerfile-fedora32 @@ -1,6 +1,6 @@ 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 +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 mbedtls-devel # for building documentation and the coverage report RUN dnf -y install python-pip lcov # below packages are for building dtc diff --git a/opal-ci/Dockerfile-ubuntu-18.04 b/opal-ci/Dockerfile-ubuntu-18.04 index 3a031c3..82fa21c 100644 --- a/opal-ci/Dockerfile-ubuntu-18.04 +++ b/opal-ci/Dockerfile-ubuntu-18.04 @@ -2,7 +2,7 @@ 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-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 qemu-system-ppc +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 qemu-system-ppc libmbedtls-dev 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/Dockerfile-ubuntu-20.04 b/opal-ci/Dockerfile-ubuntu-20.04 index 515ec5c..43fd151 100644 --- a/opal-ci/Dockerfile-ubuntu-20.04 +++ b/opal-ci/Dockerfile-ubuntu-20.04 @@ -3,7 +3,7 @@ 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-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 qemu-system-ppc +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 qemu-system-ppc libmbedtls-dev 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/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest index 577d7a4..b89fde5 100644 --- a/opal-ci/Dockerfile-ubuntu-latest +++ b/opal-ci/Dockerfile-ubuntu-latest @@ -2,7 +2,7 @@ FROM ubuntu:rolling 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 qemu-system-ppc +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 qemu-system-ppc libmbedtls-dev RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true 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/ |