From 35a193ac4d59a51d586a9c130bf703932595cae4 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Wed, 8 Dec 2021 16:19:23 -0500 Subject: [PATCH] Add K32W sdks into Vscode image - need to be able to compile everything as developers (#12746) --- integrations/docker/images/chip-build-vscode/Dockerfile | 4 ++++ integrations/docker/images/chip-build/version | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile index 10303e107c48d3..f6b5fb16b1822f 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/chip-build-vscode/Dockerfile @@ -9,6 +9,7 @@ FROM connectedhomeip/chip-build-infineon:${VERSION} AS p6 FROM connectedhomeip/chip-build-tizen:${VERSION} AS tizen FROM connectedhomeip/chip-build-crosscompile:${VERSION} AS crosscompile FROM connectedhomeip/chip-build-ameba:${VERSION} AS ameba +FROM connectedhomeip/chip-build-k32w:${VERSION} AS k32w FROM connectedhomeip/chip-build:${VERSION} # qemu-src copied over because qemu directory contains symlinks to the src @@ -37,6 +38,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/sdks /opt/sdk/sdks + # Android license file "acceping" is done by writing license hashes # into the 'licenses' subfolder. This allows any user (in particular # 'vscode' to accept licenses) @@ -63,3 +66,4 @@ ENV CY_TOOLS_PATHS="/opt/ModusToolbox/tools_2.3" ENV TIZEN_HOME /opt/tizen_sdk ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA +ENV NXP_K32W061_SDK_ROOT=/opt/sdk/sdks diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 28facc1c14b20e..ae93538201aaec 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.5.34 Version bump reason: Reduce size crosscompile image +0.5.35 Add K32W SDKs into chip-build-vscode