From dd5fe14759635b1bb4cacde77df79233d65dbadc Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 27 Jan 2021 13:20:43 +0100 Subject: docker/coreboot-jenkins-node: Add zephyr-sdk toolchain There are efforts to replace Chrome EC with Zephyr. To ensure Chromebook specific Zephyr developments (that can eventually be built as part of a coreboot build just like Chrome EC now, and are built with coreboot-sdk) don't break with Zephyr's toolchain, add the toolchain to our builders so we can do some sanity checking. Change-Id: I645a298bc350ebe7651c08aea630bdc6b93856aa Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/49986 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- util/docker/coreboot-jenkins-node/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'util') diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index 9449c05bdd..ea7e39a688 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -13,6 +13,12 @@ # Because we're piping the contents of the dockerfile into the # docker build command, the 'COPY' keyword isn't valid. +FROM coreboot/coreboot-sdk:{{SDK_VERSION}} AS zephyr-sdk +USER root +RUN wget -O zephyr.run https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.11.3/zephyr-sdk-0.11.3-setup.run +RUN chmod +x ./zephyr.run +RUN ./zephyr.run -- -d /opt/zephyr-sdk + FROM coreboot/coreboot-sdk:{{SDK_VERSION}} MAINTAINER Martin Roth USER root @@ -52,6 +58,8 @@ RUN gcc -o /usr/sbin/encapsulate /tmp/encapsulate.c && \ chown root /usr/sbin/encapsulate && \ chmod +s /usr/sbin/encapsulate +COPY --from=zephyr-sdk /opt/zephyr-sdk /opt/zephyr-sdk + VOLUME /data/cache ENTRYPOINT mount /cb-build && \ mount /home/coreboot/node-root/workspace && \ -- cgit v1.2.3