(nuttx) branch master updated: fs/littlefs: make CONFIG_FS_LITTLEFS_VERSION include the "v" prefix

[acassis]

This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 92b9a30878 fs/littlefs: make CONFIG_FS_LITTLEFS_VERSION include the 
"v" prefix
92b9a30878 is described below

commit 92b9a30878169cd354cc67b31749fa575042afe7
Author: YAMAMOTO Takashi <yamam...@midokura.com>
AuthorDate: Mon Nov 25 23:38:39 2024 +0900

    fs/littlefs: make CONFIG_FS_LITTLEFS_VERSION include the "v" prefix
    
    To allow other tags/branches like "devel" and even sha256 hash.
---
 fs/littlefs/CMakeLists.txt | 2 +-
 fs/littlefs/Kconfig        | 2 +-
 fs/littlefs/Make.defs      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/littlefs/CMakeLists.txt b/fs/littlefs/CMakeLists.txt
index f63764693c..b81e07405e 100644
--- a/fs/littlefs/CMakeLists.txt
+++ b/fs/littlefs/CMakeLists.txt
@@ -25,7 +25,7 @@ if(CONFIG_FS_LITTLEFS)
 
     FetchContent_Declare(
       littlefs
-      URL 
https://github.com/ARMmbed/littlefs/archive/v${CONFIG_FS_LITTLEFS_VERSION}.tar.gz
+      URL 
https://github.com/ARMmbed/littlefs/archive/${CONFIG_FS_LITTLEFS_VERSION}.tar.gz
           SOURCE_DIR
           ${CMAKE_CURRENT_LIST_DIR}/littlefs
           BINARY_DIR
diff --git a/fs/littlefs/Kconfig b/fs/littlefs/Kconfig
index 0457c1559b..517d500ef0 100644
--- a/fs/littlefs/Kconfig
+++ b/fs/littlefs/Kconfig
@@ -129,7 +129,7 @@ config FS_LITTLEFS_ATTR_UPDATE
 
 config FS_LITTLEFS_VERSION
        string "LITTLEFS version to use"
-       default "2.5.1"
+       default "v2.5.1"
        ---help---
                The LITTLEFS version to use.
 
diff --git a/fs/littlefs/Make.defs b/fs/littlefs/Make.defs
index bdcbef7834..afabeb9407 100644
--- a/fs/littlefs/Make.defs
+++ b/fs/littlefs/Make.defs
@@ -47,14 +47,14 @@ CFLAGS += -DLFS_NAME_MAX=$(CONFIG_FS_LITTLEFS_NAME_MAX)
 CFLAGS += -DLFS_FILE_MAX=$(CONFIG_FS_LITTLEFS_FILE_MAX)
 CFLAGS += -DLFS_ATTR_MAX=$(CONFIG_FS_LITTLEFS_ATTR_MAX)
 
-LITTLEFS_TARBALL = v$(CONFIG_FS_LITTLEFS_VERSION).tar.gz
+LITTLEFS_TARBALL = $(CONFIG_FS_LITTLEFS_VERSION).tar.gz
 
 $(LITTLEFS_TARBALL):
        $(call 
DOWNLOAD,https://github.com/ARMmbed/littlefs/archive,$(LITTLEFS_TARBALL),littlefs/$(LITTLEFS_TARBALL))
 
 .littlefsunpack: $(LITTLEFS_TARBALL)
        $(Q) tar zxf littlefs/$(LITTLEFS_TARBALL) -C littlefs
-       $(Q) mv littlefs/littlefs-$(CONFIG_FS_LITTLEFS_VERSION) 
littlefs/littlefs
+       $(Q) mv littlefs/littlefs-* littlefs/littlefs
        $(Q) git apply littlefs/lfs_util.patch
        $(Q) git apply littlefs/lfs_getpath.patch
        $(Q) git apply littlefs/lfs_getsetattr.patch