From f90bd0446e6df5fc91d1b6a0ec7e849ad76895f9 Mon Sep 17 00:00:00 2001 From: William Emfinger Date: Fri, 9 May 2025 08:42:07 -0500 Subject: [PATCH 1/3] fix(file_system): Fix dependency name when used as a managed component --- components/file_system/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/file_system/CMakeLists.txt b/components/file_system/CMakeLists.txt index ac63b9797..71b96ca5f 100644 --- a/components/file_system/CMakeLists.txt +++ b/components/file_system/CMakeLists.txt @@ -1,4 +1,13 @@ +# Determine whether file_system is fetched from component registry or from local path +idf_build_get_property(build_components BUILD_COMPONENTS) +if(file_system IN_LIST build_components) + set(required_littlefs_name esp_littlefs) # Local component +else() + set(required_littlefs_name littlefs) # Managed component +endif() + + idf_component_register( INCLUDE_DIRS "include" SRC_DIRS "src" - REQUIRES base_component esp_littlefs spi_flash) + REQUIRES base_component ${required_littlefs_name} spi_flash) From 7c2f4eac0d56fd2b68015bb025919b9a11fdb655 Mon Sep 17 00:00:00 2001 From: William Emfinger Date: Fri, 9 May 2025 08:56:45 -0500 Subject: [PATCH 2/3] actually rename esp_littlefs -> littlefs to match managed component for better build --- .gitmodules | 2 +- components/file_system/CMakeLists.txt | 11 +---------- components/{esp_littlefs => littlefs} | 0 3 files changed, 2 insertions(+), 11 deletions(-) rename components/{esp_littlefs => littlefs} (100%) diff --git a/.gitmodules b/.gitmodules index cc1501f12..741c627e5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ path = components/serialization/detail/alpaca url = https://github.com/p-ranav/alpaca [submodule "components/esp_littlefs"] - path = components/esp_littlefs + path = components/littlefs url = https://github.com/joltwallet/esp_littlefs [submodule "components/lvgl"] path = components/lvgl diff --git a/components/file_system/CMakeLists.txt b/components/file_system/CMakeLists.txt index 71b96ca5f..9796b6ff1 100644 --- a/components/file_system/CMakeLists.txt +++ b/components/file_system/CMakeLists.txt @@ -1,13 +1,4 @@ -# Determine whether file_system is fetched from component registry or from local path -idf_build_get_property(build_components BUILD_COMPONENTS) -if(file_system IN_LIST build_components) - set(required_littlefs_name esp_littlefs) # Local component -else() - set(required_littlefs_name littlefs) # Managed component -endif() - - idf_component_register( INCLUDE_DIRS "include" SRC_DIRS "src" - REQUIRES base_component ${required_littlefs_name} spi_flash) + REQUIRES base_component littlefs spi_flash) diff --git a/components/esp_littlefs b/components/littlefs similarity index 100% rename from components/esp_littlefs rename to components/littlefs From 585aeb0f5e19bbf81864d1fd4e73c1b538856fbc Mon Sep 17 00:00:00 2001 From: William Emfinger Date: Fri, 9 May 2025 08:59:02 -0500 Subject: [PATCH 3/3] sync --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 741c627e5..0d65881b3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,7 @@ [submodule "components/serialization/detail/alpaca"] path = components/serialization/detail/alpaca url = https://github.com/p-ranav/alpaca -[submodule "components/esp_littlefs"] +[submodule "components/littlefs"] path = components/littlefs url = https://github.com/joltwallet/esp_littlefs [submodule "components/lvgl"]