Skip to content

Commit dccfe12

Browse files
authored
Merge branch 'master' into dependabot/submodules/third_party/imgui/repo-4819eae
2 parents 88285a2 + 4e3f1cd commit dccfe12

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
119 : [vscode/java/android] Install JDK 11 in vscode image (java path already set to it)
1+
120 : [NXP] Update NXP sdk version

integrations/docker/images/stage-2/chip-build-nxp/Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ RUN set -x \
1010

1111
WORKDIR /opt/nxp/
1212

13-
ARG NXP_SDK_EXAMPLE_PATH=nxp_matter_support/github_sdk/common_sdk/repo/examples
13+
ARG NXP_SDK_EXAMPLE_PATH=nxp_matter_support/github_sdk/sdk_next/repo/mcuxsdk/examples
1414

1515
RUN set -x \
16-
&& git clone --branch matter-sdk-2.16.100-support https://github.com/NXP/nxp_matter_support.git \
16+
&& git clone --branch release/v1.4.0.1 https://github.com/NXP/nxp_matter_support.git \
1717
&& pip3 install --break-system-packages -U --no-cache-dir west \
1818
&& ./nxp_matter_support/scripts/update_nxp_sdk.py \
1919
&& cd $NXP_SDK_EXAMPLE_PATH \
20-
&& find . -maxdepth 1 -mindepth 1 -type d ! -name '.*' -a ! -name '*rt1170*' -a ! -name '*rt1060*' -a ! -name '*rw612*' -a ! -name '*k32w*' -a ! -name '*mcxw*' -exec rm -rf {} + `# Remove unused folder to reduce image size` \
2120
&& : # last line
2221

2322
FROM ghcr.io/project-chip/chip-build:${VERSION}

0 commit comments

Comments
 (0)