IDF 5_4_1 patch test

Author: AdrianSoundy

.devcontainer/All/Dockerfile.All.SRC

@@ -142,9 +142,6 @@ $IDF_PATH/components/app_update:\
 /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
 
-# FIXME: Work around for problem in IDF v5.4.1, must be removed for later releases when issue fixed
-ENV ESP_ROM_ELF_DIR=/root/.espressif/tools/esp-rom-elfs/20241011/
-
 # Clean up downloaded files
 RUN apt-get autoremove -y \
     && apt-get clean -y \

.devcontainer/ESP32/Dockerfile.ESP32.SRC

@@ -76,9 +76,6 @@ $IDF_PATH/components/app_update:\
 /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
 
-# FIXME: Work around for problem in IDF v5.4.1, must be removed for later releases when issue fixed
-ENV ESP_ROM_ELF_DIR=/root/.espressif/tools/esp-rom-elfs/20241011/
-
 # Clean up downloaded files
 RUN apt-get autoremove -y \
     && apt-get clean -y \

CMake/binutils.ESP32.cmake

@@ -151,6 +151,43 @@ macro(nf_fix_esp32c3_rom_file)
 
 endmacro()
 
+# Fixes an issue with IDF 5.4.1 where we get an error cause by ESP_ROM_ELF_DIR environment variable missing
+# This patch removes need for variable. Offical patch added after IDF5.4.1 release
+macro(nf_patch_idf5_4_1)
+    file(READ
+    ${esp32_idf_SOURCE_DIR}/tools/cmake/gdbinit.cmake
+    ESP32_GBBINIT_CONTENT)
+
+    string(FIND ${ESP32_GBBINIT_CONTENT} "# set(gdbinit_rom_in_path " GBD_INIT_PATCH_INDEX)
+    message("-- Check IDF patch exists")
+    if(GBD_INIT_PATCH_INDEX EQUAL -1)
+
+        message("-- Patching IDF 5.4.1 gdbinit.cmake")
+
+        string(REPLACE
+            "set(gdbinit_rom_in_path "
+            "# set(gdbinit_rom_in_path "
+            ESP32_GBBINIT_NEW_CONTENT
+            "${ESP32_GBBINIT_CONTENT}")
+
+        string(REPLACE
+            "set(gdbinit_rom_path "
+            "# set(gdbinit_rom_path "
+            ESP32_GBBINIT_NEW_CONTENT
+            "${ESP32_GBBINIT_NEW_CONTENT}")
+
+        string(REPLACE
+            "file(TO_CMAKE_PATH "
+            "# file(TO_CMAKE_PATH "
+            ESP32_GBBINIT_NEW_CONTENT
+            "${ESP32_GBBINIT_NEW_CONTENT}")
+
+        file(WRITE 
+            ${esp32_idf_SOURCE_DIR}/tools/cmake/gdbinit.cmake
+            "${ESP32_GBBINIT_NEW_CONTENT}")
+    endif()
+endmacro()
+
 # setting compile definitions for a target based on general build options
 # TARGET parameter to set the target that's setting them for
 # optional EXTRA_COMPILE_DEFINITIONS with compiler definitions to be added to the library
@@ -1025,6 +1062,9 @@ macro(nf_add_idf_as_library)
 
     nf_fix_esp32c3_rom_file()
 
+    # FIXME patch IDF 5.4.1 problem
+    nf_patch_idf5_4_1()
+
     # find out if there is support for BLE
     string(FIND ${SDKCONFIG_DEFAULT_CONTENTS} "CONFIG_BT_ENABLED=y" CONFIG_BT_ENABLED_POS)