From 590900cbf3b4377172834a52b2c940b52ecc095d Mon Sep 17 00:00:00 2001 From: alberk8 Date: Fri, 2 Aug 2024 18:40:15 +0800 Subject: [PATCH] Fix ESP IDF path to fix Dev Container (#2999) ***NO_CI*** --- .devcontainer/All/Dockerfile.All.SRC | 6 ++---- .devcontainer/ESP32/Dockerfile.ESP32.SRC | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.devcontainer/All/Dockerfile.All.SRC b/.devcontainer/All/Dockerfile.All.SRC index ee6bc2f428..3668316598 100644 --- a/.devcontainer/All/Dockerfile.All.SRC +++ b/.devcontainer/All/Dockerfile.All.SRC @@ -132,15 +132,13 @@ ENV ESP_PATCH_VER=esp-13.2.0_20230928 # RUN python -m pip install -r $IDF_PATH/requirements.txt RUN $IDF_PATH/install.sh -ENV PATH=/root/.espressif/python_env/idf5.1_py3.11_env/bin:$PATH:\ +ENV PATH=/root/.espressif/python_env/idf5.2_py3.11_env/bin:$PATH:\ $IDF_PATH/components/esptool_py/esptool:\ $IDF_PATH/components/espcoredump:\ $IDF_PATH/components/partition_table/:\ $IDF_PATH/tools/:\ $IDF_PATH/components/app_update:\ -/root/.espressif/tools/xtensa-esp32-elf/$ESP_PATCH_VER/xtensa-esp32-elf/bin:\ -/root/.espressif/tools/xtensa-esp32s2-elf/$ESP_PATCH_VER/xtensa-esp32s2-elf/bin:\ -/root/.espressif/tools/xtensa-esp32s3-elf/$ESP_PATCH_VER/xtensa-esp32s3-elf/bin:\ +/root/.espressif/tools/xtensa-esp-elf/$ESP_PATCH_VER/xtensa-esp-elf/bin:\ /root/.espressif/tools/riscv32-esp-elf/$ESP_PATCH_VER/riscv32-esp-elf/bin # Clean up downloaded files diff --git a/.devcontainer/ESP32/Dockerfile.ESP32.SRC b/.devcontainer/ESP32/Dockerfile.ESP32.SRC index c27d88f632..ec5bbf8d05 100644 --- a/.devcontainer/ESP32/Dockerfile.ESP32.SRC +++ b/.devcontainer/ESP32/Dockerfile.ESP32.SRC @@ -66,15 +66,13 @@ ENV ESP_PATCH_VER=esp-13.2.0_20230928 # RUN python -m pip install -r $IDF_PATH/requirements.txt RUN $IDF_PATH/install.sh -ENV PATH=/root/.espressif/python_env/idf5.1_py3.11_env/bin:$PATH:\ +ENV PATH=/root/.espressif/python_env/idf5.2_py3.11_env/bin:$PATH:\ $IDF_PATH/components/esptool_py/esptool:\ $IDF_PATH/components/espcoredump:\ $IDF_PATH/components/partition_table/:\ $IDF_PATH/tools/:\ $IDF_PATH/components/app_update:\ -/root/.espressif/tools/xtensa-esp32-elf/$ESP_PATCH_VER/xtensa-esp32-elf/bin:\ -/root/.espressif/tools/xtensa-esp32s2-elf/$ESP_PATCH_VER/xtensa-esp32s2-elf/bin:\ -/root/.espressif/tools/xtensa-esp32s3-elf/$ESP_PATCH_VER/xtensa-esp32s3-elf/bin:\ +/root/.espressif/tools/xtensa-esp-elf/$ESP_PATCH_VER/xtensa-esp-elf/bin:\ /root/.espressif/tools/riscv32-esp-elf/$ESP_PATCH_VER/riscv32-esp-elf/bin # Clean up downloaded files