From 18d218523b9e805a0dd9a9d452b980c44e9b8fa8 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Fri, 10 Nov 2023 16:10:16 -0300 Subject: [PATCH 1/3] remove esp-dl cloning --- tools/update-components.sh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/update-components.sh b/tools/update-components.sh index 39f5920a3..f80aa6c73 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -25,25 +25,25 @@ TFLITE_REPO_URL="https://github.com/espressif/tflite-micro-esp-examples.git" # # CLONE/UPDATE ESP-DL # -echo "Updating ESP-DL..." -if [ ! -d "$AR_COMPS/esp-dl" ]; then - git clone $DL_REPO_URL "$AR_COMPS/esp-dl" +#echo "Updating ESP-DL..." +#if [ ! -d "$AR_COMPS/esp-dl" ]; then +# git clone $DL_REPO_URL "$AR_COMPS/esp-dl" #this is a temp measure to fix build issue - mv "$AR_COMPS/esp-dl/CMakeLists.txt" "$AR_COMPS/esp-dl/CMakeListsOld.txt" - echo "idf_build_get_property(target IDF_TARGET)" > "$AR_COMPS/esp-dl/CMakeLists.txt" - echo "if(NOT \${IDF_TARGET} STREQUAL \"esp32c6\" AND NOT \${IDF_TARGET} STREQUAL \"esp32h2\")" >> "$AR_COMPS/esp-dl/CMakeLists.txt" - cat "$AR_COMPS/esp-dl/CMakeListsOld.txt" >> "$AR_COMPS/esp-dl/CMakeLists.txt" - echo "endif()" >> "$AR_COMPS/esp-dl/CMakeLists.txt" - rm -rf "$AR_COMPS/esp-dl/CMakeListsOld.txt" -else - git -C "$AR_COMPS/esp-dl" fetch && \ - git -C "$AR_COMPS/esp-dl" pull --ff-only -fi -if [ $? -ne 0 ]; then exit 1; fi +# mv "$AR_COMPS/esp-dl/CMakeLists.txt" "$AR_COMPS/esp-dl/CMakeListsOld.txt" +# echo "idf_build_get_property(target IDF_TARGET)" > "$AR_COMPS/esp-dl/CMakeLists.txt" +# echo "if(NOT \${IDF_TARGET} STREQUAL \"esp32c6\" AND NOT \${IDF_TARGET} STREQUAL \"esp32h2\")" >> "$AR_COMPS/esp-dl/CMakeLists.txt" +# cat "$AR_COMPS/esp-dl/CMakeListsOld.txt" >> "$AR_COMPS/esp-dl/CMakeLists.txt" +# echo "endif()" >> "$AR_COMPS/esp-dl/CMakeLists.txt" +# rm -rf "$AR_COMPS/esp-dl/CMakeListsOld.txt" +#else +# git -C "$AR_COMPS/esp-dl" fetch && \ +# git -C "$AR_COMPS/esp-dl" pull --ff-only +#fi +#if [ $? -ne 0 ]; then exit 1; fi #this is a temp measure to fix build issue -if [ -f "$AR_COMPS/esp-dl/idf_component.yml" ]; then - rm -rf "$AR_COMPS/esp-dl/idf_component.yml" -fi +#if [ -f "$AR_COMPS/esp-dl/idf_component.yml" ]; then +# rm -rf "$AR_COMPS/esp-dl/idf_component.yml" +#fi # # CLONE/UPDATE ESP-SR From 41e497dc596efbb8ec6e5107dc1c13ac8628e39e Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Fri, 10 Nov 2023 16:12:50 -0300 Subject: [PATCH 2/3] Gets esp-dl managed component from GH master --- main/idf_component.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index de094821a..61937d204 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -1,6 +1,7 @@ dependencies: # Required IDF version idf: ">=5.1" + require: public espressif/esp32-camera: version: "*" git: https://github.com/espressif/esp32-camera.git @@ -9,8 +10,8 @@ dependencies: version: ">=1.2.0" require: public espressif/esp-dl: - version: ">=2.0.0" - path: ../components/esp-dl + version: "*" + git: https://github.com/espressif/esp-dl.git require: public rules: - if: "target in [esp32s3]" From 3aebb0095444769f26daf6d565541c2da2e6678a Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Fri, 10 Nov 2023 17:41:15 -0300 Subject: [PATCH 3/3] Update idf_component.yml --- main/idf_component.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index 61937d204..5c7a18368 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -1,16 +1,15 @@ dependencies: # Required IDF version idf: ">=5.1" - require: public espressif/esp32-camera: - version: "*" + version: "master" git: https://github.com/espressif/esp32-camera.git require: public espressif/esp-tflite-micro: version: ">=1.2.0" require: public espressif/esp-dl: - version: "*" + version: "master" git: https://github.com/espressif/esp-dl.git require: public rules: