Skip to contentSkip to conversation

package/micropython: bump to version 1.28.0

PATCH Superseded Daniel Houck 2 participants 6 messages May 8 – Jun 12

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/micropython: bump to version 1.28.0

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.

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
https://github.com/micropython/micropython/commit/ae6062a45a776e193e8c02ece62d058b64f2b4f5

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

---
 package/micropython/Config.in                 |  21 +-
 package/micropython/micropython.mk            |  12 +-
 .../micropython/collect_micropython_lib.py    |  18 +-
 package/micropython/micropython.hash          |   4 +-
 ...-non-Thumb2-long-jump-workaround-opt.patch | 130 ----------
 ...xtensa-Simplify-register-name-lookup.patch |  85 -------
 ...-unterminated-string-literal-warning.patch | 234 ------------------
 ...if-extending-a-bytearray-from-itself.patch | 183 --------------
 8 files changed, 37 insertions(+), 650 deletions(-)
 delete mode 100644 package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch
 delete mode 100644 package/micropython/0002-py-emitinlinextensa-Simplify-register-name-lookup.patch
 delete mode 100644 package/micropython/0003-Fixes-for-GCC-15-1-unterminated-string-literal-warning.patch
 delete mode 100644 package/micropython/0004-py-objarray-fix-use-after-free-if-extending-a-bytearray-from-itself.patch
package/micropython/Config.in +20 -1
index f532b3bdb5..6109e95109 100644
@@ -13,10 +13,29 @@ if BR2_PACKAGE_MICROPYTHON
 
 config BR2_PACKAGE_MICROPYTHON_LIB
 	bool "micropython-lib"
-	select BR2_PACKAGE_PCRE2 # runtime
 	help
 	  Core Python libraries ported to MicroPython.
 
+	  This contains compatible but reduced-functionality versions
+	  of some Python standard library and wider Python ecosystem
+	  modules, as well as some MicroPython-specific libraries
+	  that aren't included in the base package.
+
+if BR2_PACKAGE_MICROPYTHON_LIB
+
+config BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI
+	bool "micropython-lib unix-ffi modules"
+	default y
+	select BR2_PACKAGE_LIBFFI
+	select BR2_PACKAGE_PCRE2 # runtime
+	help
+	  Unix-specific MicroPython packages
+
+	  These provide additional functionality to MicroPython in
+	  standard environments.
+
+endif # BR2_PACKAGE_MICROPYTHON_LIB
+
 endif # BR2_PACKAGE_MICROPYTHON
 
 comment "micropython needs a toolchain w/ threads, dynamic library"
package/micropython/micropython.mk +3 -9
index 826247069e..6a1a3cce8c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MICROPYTHON_VERSION = 1.22.2
+MICROPYTHON_VERSION = 1.28.0
 MICROPYTHON_SITE = https://micropython.org/resources/source
 MICROPYTHON_SOURCE = micropython-$(MICROPYTHON_VERSION).tar.xz
 # Micropython has a lot of code copied from other projects, and also a number
@@ -29,13 +29,6 @@ ifeq ($(BR2_xtensa),y)
 MICROPYTHON_CFLAGS += -DMICROPY_NLR_SETJMP=1
 endif
 
-# https://github.com/micropython/micropython/issues/14115
-# Temporary fix for GCC 14 compatibility, should be removed after updating to
-# 1.23.0 or later.
-ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_14),y)
-MICROPYTHON_CFLAGS += -DMICROPY_NLR_SETJMP=1
-endif
-
 # When building from a tarball we don't have some of the dependencies that are in
 # the git repository as submodules
 MICROPYTHON_MAKE_OPTS += \
@@ -71,7 +64,8 @@ ifeq ($(BR2_PACKAGE_MICROPYTHON_LIB),y)
 define MICROPYTHON_COLLECT_LIBS
 	$(EXTRA_ENV) PYTHONPATH=$(@D)/tools \
 		package/micropython/collect_micropython_lib.py \
-		$(@D) $(@D)/.built_pylib
+		$(@D) $(@D)/.built_pylib \
+		$(if $(BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI),--ffi,--no-ffi)
 endef
 
 define MICROPYTHON_INSTALL_LIBS
package/micropython/collect_micropython_lib.py +12 -6
index 8dce78337a..5fb74787a9 100755
@@ -57,23 +57,29 @@ def process_cmdline_args():
     )
     parser.add_argument("micropython", help="Path to micropython source directory")
     parser.add_argument("destination", help="Destination directory")
+    parser.add_argument("--ffi", action=argparse.BooleanOptionalAction,
+                        default=True, help="Install libs that require FFI")
 
     args = parser.parse_args()
-    return os.path.abspath(args.micropython), os.path.abspath(args.destination)
+    return args
 
 
 def main():
-    micropython_dir, destination_dir = process_cmdline_args()
-    mpy_lib_dir = f"{micropython_dir}/lib/micropython-lib"
+    args = process_cmdline_args()
+    mpy_lib_dir = f"{args.micropython}/lib/micropython-lib"
 
     manifest = manifestfile.ManifestFile(
         manifestfile.MODE_FREEZE, {"MPY_LIB_DIR": mpy_lib_dir}
     )
 
-    for library, is_ffi in get_all_libraries(mpy_lib_dir):
-        manifest.require(library, unix_ffi=is_ffi)
+    if args.ffi:
+        manifest.add_library("unix-ffi", os.path.join("$(MPY_LIB_DIR)", "unix-ffi"),
+                             prepend=True)
 
-    copy_libraries(manifest, destination_dir)
+    for library, is_ffi in get_all_libraries(mpy_lib_dir):
+        if args.ffi or not is_ffi:
+            manifest.require(library)
+    copy_libraries(manifest, args.destination)
 
 
 main()
package/micropython/micropython.hash +2 -2
index bbfde0e89f..84a74b2d21 100644
@@ -1,3 +1,3 @@
 #locally computed
-sha256  bb3ba34848a7620663b6a7cba22af45d3056fc79328c2ceb943874b5478d8756  micropython-1.22.2.tar.xz
-sha256  fe63a3fbd0731f6530e0783224763bceef972e516cab4b8513ca4d7b05be9713  LICENSE
+sha256  4e43c59657b8da33b4bc503509a827cc3ea6cb66c446475c57776cf4467ba215  micropython-1.28.0.tar.xz
+sha256  c7273a4675e28b40547b4814bf68da41954632ebbc38b3fff69f22d69850f690  LICENSE
package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch deleted +0 -130

130 lines not on this page · raw message

package/micropython/0002-py-emitinlinextensa-Simplify-register-name-lookup.patch deleted +0 -85

85 lines not on this page · raw message

package/micropython/0003-Fixes-for-GCC-15-1-unterminated-string-literal-warning.patch deleted +0 -234

234 lines not on this page · raw message

package/micropython/0004-py-objarray-fix-use-after-free-if-extending-a-bytearray-from-itself.patch deleted +0 -183

183 lines not on this page · raw message

Signature · 6 lines
2.54.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hello Daniel,

Thanks for patch, and the very good commit log. Nevertheless, I have a few questions, see below.

package/micropython/Config.in if BR2_PACKAGE_MICROPYTHON · line 30

Quoted 7 lines · Daniel Houck
package/micropython/Config.in +7 -0
+if BR2_PACKAGE_MICROPYTHON_LIB
+
+config BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI
+	bool "micropython-lib unix-ffi modules"
+	default y
+	select BR2_PACKAGE_LIBFFI
+	select BR2_PACKAGE_PCRE2 # runtime

So libffi is only needed as a dependency when
BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI=y?

package/micropython/micropython.mk ifeq ($(BR2_PACKAGE_MICROPYTHON_LIB),y) · line 68

Quoted 10 lines

# When building from a tarball we don't have some of the dependencies that are in

 # the git repository as submodules
 MICROPYTHON_MAKE_OPTS += \
package/micropython/micropython.mk +2 -1
@@ -71,7 +64,8 @@ ifeq ($(BR2_PACKAGE_MICROPYTHON_LIB),y)
 define MICROPYTHON_COLLECT_LIBS
 	$(EXTRA_ENV) PYTHONPATH=$(@D)/tools \
 		package/micropython/collect_micropython_lib.py \
-		$(@D) $(@D)/.built_pylib
+		$(@D) $(@D)/.built_pylib \
+		$(if $(BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI),--ffi,--no-ffi)

If yes, then this change is not needed. Indeed:

ifeq ($(BR2_PACKAGE_LIBFFI),y)
MICROPYTHON_DEPENDENCIES += host-pkgconf libffi
MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=1
else
MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0
endif

will continue to bring libffi as a dependency if BR2_PACKAGE_LIBFFI is enabled.

package/micropython/collect_micropython_lib.py

Quoted 4 lines
package/micropython/collect_micropython_lib.py +0 -0
index 8dce78337a..5fb74787a9 100755

Could you perhaps improve a tiny bit the commit message to explain the changes being brought to this script?

Thanks a lot!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Hello Thomas,

[Accidentally only hit reply; re-sending with reply all]

Thanks for the review. I always worry I'm too verbose in my commit messages; I'm glad you liked it (and wanted even more detail). I hope this answers your questions.

Quoted 12 lines · Thomas Petazzoni

package/micropython/Config.in if BR2_PACKAGE_MICROPYTHON · line 30

Quoted 7 lines · Daniel Houck
package/micropython/Config.in +7 -0
+if BR2_PACKAGE_MICROPYTHON_LIB
+
+config BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI
+	bool "micropython-lib unix-ffi modules"
+	default y
+	select BR2_PACKAGE_LIBFFI
+	select BR2_PACKAGE_PCRE2 # runtime

So libffi is only needed as a dependency when
BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI=y?

Yes, it's only required then, but it still works as an optional dependency without the flag, the same way it's an optional dependency for Ruby, MoarVM, and p11-kit.

Quoted 20 lines

package/micropython/micropython.mk ifeq ($(BR2_PACKAGE_MICROPYTHON_LIB),y) · line 68

Quoted 10 lines
  # When building from a tarball we don't have some of the dependencies that are in
  # the git repository as submodules
  MICROPYTHON_MAKE_OPTS += \
package/micropython/micropython.mk +2 -1
@@ -71,7 +64,8 @@ ifeq ($(BR2_PACKAGE_MICROPYTHON_LIB),y)
  define MICROPYTHON_COLLECT_LIBS
  	$(EXTRA_ENV) PYTHONPATH=$(@D)/tools \
  		package/micropython/collect_micropython_lib.py \
-		$(@D) $(@D)/.built_pylib
+		$(@D) $(@D)/.built_pylib \
+		$(if $(BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI),--ffi,--no-ffi)

If yes, then this change is not needed. Indeed:

ifeq ($(BR2_PACKAGE_LIBFFI),y)
MICROPYTHON_DEPENDENCIES += host-pkgconf libffi
MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=1
else
MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0
endif

Quoted 2 lines

will continue to bring libffi as a dependency if BR2_PACKAGE_LIBFFI is enabled.

I should add a comment because I hadn't properly thought about it before and I do see that this behavior is confusing, but I do think it's correct in both cases; the two sections do different things. The check for BR2_PACKAGE_LIBFFI tells us whether the core MicroPython program should have libffi support (like with any optional dependency), and the check for BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI tells us whether to include the extra libraries that depend on that feature. I added the second flag because there are reasons to want to avoid the unix-ffi libraries even with the rest of micropython-lib and libffi, but I can't think of a reason beyond saving 8 KiB to not want to build libffi support into MicroPython itself if the library is available.

Quoted 8 lines

package/micropython/collect_micropython_lib.py

Quoted 5 lines
package/micropython/collect_micropython_lib.py +0 -0
index 8dce78337a..5fb74787a9 100755

Could you perhaps improve a tiny bit the commit message to explain the changes being brought to this script?

Sure thing. The short version is that there were two types of changes which I couldn't cleanly separate into separate patches. The first is adding the flag for whether to include unix-ffi libraries at all (as discussed above), and the second is that upstream changed the manifest.require function when including unix-ffi, so we needed to change how we call it, according to the new upstream recommendations[1], which work better than what we could do before the change.

[1] https://github.com/micropython/micropython-lib/tree/master/unix-ffi

Quoted 3 lines

Thanks a lot!

Thomas

Thanks for the review! I'll try to get the updated patch to the list tomorrow.

Daniel
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw

Hello Daniel,

Quoted 3 lines · Daniel Houck

Thanks for the review. I always worry I'm too verbose in my commit messages; I'm glad you liked it (and wanted even more detail). I hope this answers your questions.

Thanks a lot for the additional details, all questions have been addressed, very clearly. If you post a v2 with a slightly improved commit message, we will be good to go!

Thanks!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

PATCH v2 1/1 package/micropython: bump to version 1.28.0

In reply to Daniel Houck

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
https://github.com/micropython/micropython/commit/ae6062a45a776e193e8c02ece62d058b64f2b4f5

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

---
Changes v1 -> v2:
- Clarify collect_micropython_libs.py changes in commit message (suggested by Thomas)
- Add comment to makefile about MICROPY_PY_FFI flag

 package/micropython/Config.in                 |  21 +-
 package/micropython/micropython.mk            |  13 +-
 .../micropython/collect_micropython_lib.py    |  18 +-
 package/micropython/micropython.hash          |   4 +-
 ...-non-Thumb2-long-jump-workaround-opt.patch | 130 ----------
 ...xtensa-Simplify-register-name-lookup.patch |  85 -------
 ...-unterminated-string-literal-warning.patch | 234 ------------------
 ...if-extending-a-bytearray-from-itself.patch | 183 --------------
 8 files changed, 38 insertions(+), 650 deletions(-)
 delete mode 100644 package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch
 delete mode 100644 package/micropython/0002-py-emitinlinextensa-Simplify-register-name-lookup.patch
 delete mode 100644 package/micropython/0003-Fixes-for-GCC-15-1-unterminated-string-literal-warning.patch
 delete mode 100644 package/micropython/0004-py-objarray-fix-use-after-free-if-extending-a-bytearray-from-itself.patch
package/micropython/Config.in +20 -1
index f532b3bdb5..6109e95109 100644
@@ -13,10 +13,29 @@ if BR2_PACKAGE_MICROPYTHON
 
 config BR2_PACKAGE_MICROPYTHON_LIB
 	bool "micropython-lib"
-	select BR2_PACKAGE_PCRE2 # runtime
 	help
 	  Core Python libraries ported to MicroPython.
 
+	  This contains compatible but reduced-functionality versions
+	  of some Python standard library and wider Python ecosystem
+	  modules, as well as some MicroPython-specific libraries
+	  that aren't included in the base package.
+
+if BR2_PACKAGE_MICROPYTHON_LIB
+
+config BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI
+	bool "micropython-lib unix-ffi modules"
+	default y
+	select BR2_PACKAGE_LIBFFI
+	select BR2_PACKAGE_PCRE2 # runtime
+	help
+	  Unix-specific MicroPython packages
+
+	  These provide additional functionality to MicroPython in
+	  standard environments.
+
+endif # BR2_PACKAGE_MICROPYTHON_LIB
+
 endif # BR2_PACKAGE_MICROPYTHON
 
 comment "micropython needs a toolchain w/ threads, dynamic library"
package/micropython/micropython.mk +4 -9
index 826247069e..044714451c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MICROPYTHON_VERSION = 1.22.2
+MICROPYTHON_VERSION = 1.28.0
 MICROPYTHON_SITE = https://micropython.org/resources/source
 MICROPYTHON_SOURCE = micropython-$(MICROPYTHON_VERSION).tar.xz
 # Micropython has a lot of code copied from other projects, and also a number
@@ -29,13 +29,6 @@ ifeq ($(BR2_xtensa),y)
 MICROPYTHON_CFLAGS += -DMICROPY_NLR_SETJMP=1
 endif
 
-# https://github.com/micropython/micropython/issues/14115
-# Temporary fix for GCC 14 compatibility, should be removed after updating to
-# 1.23.0 or later.
-ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_14),y)
-MICROPYTHON_CFLAGS += -DMICROPY_NLR_SETJMP=1
-endif
-
 # When building from a tarball we don't have some of the dependencies that are in
 # the git repository as submodules
 MICROPYTHON_MAKE_OPTS += \
@@ -46,6 +39,7 @@ MICROPYTHON_MAKE_OPTS += \
 	LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \
 	CWARN=
 
+# Support libffi in MicroPython itself; separate from unix-ffi libraries
 ifeq ($(BR2_PACKAGE_LIBFFI),y)
 MICROPYTHON_DEPENDENCIES += host-pkgconf libffi
 MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=1
@@ -71,7 +65,8 @@ ifeq ($(BR2_PACKAGE_MICROPYTHON_LIB),y)
 define MICROPYTHON_COLLECT_LIBS
 	$(EXTRA_ENV) PYTHONPATH=$(@D)/tools \
 		package/micropython/collect_micropython_lib.py \
-		$(@D) $(@D)/.built_pylib
+		$(@D) $(@D)/.built_pylib \
+		$(if $(BR2_PACKAGE_MICROPYTHON_LIB_UNIXFFI),--ffi,--no-ffi)
 endef
 
 define MICROPYTHON_INSTALL_LIBS
package/micropython/collect_micropython_lib.py +12 -6
index 8dce78337a..5fb74787a9 100755
@@ -57,23 +57,29 @@ def process_cmdline_args():
     )
     parser.add_argument("micropython", help="Path to micropython source directory")
     parser.add_argument("destination", help="Destination directory")
+    parser.add_argument("--ffi", action=argparse.BooleanOptionalAction,
+                        default=True, help="Install libs that require FFI")
 
     args = parser.parse_args()
-    return os.path.abspath(args.micropython), os.path.abspath(args.destination)
+    return args
 
 
 def main():
-    micropython_dir, destination_dir = process_cmdline_args()
-    mpy_lib_dir = f"{micropython_dir}/lib/micropython-lib"
+    args = process_cmdline_args()
+    mpy_lib_dir = f"{args.micropython}/lib/micropython-lib"
 
     manifest = manifestfile.ManifestFile(
         manifestfile.MODE_FREEZE, {"MPY_LIB_DIR": mpy_lib_dir}
     )
 
-    for library, is_ffi in get_all_libraries(mpy_lib_dir):
-        manifest.require(library, unix_ffi=is_ffi)
+    if args.ffi:
+        manifest.add_library("unix-ffi", os.path.join("$(MPY_LIB_DIR)", "unix-ffi"),
+                             prepend=True)
 
-    copy_libraries(manifest, destination_dir)
+    for library, is_ffi in get_all_libraries(mpy_lib_dir):
+        if args.ffi or not is_ffi:
+            manifest.require(library)
+    copy_libraries(manifest, args.destination)
 
 
 main()
package/micropython/micropython.hash +2 -2
index bbfde0e89f..84a74b2d21 100644
@@ -1,3 +1,3 @@
 #locally computed
-sha256  bb3ba34848a7620663b6a7cba22af45d3056fc79328c2ceb943874b5478d8756  micropython-1.22.2.tar.xz
-sha256  fe63a3fbd0731f6530e0783224763bceef972e516cab4b8513ca4d7b05be9713  LICENSE
+sha256  4e43c59657b8da33b4bc503509a827cc3ea6cb66c446475c57776cf4467ba215  micropython-1.28.0.tar.xz
+sha256  c7273a4675e28b40547b4814bf68da41954632ebbc38b3fff69f22d69850f690  LICENSE
package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch deleted +0 -130

130 lines not on this page · raw message

package/micropython/0002-py-emitinlinextensa-Simplify-register-name-lookup.patch deleted +0 -85

85 lines not on this page · raw message

package/micropython/0003-Fixes-for-GCC-15-1-unterminated-string-literal-warning.patch deleted +0 -234

234 lines not on this page · raw message

package/micropython/0004-py-objarray-fix-use-after-free-if-extending-a-bytearray-from-itself.patch deleted +0 -183

183 lines not on this page · raw message

Signature · 6 lines
2.54.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw
Quoted 37 lines · Daniel Houck

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
https://github.com/micropython/micropython/commit/ae6062a45a776e193e8c02ece62d058b64f2b4f5

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

Quoted 1 line

Applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot