Update to U-Boot 2026.10. Remove the patch that has landed upstream.
Signed-off-by: Fabio Estevam <[email protected]> --- ...-removed-SWIG-Python-2-compatibility.patch | 55 ------------------- meta/recipes-bsp/u-boot/u-boot-common.inc | 3 +- ...ols_2026.07.bb => u-boot-tools_2026.10.bb} | 0 .../{u-boot_2026.07.bb => u-boot_2026.10.bb} | 0 4 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch rename meta/recipes-bsp/u-boot/{u-boot-tools_2026.07.bb => u-boot-tools_2026.10.bb} (100%) rename meta/recipes-bsp/u-boot/{u-boot_2026.07.bb => u-boot_2026.10.bb} (100%) diff --git a/meta/recipes-bsp/u-boot/files/0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch b/meta/recipes-bsp/u-boot/files/0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch deleted file mode 100644 index c1d0204e3290..000000000000 --- a/meta/recipes-bsp/u-boot/files/0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 886616d03b6afcc5ce8b34e7af91f7ccfbb0a5c Mon Sep 17 00:00:00 2001 -From: Jaipaul Cheernam <[email protected]> -Date: Tue, 11 Aug 2026 13:21:01 +0000 -Subject: [PATCH] pylibfdt: Replace removed SWIG Python 2 compatibility macros - -SWIG 4.5.0 removed Python 2 compatibility macros (PyInt_*, PyString_*) -from its runtime header pyhead.swg (see commit 79f7a2b7cb7d). Replace -them with their Python 3 C API equivalents: - -- PyString_FromString -> PyUnicode_FromString -- PyString_AsString -> PyBytes_AsString -- PyInt_AsLong -> PyLong_AsLong - -The replacements are safe since the macros were already aliased to -these exact functions in SWIG's Python 3 code path. - -This is a backport of dtc commit 5008d1d6a356 ("pylibfdt: Replace -removed SWIG Python 2 compatibility macros"). - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/2283713/] - -Signed-off-by: Jaipaul Cheernam <[email protected]> ---- - scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped -index e4659489..326a15c7 100644 ---- a/scripts/dtc/pylibfdt/libfdt.i_shipped -+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped -@@ -1033,7 +1033,7 @@ typedef uint32_t fdt32_t; - PyObject *buff; - - if ($1) { -- resultobj = PyString_FromString( -+ resultobj = PyUnicode_FromString( - fdt_string(fdt1, fdt32_to_cpu($1->nameoff))); - buff = PyByteArray_FromStringAndSize( - (const char *)($1 + 1), fdt32_to_cpu($1->len)); -@@ -1064,13 +1064,13 @@ typedef uint32_t fdt32_t; - } - $1 = PyBytes_AsString($input); - %#else -- $1 = PyString_AsString($input); /* char *str */ -+ $1 = PyBytes_AsString($input); /* char *str */ - %#endif - } - - /* typemaps used for fdt_next_node() */ - %typemap(in, numinputs=1) int *depth (int depth) { -- depth = (int) PyInt_AsLong($input); -+ depth = (int) PyLong_AsLong($input); - $1 = &depth; - } - diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index ece0fade551f..74aa61250841 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -14,10 +14,9 @@ CVE_PRODUCT = "u-boot:u-boot denx:u-boot" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "ece349ade2973e220f524ce59e59711cc919263f" +SRCREV = "5508406582f6f7120dce0c4b3059819a41788db2" SRC_URI = "git://git.u-boot-project.org/u-boot/u-boot.git;protocol=https;branch=main;tag=v${PV} \ - file://0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch \ file://0001-Add-support-for-OpenSSL-Provider-API.patch \ " diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2026.07.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2026.10.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot-tools_2026.07.bb rename to meta/recipes-bsp/u-boot/u-boot-tools_2026.10.bb diff --git a/meta/recipes-bsp/u-boot/u-boot_2026.07.bb b/meta/recipes-bsp/u-boot/u-boot_2026.10.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot_2026.07.bb rename to meta/recipes-bsp/u-boot/u-boot_2026.10.bb -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#247263): https://lists.openembedded.org/g/openembedded-core/message/247263 Mute This Topic: https://lists.openembedded.org/mt/121601271/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
