micropython-lib: update to 1.23.0 and fix compile on external mbedtls3

* update micropython-lib to hash for 1.23.0
* remove micropython-lib unix-uffi patches

Co-authored-by: Jeffery To <jeffery.to@gmail.com>

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
(cherry picked from commit 4c751e454c)
This commit is contained in:
Glenn Strauss
2024-07-25 02:44:12 -04:00
committed by Tianling Shen
parent 722443d5e8
commit 0c20a9e187
4 changed files with 9 additions and 96 deletions

View File

@@ -9,16 +9,19 @@
import manifestfile
import mpy_cross
@@ -310,7 +310,7 @@ def build(output_path, hash_prefix_len,
@@ -310,7 +310,10 @@ def build(output_path, hash_prefix_len,
# For now, don't process unix-ffi. In the future this can be extended to
# allow a way to request unix-ffi packages via mip.
- lib_dirs = ["micropython", "python-stdlib", "python-ecosys"]
+ lib_dirs = ["unix-ffi"] if unix_ffi else ["micropython", "python-stdlib", "python-ecosys"]
+
+ if unix_ffi:
+ manifestfile.BASE_LIBRARY_NAMES = ("unix-ffi",) + manifestfile.BASE_LIBRARY_NAMES
mpy_version, _mpy_sub_version = mpy_cross.mpy_version(mpy_cross=mpy_cross_path)
mpy_version = str(mpy_version)
@@ -438,6 +438,7 @@ def main():
@@ -438,6 +441,7 @@ def main():
cmd_parser = argparse.ArgumentParser(description="Compile micropython-lib for serving to mip.")
cmd_parser.add_argument("--output", required=True, help="output directory")
@@ -26,7 +29,7 @@
cmd_parser.add_argument("--hash-prefix", default=8, type=int, help="hash prefix length")
cmd_parser.add_argument("--mpy-cross", default=None, help="optional path to mpy-cross binary")
cmd_parser.add_argument("--micropython", default=None, help="path to micropython repo")
@@ -447,7 +448,7 @@ def main():
@@ -447,7 +451,7 @@ def main():
sys.path.append(os.path.join(args.micropython, "tools")) # for manifestfile
sys.path.append(os.path.join(args.micropython, "mpy-cross")) # for mpy_cross