From 91f7ab139c01655f12c113d53cae615f7cd8f4fb Mon Sep 17 00:00:00 2001 From: me-no-dev 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 eead520a..4d1c89de 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 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 4d1c89de..887016d6 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 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy