File tree 3 files changed +12
-11
lines changed
integrations/docker/images
stage-2/chip-build-nxp-zephyr
3 files changed +12
-11
lines changed Original file line number Diff line number Diff line change 33
33
required : false
34
34
type : boolean
35
35
default : false
36
-
36
+
37
37
jobs :
38
38
build_images_base :
39
39
name : Build Docker CHIP Build images - base
@@ -102,6 +102,7 @@ jobs:
102
102
# - "-imx"
103
103
- " -java"
104
104
- " -nxp"
105
+ - " -nxp-zephyr"
105
106
- " -nrf-platform"
106
107
- " -telink"
107
108
- " -ti"
@@ -120,7 +121,7 @@ jobs:
120
121
run : |
121
122
cd integrations/docker/images/stage-2/chip-build${{ matrix.img }}
122
123
./build.sh --latest
123
-
124
+
124
125
build_images_stage_3 :
125
126
needs : [build_images_base, build_images_stage_1, build_images_stage_2]
126
127
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 \
10
10
11
11
WORKDIR /opt/nxp-zephyr
12
12
RUN 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 \
17
17
&& 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 \
19
19
&& cd zephyrproject \
20
20
&& west update -o=--depth=1 -n \
21
21
&& west zephyr-export \
22
22
&& : # last line
23
23
24
24
FROM ghcr.io/project-chip/chip-build:${VERSION}
25
25
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 /
27
27
COPY --from=build /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/
28
28
29
29
WORKDIR /opt/nxp-zephyr
30
30
31
31
ENV 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
48
48
49
49
COPY --from=nxp /opt/nxp /opt/nxp
50
50
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 /
52
52
COPY --from=nxpzephyr /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/
53
53
54
54
COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
@@ -131,7 +131,7 @@ ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
131
131
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.5
132
132
ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
133
133
ENV 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
135
135
ENV NXP_UPDATE_SDK_SCRIPT_DOCKER=/opt/nxp/nxp_matter_support/scripts/update_nxp_sdk.py
136
136
ENV NXP_SDK_PATH=/opt/nxp
137
137
You can’t perform that action at this time.
0 commit comments