All of lore.kernel.org
 help / color / mirror / Atom feed
From: Fabio Estevam <festevam@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Fabio Estevam <festevam@gmail.com>
Subject: [PATCH] u-boot: upgrade 2026.07 -> 2026.10
Date: Mon,  5 Oct 2026 19:40:43 -0300	[thread overview]
Message-ID: <20261005224043.2044227-1-festevam@gmail.com> (raw)

Update to U-Boot 2026.10.

Remove the patch that has landed upstream.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 ...-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 <jaipaul.cheernam@est.tech>
-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 <jaipaul.cheernam@est.tech>
----
- 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



                 reply	other threads:[~2026-10-05 22:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261005224043.2044227-1-festevam@gmail.com \
    --to=festevam@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.