Use component manager overwrite to help build (espressif#205)

me-no-dev · web-flow · commit fcfcb744b5c9 · 2024-08-15T23:44:49.000+03:00
diff --git a/build.sh b/build.sh
@@ -10,6 +10,9 @@ if ! [ -x "$(command -v git)" ]; then
     exit 1
 fi
 
+# Fixes building some components. See https://github.com/espressif/arduino-esp32/issues/10167
+export IDF_COMPONENT_OVERWRITE_MANAGED_COMPONENTS=1
+
 TARGET="all"
 BUILD_TYPE="all"
 BUILD_DEBUG="default"
@@ -115,15 +118,6 @@ else
     source ./tools/config.sh
 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
         echo "ERROR: You need to specify target for non-default builds"
@@ -162,7 +156,6 @@ 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
@@ -217,12 +210,10 @@ 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,7 +235,6 @@ 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
@@ -258,7 +248,6 @@ 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
