From a87da9171924fea859b55be0d8327dfcdc644d18 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 6 Apr 2023 02:34:20 +0200 Subject: [PATCH] util/docker/jenkins-node: Drop Zephyr SDK The version of the Zephyr SDK that is used is quite old and Zephyr hasn't been really used. Thus, drop it and also its dependencies from u-boot. Change-Id: Ie498d687e1566133adf650166117d8f68fcfdaf6 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/73979 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier Reviewed-by: Patrick Georgi --- util/docker/coreboot-jenkins-node/Dockerfile | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index 7ab703c68e..37537cccf9 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -13,12 +13,6 @@ # 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}} USER root @@ -83,18 +77,6 @@ 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 - -# Build U-boot tools needed by zephyr -RUN mkdir /tmp/b && cd /tmp/b && \ - git clone https://git.kernel.org/pub/scm/utils/dtc/dtc.git dtc && \ - git clone https://chromium.googlesource.com/chromiumos/third_party/u-boot -b chromeos-v2020.10-rc1 u-boot && \ - (cd dtc && make install_pylibfdt PREFIX=/usr/local) && \ - (cd u-boot/tools/dtoc && python3 setup.py install) && \ - (cd u-boot/tools/patman && python3 setup.py install) && \ - (cd u-boot/tools/binman && python3 setup.py install) && \ - cd / && rm -rf /tmp/b - VOLUME /data/cache ENTRYPOINT mount /cb-build && \ mount /home/coreboot/node-root/workspace && \