From 91f7ab139c01655f12c113d53cae615f7cd8f4fb Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 14 Aug 2024 00:09:54 +0300
Subject: [PATCH 1/2] Fix ESP-DSP breaking the build

---
 build.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index eead520a6..4d1c89de0 100755
--- a/build.sh
+++ b/build.sh
@@ -115,9 +115,14 @@ else
     source ./tools/config.sh
 fi
 
-if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
-    rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
-fi
+function clear_component_hashes(){
+    if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
+        rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
+    fi
+    if [ -f "$AR_MANAGED_COMPS/espressif__esp-dsp/.component_hash" ]; then
+        rm -rf $AR_MANAGED_COMPS/espressif__esp-dsp/.component_hash
+    fi
+}
 
 if [ "$BUILD_TYPE" != "all" ]; then
     if [ "$TARGET" = "all" ]; then
@@ -157,6 +162,7 @@ if [ "$BUILD_TYPE" != "all" ]; then
 
         echo "idf.py -DIDF_TARGET=\"$target\" -DSDKCONFIG_DEFAULTS=\"$configs\" $BUILD_TYPE"
         rm -rf build sdkconfig
+        clear_component_hashes
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$configs" $BUILD_TYPE
         if [ $? -ne 0 ]; then exit 1; fi
     done
@@ -215,10 +221,12 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
 
     echo "* Build IDF-Libs: $idf_libs_configs"
     rm -rf build sdkconfig
+    clear_component_hashes
     idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" idf-libs
     if [ $? -ne 0 ]; then exit 1; fi
 
     if [ "$target" == "esp32s3" ]; then
+        clear_component_hashes
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" srmodels_bin
         if [ $? -ne 0 ]; then exit 1; fi
         AR_SDK="$AR_TOOLS/esp32-arduino-libs/$target"
@@ -244,6 +252,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
 
         echo "* Build BootLoader: $bootloader_configs"
         rm -rf build sdkconfig
+        clear_component_hashes
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$bootloader_configs" copy-bootloader
         if [ $? -ne 0 ]; then exit 1; fi
     done
@@ -261,6 +270,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
 
         echo "* Build Memory Variant: $mem_configs"
         rm -rf build sdkconfig
+        clear_component_hashes
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$mem_configs" mem-variant
         if [ $? -ne 0 ]; then exit 1; fi
     done

From 8a3b418ac4667924c040872b2adf830d8ab2b9e5 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 14 Aug 2024 00:34:00 +0300
Subject: [PATCH 2/2] Clear redundant code

---
 build.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/build.sh b/build.sh
index 4d1c89de0..887016d6a 100755
--- a/build.sh
+++ b/build.sh
@@ -215,10 +215,6 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
         idf_libs_configs="$idf_libs_configs;configs/defconfig.$defconf"
     done
 
-    if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
-        rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
-    fi
-
     echo "* Build IDF-Libs: $idf_libs_configs"
     rm -rf build sdkconfig
     clear_component_hashes
@@ -246,10 +242,6 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
             bootloader_configs="$bootloader_configs;configs/defconfig.$defconf";
         done
 
-        if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
-            rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
-        fi
-
         echo "* Build BootLoader: $bootloader_configs"
         rm -rf build sdkconfig
         clear_component_hashes
@@ -264,10 +256,6 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
             mem_configs="$mem_configs;configs/defconfig.$defconf";
         done
 
-        if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
-            rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
-        fi
-
         echo "* Build Memory Variant: $mem_configs"
         rm -rf build sdkconfig
         clear_component_hashes