@@ -43,7 +43,8 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q
4343 nodejs \
4444 npm \
4545 unzip \
46- zip
46+ zip \
47+ python3
4748
4849RUN mkdir -p /tools
4950WORKDIR /tools
@@ -67,8 +68,10 @@ RUN cd nuttx-tools/kconfig-frontends \
6768RUN mkdir -p /tools/gn \
6869 && cd /tools/gn \
6970 && git clone https://gn.googlesource.com/gn gn \
70- && cd gn && ./build/gen.py \
71- && cd out && ninja
71+ && cd gn \
72+ && git checkout 5d0a4153b0bcc86c5a23310d5b648a587be3c56d \
73+ && python3 build/gen.py \
74+ && ninja -C out
7275
7376# Upgrade nodejs to the stable version we need before install zap
7477RUN npm install -g n && n 20.10.0 node && hash -r
@@ -302,6 +305,15 @@ RUN mkdir -p pico-sdk && \
302305 curl -s -L "https://github.com/raspberrypi/pico-sdk/releases/download/2.2.0/pico-sdk-2.2.0.tar.gz" \
303306 | tar -C pico-sdk --strip-components 1 -xz
304307
308+ # ##############################################################################
309+ # Build image for tool required by Raspberry Pi picotool builds
310+ # ##############################################################################
311+ FROM nuttx-toolchain-base AS nuttx-toolchain-raspberrypi-picotool
312+ # Download the prebuilt Raspberry Pi picotool
313+ RUN mkdir -p picotool && \
314+ curl -s -L "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-0/picotool-2.2.0-x86_64-lin.tar.gz" \
315+ | tar -C picotool --strip-components 1 -xz
316+
305317# ##############################################################################
306318# Final Docker image used for running CI system. This includes all toolchains
307319# supported by the CI system.
@@ -493,6 +505,10 @@ COPY --from=nuttx-toolchain-esp32 /tools/blobs/* /tools/blobs/esp-bins/
493505COPY --from=nuttx-toolchain-raspberrypi-pico-sdk /tools/pico-sdk/ pico-sdk/
494506ENV PICO_SDK_PATH="/tools/pico-sdk"
495507
508+ # Raspberry Pi picotool
509+ COPY --from=nuttx-toolchain-raspberrypi-picotool /tools/picotool/ picotool/
510+ ENV PATH="/tools/picotool:$PATH"
511+
496512# gn tool
497513RUN mkdir -p /tools/gn
498514COPY --from=nuttx-tools /tools/gn/gn/out/gn /tools/gn
0 commit comments