From 55accd07f36f061c79fd63814f3af8fa07819075 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Mon, 18 Mar 2024 20:22:58 +0100 Subject: [PATCH] Fix LitteFS dependency error --- CMakeLists.txt | 2 +- components/esp_littlefs | 1 + dependencies.lock | 9 +-------- esp_littlefs | 1 + platformio.ini | 1 + src/idf_component.yml | 5 +---- 6 files changed, 6 insertions(+), 13 deletions(-) create mode 160000 components/esp_littlefs create mode 160000 esp_littlefs diff --git a/CMakeLists.txt b/CMakeLists.txt index 36d853f..8f4c56f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ cmake_minimum_required(VERSION 3.16.0) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -list(APPEND EXTRA_COMPONENT_DIRS managed_components) +list(APPEND EXTRA_COMPONENT_DIRS "${CMAKE_SOURCE_DIR}/.pio/libdeps/${configName}/esp_littlefs") project(btclock_espidf) diff --git a/components/esp_littlefs b/components/esp_littlefs new file mode 160000 index 0000000..fd64733 --- /dev/null +++ b/components/esp_littlefs @@ -0,0 +1 @@ +Subproject commit fd64733cdf248c7a7eb207db7d28124f8857fe0b diff --git a/dependencies.lock b/dependencies.lock index b815904..c645bdf 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -1,16 +1,9 @@ dependencies: - esp_littlefs: - component_hash: 6ae78edac4f81c605d6d7bff75f4f9a45d25938e4796347f91ea975ed3123326 - source: - git: https://github.com/joltwallet/esp_littlefs.git - path: . - type: git - version: fd64733cdf248c7a7eb207db7d28124f8857fe0b idf: component_hash: null source: type: idf version: 4.4.6 -manifest_hash: 4b13ff241ec4d36ca2303b885c7088c32d74d090ef8e0ca6ea4c7d53047011d6 +manifest_hash: f4c10dfb616cf7e24f85cb263b8c89ef7d6d8eee64860fd27097b1a83ba56960 target: esp32s3 version: 1.0.0 diff --git a/esp_littlefs b/esp_littlefs new file mode 160000 index 0000000..fd64733 --- /dev/null +++ b/esp_littlefs @@ -0,0 +1 @@ +Subproject commit fd64733cdf248c7a7eb207db7d28124f8857fe0b diff --git a/platformio.ini b/platformio.ini index 117ff4f..dffad22 100644 --- a/platformio.ini +++ b/platformio.ini @@ -31,6 +31,7 @@ build_unflags = -Werror=all -fno-exceptions lib_deps = + https://github.com/joltwallet/esp_littlefs.git bblanchon/ArduinoJson@^7.0.3 esphome/Improv@^1.2.3 mathieucarbou/ESP Async WebServer diff --git a/src/idf_component.yml b/src/idf_component.yml index f3bf4e7..de8a1d9 100644 --- a/src/idf_component.yml +++ b/src/idf_component.yml @@ -1,6 +1,3 @@ dependencies: # Required IDF version - idf: ">=4.4" - - esp_littlefs: - git: https://github.com/joltwallet/esp_littlefs.git + idf: ">=4.4" \ No newline at end of file