File tree Expand file tree Collapse file tree 3 files changed +12
-11
lines changed
integrations/docker/images
stage-2/chip-build-nxp-zephyr Expand file tree Collapse file tree 3 files changed +12
-11
lines changed Original file line number Diff line number Diff line change 3333 required : false
3434 type : boolean
3535 default : false
36-
36+
3737jobs :
3838 build_images_base :
3939 name : Build Docker CHIP Build images - base
@@ -102,6 +102,7 @@ jobs:
102102 # - "-imx"
103103 - " -java"
104104 - " -nxp"
105+ - " -nxp-zephyr"
105106 - " -nrf-platform"
106107 - " -telink"
107108 - " -ti"
@@ -120,7 +121,7 @@ jobs:
120121 run : |
121122 cd integrations/docker/images/stage-2/chip-build${{ matrix.img }}
122123 ./build.sh --latest
123-
124+
124125 build_images_stage_3 :
125126 needs : [build_images_base, build_images_stage_1, build_images_stage_2]
126127 name : Build Docker CHIP Build images - stage 3
Original file line number Diff line number Diff line change @@ -10,23 +10,23 @@ RUN set -x \
1010
1111WORKDIR /opt/nxp-zephyr
1212RUN set -x \
13- && wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8 /zephyr-sdk-0.16.8_linux -x86_64_minimal.tar.xz \
14- && tar xvf zephyr-sdk-0.16.8_linux -x86_64_minimal.tar.xz \
15- && rm -rf zephyr-sdk-0.16.8_linux -x86_64_minimal.tar.xz \
16- && zephyr-sdk-0.16.8 /setup.sh -t arm-zephyr-eabi \
13+ && wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0 /zephyr-sdk-0.17.0_linux -x86_64_minimal.tar.xz \
14+ && tar xvf zephyr-sdk-0.17.0_linux -x86_64_minimal.tar.xz \
15+ && rm -rf zephyr-sdk-0.17.0_linux -x86_64_minimal.tar.xz \
16+ && zephyr-sdk-0.17.0 /setup.sh -t arm-zephyr-eabi \
1717 && pip3 install --break-system-packages -U --no-cache-dir west \
18- && west init zephyrproject -m https://github.com/nxp-zephyr/nxp-zsdk.git --mr nxp-v3.7 .0 \
18+ && west init zephyrproject -m https://github.com/nxp-zephyr/nxp-zsdk.git --mr nxp-v4.0 .0 \
1919 && cd zephyrproject \
2020 && west update -o=--depth=1 -n \
2121 && west zephyr-export \
2222 && : # last line
2323
2424FROM ghcr.io/project-chip/chip-build:${VERSION}
2525
26- COPY --from=build /opt/nxp-zephyr/zephyr-sdk-0.16.8 / /opt/nxp-zephyr/zephyr-sdk-0.16.8 /
26+ COPY --from=build /opt/nxp-zephyr/zephyr-sdk-0.17.0 / /opt/nxp-zephyr/zephyr-sdk-0.17.0 /
2727COPY --from=build /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/
2828
2929WORKDIR /opt/nxp-zephyr
3030
3131ENV ZEPHYR_NXP_BASE=/opt/nxp-zephyr/zephyrproject/zephyr
32- ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.8
32+ ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.17.0
Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ COPY --from=ameba /opt/ameba /opt/ameba
4848
4949COPY --from=nxp /opt/nxp /opt/nxp
5050
51- COPY --from=nxpzephyr /opt/nxp-zephyr/zephyr-sdk-0.16.8 / /opt/nxp-zephyr/zephyr-sdk-0.16.8 /
51+ COPY --from=nxpzephyr /opt/nxp-zephyr/zephyr-sdk-0.17.0 / /opt/nxp-zephyr/zephyr-sdk-0.17.0 /
5252COPY --from=nxpzephyr /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/
5353
5454COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
@@ -131,7 +131,7 @@ ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
131131ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.5
132132ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
133133ENV ZEPHYR_NXP_BASE=/opt/nxp-zephyr/zephyrproject/zephyr
134- ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.8
134+ ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.17.0
135135ENV NXP_UPDATE_SDK_SCRIPT_DOCKER=/opt/nxp/nxp_matter_support/scripts/update_nxp_sdk.py
136136ENV NXP_SDK_PATH=/opt/nxp
137137
You can’t perform that action at this time.
0 commit comments