diff --git a/backport-scripts-dtc-pylibfdt-libfdt-i-shipped-Use-SWIG-AppendOutput.patch b/backport-scripts-dtc-pylibfdt-libfdt-i-shipped-Use-SWIG-AppendOutput.patch new file mode 100644 index 0000000000000000000000000000000000000000..a78b64d5ee560df785910e01fb06680b29ff1b95 --- /dev/null +++ b/backport-scripts-dtc-pylibfdt-libfdt-i-shipped-Use-SWIG-AppendOutput.patch @@ -0,0 +1,57 @@ +From a63456b9191fae2fe49f4b121e025792022e3950 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Wed, 30 Oct 2024 06:07:16 +0100 +Subject: [PATCH] scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Swig has changed language specific AppendOutput functions. The helper +macro SWIG_AppendOutput remains unchanged. Use that instead +of SWIG_Python_AppendOutput, which would require an extra parameter +since swig 4.3.0. + +/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds +| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’: +| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’ +| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val); +| | ^~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Markus Volk +Reported-by: Rudi Heitbaum +Link: https://github.com/dgibson/dtc/pull/154 +--- + 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 56cc5d48f4f9..e4659489a96a 100644 +--- a/scripts/dtc/pylibfdt/libfdt.i_shipped ++++ b/scripts/dtc/pylibfdt/libfdt.i_shipped +@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t; + fdt_string(fdt1, fdt32_to_cpu($1->nameoff))); + buff = PyByteArray_FromStringAndSize( + (const char *)($1 + 1), fdt32_to_cpu($1->len)); +- resultobj = SWIG_Python_AppendOutput(resultobj, buff); ++ resultobj = SWIG_AppendOutput(resultobj, buff); + } + } + +@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t; + + %typemap(argout) int *depth { + PyObject *val = Py_BuildValue("i", *arg$argnum); +- resultobj = SWIG_Python_AppendOutput(resultobj, val); ++ resultobj = SWIG_AppendOutput(resultobj, val); + } + + %apply int *depth { int *depth }; +@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t; + if (PyTuple_GET_SIZE(resultobj) == 0) + resultobj = val; + else +- resultobj = SWIG_Python_AppendOutput(resultobj, val); ++ resultobj = SWIG_AppendOutput(resultobj, val); + } + } + diff --git a/uboot-tools.spec b/uboot-tools.spec index c9ebe4edd5e71670c03c2009b52e7c58ccecab78..9a95a0d050b96c20e328e3a27c77e5e52eb76435 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -3,7 +3,7 @@ Name: uboot-tools Version: 2024.01 -Release: 1 +Release: 2 Summary: tools for U-Boot License: GPL-2.0-or-later and Public Domain and GPL-2.0-only URL: http://www.denx.de/wiki/U-Boot @@ -17,6 +17,7 @@ Patch3: backport-Provide-a-fallback-to-smbios-tables.patch Patch4: backport-enable-bootmenu-by-default.patch Patch5: backport-uefi-Boot-var-automatic-management-for-removable-medias.patch Patch6: backport-rockchip-Add-initial-support-for-the-PinePhone-Pro.patch +Patch7: backport-scripts-dtc-pylibfdt-libfdt-i-shipped-Use-SWIG-AppendOutput.patch BuildRequires: bc dtc gcc make flex bison git-core openssl-devel BuildRequires: python3-unversioned-command python3-devel python3-setuptools @@ -221,6 +222,9 @@ install -p -m 0755 %{SOURCE2} %{buildroot}/lib/kernel/install.d/ %{_mandir}/man1/mkimage.1* %changelog +* Wed Jan 22 2025 lingsheng - 2024.01-2 +- fix build with swig 4.3.0 + * Thu Feb 29 2024 xingwei - 2024.01-1 - Type:requirement - ID:NA