From 2be9877673289d2577d0d13afe1e3e2adb1e4677 Mon Sep 17 00:00:00 2001 From: Axel Le Bourhis <45206070+axelnxp@users.noreply.github.com> Date: Fri, 6 Dec 2024 18:50:29 +0100 Subject: [PATCH] [NXP] Update NXP Zephyr Docker image for nxp-zsdk v4.0.0 migration (#36748) * [NXP] Update NXP Zephyr Docker image for nxp-zsdk v4.0.0 migration Signed-off-by: Axel Le Bourhis * [NXP] docker_img: add nxp-zephyr Docker build check The `nxp-zephyr` docker image is very different from `nxp` and should be checked too. Signed-off-by: Axel Le Bourhis --------- Signed-off-by: Axel Le Bourhis --- .github/workflows/docker_img.yaml | 5 +++-- .../stage-2/chip-build-nxp-zephyr/Dockerfile | 14 +++++++------- .../images/vscode/chip-build-vscode/Dockerfile | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml index 8921a55cb2b9e0..663f9e037bb8fe 100644 --- a/.github/workflows/docker_img.yaml +++ b/.github/workflows/docker_img.yaml @@ -33,7 +33,7 @@ on: required: false type: boolean default: false - + jobs: build_images_base: name: Build Docker CHIP Build images - base @@ -102,6 +102,7 @@ jobs: # - "-imx" - "-java" - "-nxp" + - "-nxp-zephyr" - "-nrf-platform" - "-telink" - "-ti" @@ -120,7 +121,7 @@ jobs: run: | cd integrations/docker/images/stage-2/chip-build${{ matrix.img }} ./build.sh --latest - + build_images_stage_3: needs: [build_images_base, build_images_stage_1, build_images_stage_2] name: Build Docker CHIP Build images - stage 3 diff --git a/integrations/docker/images/stage-2/chip-build-nxp-zephyr/Dockerfile b/integrations/docker/images/stage-2/chip-build-nxp-zephyr/Dockerfile index 09d55415760c06..b19d132e722ea0 100644 --- a/integrations/docker/images/stage-2/chip-build-nxp-zephyr/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-nxp-zephyr/Dockerfile @@ -10,12 +10,12 @@ RUN set -x \ WORKDIR /opt/nxp-zephyr RUN set -x \ - && wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.8/zephyr-sdk-0.16.8_linux-x86_64_minimal.tar.xz \ - && tar xvf zephyr-sdk-0.16.8_linux-x86_64_minimal.tar.xz \ - && rm -rf zephyr-sdk-0.16.8_linux-x86_64_minimal.tar.xz \ - && zephyr-sdk-0.16.8/setup.sh -t arm-zephyr-eabi \ + && wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \ + && tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \ + && rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \ + && zephyr-sdk-0.17.0/setup.sh -t arm-zephyr-eabi \ && pip3 install --break-system-packages -U --no-cache-dir west \ - && west init zephyrproject -m https://github.com/nxp-zephyr/nxp-zsdk.git --mr nxp-v3.7.0 \ + && west init zephyrproject -m https://github.com/nxp-zephyr/nxp-zsdk.git --mr nxp-v4.0.0 \ && cd zephyrproject \ && west update -o=--depth=1 -n \ && west zephyr-export \ @@ -23,10 +23,10 @@ RUN set -x \ FROM ghcr.io/project-chip/chip-build:${VERSION} -COPY --from=build /opt/nxp-zephyr/zephyr-sdk-0.16.8/ /opt/nxp-zephyr/zephyr-sdk-0.16.8/ +COPY --from=build /opt/nxp-zephyr/zephyr-sdk-0.17.0/ /opt/nxp-zephyr/zephyr-sdk-0.17.0/ COPY --from=build /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/ WORKDIR /opt/nxp-zephyr ENV ZEPHYR_NXP_BASE=/opt/nxp-zephyr/zephyrproject/zephyr -ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.8 +ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.17.0 diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile index dbec645d4c1c45..b550bea7d90eac 100644 --- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile @@ -48,7 +48,7 @@ COPY --from=ameba /opt/ameba /opt/ameba COPY --from=nxp /opt/nxp /opt/nxp -COPY --from=nxpzephyr /opt/nxp-zephyr/zephyr-sdk-0.16.8/ /opt/nxp-zephyr/zephyr-sdk-0.16.8/ +COPY --from=nxpzephyr /opt/nxp-zephyr/zephyr-sdk-0.17.0/ /opt/nxp-zephyr/zephyr-sdk-0.17.0/ COPY --from=nxpzephyr /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/ COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland @@ -131,7 +131,7 @@ ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.5 ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb ENV ZEPHYR_NXP_BASE=/opt/nxp-zephyr/zephyrproject/zephyr -ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.8 +ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.17.0 ENV NXP_UPDATE_SDK_SCRIPT_DOCKER=/opt/nxp/nxp_matter_support/scripts/update_nxp_sdk.py ENV NXP_SDK_PATH=/opt/nxp