UPSTREAM: 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.
(cherry picked from commit a87da9171924fea859b55be0d8327dfcdc644d18)
Original-Change-Id: Ie498d687e1566133adf650166117d8f68fcfdaf6
Original-Signed-off-by: Felix Singer <felixsinger@posteo.net>
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/73979
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Original-Reviewed-by: Patrick Georgi <patrick@coreboot.org>
GitOrigin-RevId: a87da9171924fea859b55be0d8327dfcdc644d18
Change-Id: I93fc0b990e6563d28d8cd48f82713dacfacc56f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/4474860
Tested-by: CopyBot Service Account <copybot.service@gmail.com>
Commit-Queue: Jonathon Murphy <jpmurphy@google.com>
Reviewed-by: Jonathon Murphy <jpmurphy@google.com>
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile
index 7ab703c..37537cc 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 @@
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 && \
