From 65c1a48cbdb534213847abc7e90ca0a79ca3a4af Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 22 Jul 2022 11:42:01 -0400 Subject: [PATCH] Update K32W in vscode image to matck K32W dockerfile (#21112) * Update K32W in vscode image to matck K32W dockerfile * Update path to be k32w_named. This matches #21063 --- integrations/docker/images/chip-build-vscode/Dockerfile | 4 +++- integrations/docker/images/chip-build/version | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile index 77f18352c61337..394adea2e19aa3 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/chip-build-vscode/Dockerfile @@ -41,6 +41,8 @@ COPY --from=crosscompile /opt/ubuntu-21.04-aarch64-sysroot /opt/ubuntu-21.04-aar COPY --from=ameba /opt/ameba /opt/ameba +COPY --from=k32w /opt/sdk /opt/k32w_sdk + COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland COPY --from=ti /opt/ti/sysconfig_1.11.0 /opt/ti/sysconfig_1.11.0 @@ -73,7 +75,7 @@ ENV IDF_PATH=/opt/espressif/esp-idf/ ENV IDF_TOOLS_PATH=/opt/espressif/tools ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/5.10-hardknott/ ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools -ENV NXP_K32W061_SDK_ROOT=/opt/sdk/sdks +ENV NXP_K32W0_SDK_ROOT=/opt/k32w_sdk ENV OPENOCD_PATH=/opt/openocd/ ENV PW_ENVIRONMENT_ROOT=/home/vscode/pigweed/env ENV QEMU_ESP32=/opt/espressif/qemu/xtensa-softmmu/qemu-system-xtensa diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 94753f8cd3f74a..7a3b5745b791b0 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.5.88 Version bump reason: Update Telink Docker +0.5.89 Version bump reason: match K32W sdk paths and logic with K32W Dockerfile