From c6a68c61e3bdef42ba507511540f5d9684c72624 Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Thu, 16 Jan 2025 14:23:00 +0100 Subject: [PATCH] [nrfconnect] Update nRF Connect SDK version in Docker to 2.9.0 (#37082) Regular update of nRF Connect SDK to 2.9.0 version. Signed-off-by: Adrian Gielniewski --- .../docker/images/base/chip-build/version | 2 +- .../chip-build-nrf-platform/Dockerfile | 26 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index f4d7e3663dbc4e..6c4ea451ea0cfc 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -97 : [Telink] Update Docker image (Zephyr update) +98 : [nrfconnect] Update nRF Connect SDK version. diff --git a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile index 57635bdfee1822..9e827c4cd57874 100644 --- a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} as build LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip # Compatible Nordic Connect SDK revision. -ARG NCS_REVISION=v2.7.0 +ARG NCS_REVISION=v2.9.0 # Requirements to clone SDKs in temporary container RUN set -x \ @@ -19,13 +19,14 @@ RUN set -x \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] WORKDIR /opt/NordicSemiconductor/nRF5_tools RUN set -x \ - && curl --location https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-18-1/nrf-command-line-tools-10.18.1_linux-amd64.tar.gz \ + && curl --location https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-24-2/nrf-command-line-tools-10.24.2_linux-amd64.tar.gz \ | tar zxvf - \ - && tar xvf JLink_Linux_V780c_x86_64.tgz \ - && rm JLink_Linux_V780c_x86_64.* \ - && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.5/zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \ - && tar xvf zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \ - && zephyr-sdk-0.16.5/setup.sh -t arm-zephyr-eabi \ + && tar xvf JLink_Linux_V794e_x86_64.tgz \ + && rm JLink_Linux_V794e_x86_64.* \ + && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz --output 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 \ && : # last line WORKDIR /opt/NordicSemiconductor/nrfconnect @@ -55,21 +56,22 @@ COPY --from=build /opt/NordicSemiconductor/nRF5_tools/ /opt/NordicSemiconductor/ COPY --from=build /opt/NordicSemiconductor/nrfconnect/ /opt/NordicSemiconductor/nrfconnect/ RUN set -x \ - # python3-yaml package conflicts with nRF Python requirements - && (apt-get remove -fy python3-yaml && apt-get autoremove || exit 0) \ + # python3-yaml and python3-numpy packages conflict with nRF Python requirements + && (apt-get remove -fy python3-yaml python3-numpy && apt-get autoremove || exit 0) \ && python3 -m pip install --break-system-packages -U --no-cache-dir cmake==3.25.0 \ && python3 -m pip install --break-system-packages --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/zephyr/scripts/requirements-base.txt \ && python3 -m pip install --break-system-packages --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/nrf/scripts/requirements-build.txt \ && python3 -m pip install --break-system-packages --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/bootloader/mcuboot/scripts/requirements.txt \ + && python3 -m pip install --break-system-packages --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/modules/lib/matter/scripts/setup/requirements.nrfconnect.txt \ && : # last line ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools -ENV PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64:${PATH} +ENV PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V794e_x86_64:${PATH} ENV PATH=${NRF5_TOOLS_ROOT}/nrf-command-line-tools/bin:${PATH} -ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64:${LD_LIBRARY_PATH} +ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V794e_x86_64:${LD_LIBRARY_PATH} ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr -ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.5 +ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.17.0 ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr ENV ZEPHYR_TOOLCHAIN_PATH=${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi