Skip to contentSkip to conversation

u-boot: fix pylibfdt build with swig 4.5.0

PATCH In review Ryan Eatmon 2 participants 2 messages Aug 18

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 u-boot: fix pylibfdt build with swig 4.5.0

A recent change in oe-core [1] updated the version of SWIG which caused a build error in u-boot. This was fixed by adding a patch [2] in oe-core for u-boot which we are copying into our u-boot recipes as well.

[1]
https://git.openembedded.org/openembedded-core/commit/?id=84476421d9ccfcc1d2714026ad7caa6ca901853b
[2] https://git.openembedded.org/openembedded-core/commit/?id=299a82a9c909b73a9b93877d6c1b381ec8f83b04

---
 .../u-boot/u-boot-bb.org_2024.10.bb           |  1 +
 .../u-boot/u-boot-bb.org_2025.10.bb           |  2 +
 ...-removed-SWIG-Python-2-compatibility.patch | 55 +++++++++++++++++++
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc  |  5 +-
 4 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/files/0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch
meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb +1 -0
index 389893b0..23a5a3af 100644
@@ -7,6 +7,7 @@ COMPATIBLE_MACHINE = "beagle.*"
 PV = "2024.10"
 
 SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch"
+SRC_URI += "file://0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch"
 
 UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
 UBOOT_GIT_PROTOCOL = "https"
meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.10.bb +2 -0
index 1c4f0691..a6284193 100644
@@ -18,3 +18,5 @@ SRCREV:pocketbeagle2-k3r5 = "4e0b6294a1185029d34eff6ed91f3ad1734b643f"
 
 SRC_URI:append:pocketbeagle2 = " file://bootcmd-ti-mmc.cfg"
 SRC_URI:append:beaglebone = " file://0001-arm-dts-am335x-pocketbeagle-Add-tick-timer.patch"
+
+SRC_URI += "file://0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch"
meta-ti-bsp/recipes-bsp/u-boot/files/0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch new file +55 -0

55 lines not on this page · raw message

meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +4 -1
index 1c3efebb..9c760854 100644
@@ -10,7 +10,7 @@ require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
 
 include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:${THISDIR}/files:"
 
 FILES:${PN}-falcon = "boot/tifalcon.bin"
 
@@ -25,6 +25,9 @@ UBOOT_GIT_PROTOCOL ?= "https"
 UBOOT_GIT_BRANCH ?= "branch=${BRANCH}"
 SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};${UBOOT_GIT_BRANCH};name=uboot"
 
+SRC_URI:append:bsp-ti-6_12 = " file://0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch"
+SRC_URI:append:bsp-ti-6_18 = " file://0001-pylibfdt-Replace-removed-SWIG-Python-2-compatibility.patch"
+
 # Match the meta-ti trusted-firmware-a specific changes to memory locations
 # for bl33 and k3 hardware.
 TI_K3_TFA_CFG_FILES = "\
Signature · 1 line
2.43.0
#1 lore raw

meta-ti / na / 20260818200537.3961166-1-reatmon

PRC Results: FAIL

=========================================================
check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
All patches passed

=========================================================
apply-yocto-patch: FAIL
=========================================================
master
=====================
Summary:
- Patch Series: [meta-ti][master][PATCH] u-boot: fix pylibfdt build with swig 4.5.0
- Submitter: From: Ryan Eatmon <[email protected]>
+From: Jaipaul Cheernam <[email protected]>
- Date: Date: Tue, 18 Aug 2026 15:05:37 -0500
+Date: Tue, 11 Aug 2026 13:21:01 +0000
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: 137c44d8b5dc03638c36d68d7bfbb8566ef99e6a

Applied to:
- Repository: lcpd-prc-meta-ti
- Base Branch: master
- Commit Author: LCPD Automation Script <[email protected]>
- Commit Subject: CI/CD Auto-Merger: cicd.master.202608122200
- Commit SHA: 9b61f80281b2f3d1c48be8086c9cea6e1c93c083

Patches
----------------------------------------
FAIL - [meta-ti][master][PATCH] u-boot: fix pylibfdt build with swig 4.5.0
.git/rebase-apply/patch:68: space before tab in indent.
PyObject *buff;
.git/rebase-apply/patch:69: trailing whitespace.

.git/rebase-apply/patch:70: space before tab in indent.
if ($1) {
.git/rebase-apply/patch:73: space before tab in indent.
fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
.git/rebase-apply/patch:74: space before tab in indent.
buff = PyByteArray_FromStringAndSize(
error: patch failed: meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc:25
error: meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc: patch does not apply
Applying: u-boot: fix pylibfdt build with swig 4.5.0
Patch failed at 0001 u-boot: fix pylibfdt build with swig 4.5.0