From 9390bd0262ad9f0775b76984d1c8f29b9a35584e Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 30 May 2023 03:24:54 +0800 Subject: micropython-lib: Update to master, split target package The package has been reworked to install the same files that are available to be downloaded/installed by mip, the package manager new to MicroPython 1.20.0. This also splits the original target package into four: * micropython-lib * Includes packages common to all MicroPython ports (python-stdlib, python-ecosys, micropython) * Contains mpy bytecode files * micropython-lib-src * Includes packages common to all MicroPython ports (python-stdlib, python-ecosys, micropython) * Contains py source files * micropython-lib-unix * Includes packages specific to the MicroPython Unix port (unix-ffi) * Contains mpy bytecode files * Installs a specific launcher (micropython-unix) that adds the Unix package directory into MicroPython's library path * micropython-lib-unix-src * Includes packages specific to the MicroPython Unix port (unix-ffi) * Contains py source files This also updates the package license, title, and description. Patches: * 001-build-unix-ffi.patch This enables the repo build script to also build the Unix-specific packages. Not sure if upstream is open to accepting this since the Unix-specific packages don't fit well into the existing package distribution mechanism. * 002-add-unix-ffi-os-path.patch and 003-add-unix-ffi-uu.patch These fix instances where the unix-ffi version of the os package is overridden by the python-stdlib version. These have been submitted to upstream: https://github.com/micropython/micropython-lib/pull/672 Signed-off-by: Jeffery To --- .../patches/003-add-unix-ffi-uu.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 lang/python/micropython-lib/patches/003-add-unix-ffi-uu.patch (limited to 'lang/python/micropython-lib/patches/003-add-unix-ffi-uu.patch') diff --git a/lang/python/micropython-lib/patches/003-add-unix-ffi-uu.patch b/lang/python/micropython-lib/patches/003-add-unix-ffi-uu.patch new file mode 100644 index 000000000..363fae394 --- /dev/null +++ b/lang/python/micropython-lib/patches/003-add-unix-ffi-uu.patch @@ -0,0 +1,37 @@ +From 2e7bfd08a306bd9e80b22097ef8fe66e1dd85054 Mon Sep 17 00:00:00 2001 +From: Jeffery To +Date: Wed, 31 May 2023 00:00:11 +0800 +Subject: [PATCH] unix-ffi/uu: Add unix-ffi version of `uu` package. + +This package reuses the code from the python-stdlib version of `uu` but +requires the unix-ffi version of `os-path`. + +This also updates `email.message` to require this version of `uu`. + +Signed-off-by: Jeffery To +--- + unix-ffi/email.message/manifest.py | 2 +- + unix-ffi/uu/manifest.py | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + create mode 100644 unix-ffi/uu/manifest.py + +--- a/unix-ffi/email.message/manifest.py ++++ b/unix-ffi/email.message/manifest.py +@@ -1,7 +1,7 @@ + metadata(version="0.5.3") + + require("re", unix_ffi=True) +-require("uu") ++require("uu", unix_ffi=True) + require("base64") + require("binascii") + require("email.utils", unix_ffi=True) +--- /dev/null ++++ b/unix-ffi/uu/manifest.py +@@ -0,0 +1,6 @@ ++metadata(version="0.5.1") ++ ++require("binascii") ++require("os-path", unix_ffi=True) ++ ++module("uu.py", base_path="../../python-stdlib/uu") -- cgit v1.2.3