Skip to content

Merge littlefs 1.7.0 with adafruit's 1.6.0 - #1295

Closed
liquidraver wants to merge 1 commit into
meshcore-dev:devfrom
liquidraver:LFS_patch
Closed

Merge littlefs 1.7.0 with adafruit's 1.6.0#1295
liquidraver wants to merge 1 commit into
meshcore-dev:devfrom
liquidraver:LFS_patch

Conversation

@liquidraver

Copy link
Copy Markdown
Contributor

Since Adafruit forked littlefs there were a couple of patches, this script will update adafruit framework's littlefs to 1.7 retaining modifications that adafruit did in the fork.

it should bring corruption prevention on renames.

@recrof

recrof commented Dec 31, 2025

Copy link
Copy Markdown
Member

this change was part of series of btfixvXX releases.. we don't have conclusive evidence if it helped to prevent corruptions, but it's good to be close to upstream version, and we at least know it did not introduce any regressions during those few weeks we tested it.

@liquidraver

Copy link
Copy Markdown
Contributor Author

this will need a refactor to only patch the relevant lines in the unlikely event adafruit patches upstream (haven't in ages), but that's for 2026, this overwrite is faster

@liamcottle

liamcottle commented Dec 31, 2025

Copy link
Copy Markdown
Member

Is it possible for us to fork the original repos, apply any needed patches as git commits, and use the forked repos instead of using a python script to swap out code files at build time? (Same comment for that Bluefruit patch) :)

@liquidraver

Copy link
Copy Markdown
Contributor Author

Is it possible for us to fork the original repos, apply any needed patches as git commits, and use the forked repos instead of using a python script to swap out code files at build time? (Same comment for that Bluefruit patch) :)

of course it would be more in the github spirit, but I had reasons to do it like this:
original PR's upstream are not merged for months (years) now and maintaining a whole fork for the framework just for a few commits is overkill imho.
(adafruit/Adafruit_nRF52_Arduino#831)

I can maintain 2 python files and tune them according to upstream changes (delete them if something get's merged etc)

as for bluefruit:
well, someone should PR it upstream too so we can delete the patch, but I'm not confident in myself comprehending the whole thing enough to do it ;)

@liquidraver

Copy link
Copy Markdown
Contributor Author

anyway, if one of you guys decide to make an "official" fork of the adafruit framework, I'll gladly commit the build time patches there

@weebl2000

weebl2000 commented Mar 4, 2026

Copy link
Copy Markdown
Contributor

@liamcottle

Is it possible for us to fork the original repos, apply any needed patches as git commits, and use the forked repos instead of using a python script to swap out code files at build time? (Same comment for that Bluefruit patch) :)

Done, see #1922

@liquidraver liquidraver closed this Mar 4, 2026
@geeksville

Copy link
Copy Markdown

i'm glad this was useful for ya'll.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants