Add TIZEN_SDK_SYSROOT to vscode dockerfile (#18262)

project-chip · Jun 23, 2023 · 2997777 · 2997777
1 parent afce544
commit 2997777
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -57,24 +57,26 @@ RUN set -x \
     && chmod -R a+w /opt/android/sdk/licenses \
     && : # last line
 
+ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA
+ENV ANDROID_HOME=/opt/android/sdk
+ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r21b
+ENV CY_TOOLS_PATHS="/opt/ModusToolbox/tools_2.4"
+ENV EFR32_BOARD=BRD4161A
 ENV IDF_PATH=/opt/espressif/esp-idf/
 ENV IDF_TOOLS_PATH=/opt/espressif/tools
-ENV QEMU_ESP32_DIR=/opt/espressif/qemu
-ENV QEMU_ESP32=/opt/espressif/qemu/xtensa-softmmu/qemu-system-xtensa
+ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/5.10-hardknott/
 ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
-ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
-ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
-ENV EFR32_BOARD=BRD4161A
-ENV ANDROID_HOME=/opt/android/sdk
-ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r21b
+ENV NXP_K32W061_SDK_ROOT=/opt/sdk/sdks
 ENV OPENOCD_PATH=/opt/openocd/
 ENV PW_ENVIRONMENT_ROOT=/home/vscode/pigweed/env
+ENV QEMU_ESP32=/opt/espressif/qemu/xtensa-softmmu/qemu-system-xtensa
+ENV QEMU_ESP32_DIR=/opt/espressif/qemu
+ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot
 ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
 ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.13.2
-ENV CY_TOOLS_PATHS="/opt/ModusToolbox/tools_2.4"
-ENV TIZEN_SDK_ROOT /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
-ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/5.10-hardknott/
 ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.11.0
+ENV TIZEN_SDK_ROOT /opt/tizen-sdk
+ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/rootstraps/mobile-$TIZEN_VERSION-device.core
+ENV TIZEN_VERSION 6.0
+ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
+ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.5.72 Version bump reason: [Ameba] Migrate mbedtls cmake file to Matter SDK
+0.5.73 Version bump reason: Add TIZEN_SDK_SYSROOT to vscode dockerfile and sort env variables
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0.5.72 Version bump reason: [Ameba] Migrate mbedtls cmake file to Matter SDK
		0.5.73 Version bump reason: Add TIZEN_SDK_SYSROOT to vscode dockerfile and sort env variables