Skip to content

Update to latest Micropython and make micorpython libs actually accessible by default#10

Closed
dhouck wants to merge 3 commits into
North-Western-Development:2026.05.xfrom
dhouck:micropypath
Closed

Update to latest Micropython and make micorpython libs actually accessible by default#10
dhouck wants to merge 3 commits into
North-Western-Development:2026.05.xfrom
dhouck:micropypath

Conversation

@dhouck

@dhouck dhouck commented Jun 18, 2026

Copy link
Copy Markdown

Fixes #4.

This updates Micropython and the Micropython libraries, fixes a bug in the Micropython json library, and makes the libraries actually available for use instead of installed on the system but hard to access.

In more detail:

This builds and I have no reason to think it wonʼt work, but I havenʼt fully tested it.

@Un1q32

Un1q32 commented Jun 18, 2026

Copy link
Copy Markdown
Collaborator

Can you rebase this on the 2026.05.x branch

@dhouck

dhouck commented Jun 18, 2026

Copy link
Copy Markdown
Author

Oh, you did that update already. Sure, I can do that in a few hours.

dhouck added 3 commits June 18, 2026 16:27
[Minux only change: also update .config]

This allows us to fix packaging issue with micropython-lib, which was
not packaging the correct versions of some libraries.  The new version
makes changes to the `manifestfile` tool/library used by our
collect_micropython_libs.py script, which makes it easier to collect the
correct library version.  This fixes #166.

To better support alternate use cases, the option to package the modules
in unix-ffi has been split into a separate option, instead of assuming
it's needed if and only if libffi is selected.

Both the upstream changes and the unix-ffi split require changes to
collect_micropython_libs.py.  First, since we might not want the
unix-ffi libraries, the script takes an extra argument for whether or
not to include them.  Next, since the manifest.require function no
longer takes a unix_ffi optional parameter, we use manifest.add_library
as recommended in the micropython-lib/unix-ffi directory README, if we
are are actually packaging those libraries.

All of the patches we have been maintaining have also been merged upstream
by 1.28.0, so they are removed.  Their respective Upstream: trailers all
point to the relevant commits, except for
0003-Fixes-for-GCC-15-1-unterminated-string-literal-warning.patch, from
micropython/micropython@ae6062a

The LICENSE hash has been updated, as the year and the licenses used for
the ports and libraries have also been updated in the LICENSE file.

For more details on the version bump, see the release notes:
  - https://github.com/micropython/micropython/releases/tag/v1.23.0
  - https://github.com/micropython/micropython/releases/tag/v1.24.0
  - https://github.com/micropython/micropython/releases/tag/v1.24.1
  - https://github.com/micropython/micropython/releases/tag/v1.25.0
  - https://github.com/micropython/micropython/releases/tag/v1.26.0
  - https://github.com/micropython/micropython/releases/tag/v1.26.1
  - https://github.com/micropython/micropython/releases/tag/v1.27.0
  - https://github.com/micropython/micropython/releases/tag/v1.28.0

Signed-off-by: Daniel Houck <Software@DRHouck.me>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit 28eeca9)
This is in micropython-lib upstream but not yet in any releases.  It
isn't needed for any of the current OC2R micropython library, but it is
needed for some of the PRs.
Things worked before because Micropython has built-in equivalents for
all the libraries, we use, but the ones installed in /usr/lib are
usually better.
@dhouck

dhouck commented Jun 19, 2026

Copy link
Copy Markdown
Author

Well that didnʼt go as intended; letʼs see if I can convince GitHub to use the same PR…

@dhouck dhouck changed the base branch from 2026.02.x to 2026.05.x June 19, 2026 01:10
@dhouck

dhouck commented Jun 19, 2026

Copy link
Copy Markdown
Author

Well for some reason changing the PR to be based on 2026.05.x meant I had to click the “edit title” button, but I did rebase it.

Unfortunately I also found that the current oc2r devices library does not run on the micropython-lib JSON library even with the patch, because it treats \0 as an error instead of whitespace. So this cannot be merged until North-Western-Development/oc2r#122 is.

I think with that it should work but Iʼm going to do some tests just to confirm. Alternately this should be good as-is without the last commit that updates MICROPYPATH.

@Un1q32

Un1q32 commented Jun 19, 2026

Copy link
Copy Markdown
Collaborator

Well for some reason changing the PR to be based on 2026.05.x meant I had to click the “edit title” button, but I did rebase it.

Unfortunately I also found that the current oc2r devices library does not run on the micropython-lib JSON library even with the patch, because it treats \0 as an error instead of whitespace. So this cannot be merged until North-Western-Development/oc2r#122 is.

I think with that it should work but Iʼm going to do some tests just to confirm. Alternately this should be good as-is without the last commit that updates MICROPYPATH.

I still don't know python so I still can't review that other PR.

I manually cherry-picked the buildroot commit and then manually updated the config in another commit, because that will make rebasing on the next buildroot version easier. I also added the patch thing.

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.

Some issues with micropython-lib

2 participants