* [PATCH 0/3] swig: update from 4.2.1 to 4.3.0
@ 2024-12-05 9:32 Mikko Rapeli
2024-12-05 9:32 ` [PATCH 1/3] " Mikko Rapeli
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Mikko Rapeli @ 2024-12-05 9:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Mikko Rapeli
Ran into some issues with swig generated code and python 3.13
and prepared these but then the issues turned out to be something else.
Sending these out anyway but there may be something missing
and/or broken.
Compiled obvious swig users:
$ bitbake dtc swig-native u-boot libdnf python3-dtc lttng-tools gpgme libcap-ng-python
Mikko Rapeli (3):
swig: update from 4.2.1 to 4.3.0
python3-dtc: update from 1.7.0 to 1.7.2
dtc: update from 1.7.0 to 1.7.2
...erlay-make-overlay_get_target-public.patch | 132 ------------------
...hon3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} | 5 +-
.../swig/swig/determinism.patch | 8 +-
.../swig/{swig_4.2.1.bb => swig_4.3.0.bb} | 6 +-
...01-meson.build-bump-version-to-1.7.0.patch | 29 ----
...n-allow-building-from-shallow-clones.patch | 38 -----
.../dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb} | 4 +-
7 files changed, 10 insertions(+), 212 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} (84%)
rename meta/recipes-devtools/swig/{swig_4.2.1.bb => swig_4.3.0.bb} (87%)
delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch
delete mode 100644 meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
rename meta/recipes-kernel/dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb} (86%)
--
2.43.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/3] swig: update from 4.2.1 to 4.3.0
2024-12-05 9:32 [PATCH 0/3] swig: update from 4.2.1 to 4.3.0 Mikko Rapeli
@ 2024-12-05 9:32 ` Mikko Rapeli
2024-12-05 9:32 ` [PATCH 2/3] python3-dtc: update from 1.7.0 to 1.7.2 Mikko Rapeli
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Mikko Rapeli @ 2024-12-05 9:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Mikko Rapeli
Changes:
https://swig.org/
SWIG-4.3.0 summary:
Add experimental support for C as a target language.
MzScheme/Racket is deprecated and planned for removal in SWIG-4.4.
The distributed Windows binary is now a 64-bit executable.
Add some missing use of move semantics for performance improvements.
Enhanced handling of namespaces when using the nspace feature.
STL wrapper enhancements for std::unique_ptr, std::string_view,
std::filesystem.
Various enum and enum class wrapping improvements.
Other C++ handling improvements around templates, friends, C++11
trailing return types and C++17 fold expressions.
Many parser improvements for both C and C++, especially expressions.
Improvements to handling of string and character literals.
Minor preprocessor fixes.
Python: Stricter stable ABI conformance, add support for python-3.13.
C#: Add support for converting Doxygen comments into XML C# comments.
Various other target language specific enhancements and updates for
Java, Javascript, Lua, MzScheme, Ocaml, Octave, Perl, Python, R, Ruby.
Refresh determinism.patch for new version.
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
meta/recipes-devtools/swig/swig/determinism.patch | 8 ++++----
.../swig/{swig_4.2.1.bb => swig_4.3.0.bb} | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
rename meta/recipes-devtools/swig/{swig_4.2.1.bb => swig_4.3.0.bb} (87%)
diff --git a/meta/recipes-devtools/swig/swig/determinism.patch b/meta/recipes-devtools/swig/swig/determinism.patch
index 9c49414ad7..aed71dfb07 100644
--- a/meta/recipes-devtools/swig/swig/determinism.patch
+++ b/meta/recipes-devtools/swig/swig/determinism.patch
@@ -1,4 +1,4 @@
-From 28648b3873d83e26bd19b64ce2c0a41ced9292d3 Mon Sep 17 00:00:00 2001
+From e9b14eee91681b9ae4481c93b80b1a6154093d94 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 1 Mar 2021 00:11:10 +0000
Subject: [PATCH] swig: Fix reproducibility issue
@@ -13,12 +13,12 @@ RP 2021/3/1
1 file changed, 1 deletion(-)
diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
-index de0a512..ac9e825 100644
+index f68b609..0c2aba3 100644
--- a/Source/Modules/main.cxx
+++ b/Source/Modules/main.cxx
-@@ -638,7 +638,6 @@ static void getoptions(int argc, char *argv[]) {
+@@ -633,7 +633,6 @@ static void getoptions(int argc, char *argv[]) {
}
- } else if (strcmp(argv[i], "-version") == 0) {
+ } else if (strcmp(argv[i], "-version") == 0 || strcmp(argv[1], "--version") == 0) {
fprintf(stdout, "\nSWIG Version %s\n", Swig_package_version());
- fprintf(stdout, "\nCompiled with %s [%s]\n", SWIG_CXX, SWIG_PLATFORM);
fprintf(stdout, "\nConfigured options: %cpcre\n",
diff --git a/meta/recipes-devtools/swig/swig_4.2.1.bb b/meta/recipes-devtools/swig/swig_4.3.0.bb
similarity index 87%
rename from meta/recipes-devtools/swig/swig_4.2.1.bb
rename to meta/recipes-devtools/swig/swig_4.3.0.bb
index b564be9b36..dd7d0b4bb0 100644
--- a/meta/recipes-devtools/swig/swig_4.2.1.bb
+++ b/meta/recipes-devtools/swig/swig_4.3.0.bb
@@ -12,10 +12,10 @@ SECTION = "devel"
DEPENDS = "libpcre2 bison-native"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
- file://determinism.patch \
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
+ file://determinism.patch \
"
-SRC_URI[sha256sum] = "fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8"
+SRC_URI[sha256sum] = "f7203ef796f61af986c70c05816236cbd0d31b7aa9631e5ab53020ab7804aa9e"
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/"
UPSTREAM_CHECK_REGEX = "swig-(?P<pver>\d+(\.\d+)+)"
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] python3-dtc: update from 1.7.0 to 1.7.2
2024-12-05 9:32 [PATCH 0/3] swig: update from 4.2.1 to 4.3.0 Mikko Rapeli
2024-12-05 9:32 ` [PATCH 1/3] " Mikko Rapeli
@ 2024-12-05 9:32 ` Mikko Rapeli
2024-12-05 9:32 ` [PATCH 3/3] dtc: " Mikko Rapeli
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Mikko Rapeli @ 2024-12-05 9:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Mikko Rapeli
To fix compatibility with new swig version. Changes:
https://github.com/dgibson/dtc/releases/tag/v1.7.2
Changes since v1.7.1 include:
* Build
- Fix automatic dependency handling for paths with spaces in them
- Fix to allow compilation with swig 4.3.0
- Disable pointless warnings on swig generated code
* fdtoverlay
- Improve error message with missing /__symbols__
https://github.com/dgibson/dtc/releases/tag/v1.7.1
Changes sinve v1.7.0 include:
* dtc
* Fix check for 10-bit I2C addresses
* Improve documentation of -@ option
* Update to libyaml >= 0.2.3
* Improvements & fixes for device graph checks
* Add -L / --local-fixups option
* Add check for length of interrupt-map properties
* libfdt
* Add fdt_path_getprop_namelen()
* Add fdt_get_symbol() and fdt_get_symbol_namelen()
* Correct documentation of fdt_path_offset()
* Correct documentation of fdt_appendprop_addrrange()
* Validate aliases is fdt_get_alias_namelen()
* Don't overwrite phandles when applying overlays
* Require Python 3
* pylibfdt
* Support boolean properties
* Fixes for current Python versions
* General
* Assorted bugfixes
* Assorted build improvements
* Assorted typo fixes in docs
* Some additional testcases
* Move to GitHub Actions based CI
Drop revert patch. Will align dtc version with separate commit.
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
...erlay-make-overlay_get_target-public.patch | 132 ------------------
...hon3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} | 5 +-
2 files changed, 2 insertions(+), 135 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} (84%)
diff --git a/meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch b/meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
deleted file mode 100644
index a2df482e3a..0000000000
--- a/meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Wed, 19 Jan 2022 12:46:42 -0500
-Subject: [PATCH] Revert "libfdt: overlay: make overlay_get_target() public"
-
-This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb.
-
-Upstream-Status: Inappropriate [embedded specific]
-
----
- libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++-------
- libfdt/libfdt.h | 18 ------------------
- libfdt/version.lds | 1 -
- 3 files changed, 22 insertions(+), 26 deletions(-)
-
-diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
-index 5c0c398..d217e79 100644
---- a/libfdt/fdt_overlay.c
-+++ b/libfdt/fdt_overlay.c
-@@ -40,22 +40,37 @@ static uint32_t overlay_get_target_phandle(const void *fdto, int fragment)
- return fdt32_to_cpu(*val);
- }
-
--int fdt_overlay_target_offset(const void *fdt, const void *fdto,
-- int fragment_offset, char const **pathp)
-+/**
-+ * overlay_get_target - retrieves the offset of a fragment's target
-+ * @fdt: Base device tree blob
-+ * @fdto: Device tree overlay blob
-+ * @fragment: node offset of the fragment in the overlay
-+ * @pathp: pointer which receives the path of the target (or NULL)
-+ *
-+ * overlay_get_target() retrieves the target offset in the base
-+ * device tree of a fragment, no matter how the actual targeting is
-+ * done (through a phandle or a path)
-+ *
-+ * returns:
-+ * the targeted node offset in the base device tree
-+ * Negative error code on error
-+ */
-+static int overlay_get_target(const void *fdt, const void *fdto,
-+ int fragment, char const **pathp)
- {
- uint32_t phandle;
- const char *path = NULL;
- int path_len = 0, ret;
-
- /* Try first to do a phandle based lookup */
-- phandle = overlay_get_target_phandle(fdto, fragment_offset);
-+ phandle = overlay_get_target_phandle(fdto, fragment);
- if (phandle == (uint32_t)-1)
- return -FDT_ERR_BADPHANDLE;
-
- /* no phandle, try path */
- if (!phandle) {
- /* And then a path based lookup */
-- path = fdt_getprop(fdto, fragment_offset, "target-path", &path_len);
-+ path = fdt_getprop(fdto, fragment, "target-path", &path_len);
- if (path)
- ret = fdt_path_offset(fdt, path);
- else
-@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto)
- if (overlay < 0)
- return overlay;
-
-- target = fdt_overlay_target_offset(fdt, fdto, fragment, NULL);
-+ target = overlay_get_target(fdt, fdto, fragment, NULL);
- if (target < 0)
- return target;
-
-@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
- return -FDT_ERR_BADOVERLAY;
-
- /* get the target of the fragment */
-- ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path);
-+ ret = overlay_get_target(fdt, fdto, fragment, &target_path);
- if (ret < 0)
- return ret;
- target = ret;
-@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
-
- if (!target_path) {
- /* again in case setprop_placeholder changed it */
-- ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path);
-+ ret = overlay_get_target(fdt, fdto, fragment, &target_path);
- if (ret < 0)
- return ret;
- target = ret;
-diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
-index a7f432c..7f117e8 100644
---- a/libfdt/libfdt.h
-+++ b/libfdt/libfdt.h
-@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
- */
- int fdt_overlay_apply(void *fdt, void *fdto);
-
--/**
-- * fdt_overlay_target_offset - retrieves the offset of a fragment's target
-- * @fdt: Base device tree blob
-- * @fdto: Device tree overlay blob
-- * @fragment_offset: node offset of the fragment in the overlay
-- * @pathp: pointer which receives the path of the target (or NULL)
-- *
-- * fdt_overlay_target_offset() retrieves the target offset in the base
-- * device tree of a fragment, no matter how the actual targeting is
-- * done (through a phandle or a path)
-- *
-- * returns:
-- * the targeted node offset in the base device tree
-- * Negative error code on error
-- */
--int fdt_overlay_target_offset(const void *fdt, const void *fdto,
-- int fragment_offset, char const **pathp);
--
- /**********************************************************************/
- /* Debugging / informational functions */
- /**********************************************************************/
-diff --git a/libfdt/version.lds b/libfdt/version.lds
-index cbce5d4..7ab85f1 100644
---- a/libfdt/version.lds
-+++ b/libfdt/version.lds
-@@ -77,7 +77,6 @@ LIBFDT_1.2 {
- fdt_appendprop_addrrange;
- fdt_setprop_inplace_namelen_partial;
- fdt_create_with_flags;
-- fdt_overlay_target_offset;
- local:
- *;
- };
---
-2.19.1
-
diff --git a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb b/meta/recipes-devtools/python/python3-dtc_1.7.2.bb
similarity index 84%
rename from meta/recipes-devtools/python/python3-dtc_1.7.0.bb
rename to meta/recipes-devtools/python/python3-dtc_1.7.2.bb
index 85e48d4694..c301c9550f 100644
--- a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb
+++ b/meta/recipes-devtools/python/python3-dtc_1.7.2.bb
@@ -6,15 +6,14 @@ LICENSE = "GPL-2.0-only | BSD-2-Clause"
DEPENDS = "flex-native bison-native swig-native python3-setuptools-scm-native libyaml dtc"
-SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \
- file://0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch \
+SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main \
"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90"
-SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798"
+SRCREV = "2d10aa2afe35527728db30b35ec491ecb6959e5c"
S = "${WORKDIR}/git"
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] dtc: update from 1.7.0 to 1.7.2
2024-12-05 9:32 [PATCH 0/3] swig: update from 4.2.1 to 4.3.0 Mikko Rapeli
2024-12-05 9:32 ` [PATCH 1/3] " Mikko Rapeli
2024-12-05 9:32 ` [PATCH 2/3] python3-dtc: update from 1.7.0 to 1.7.2 Mikko Rapeli
@ 2024-12-05 9:32 ` Mikko Rapeli
2024-12-05 9:43 ` [OE-core] [PATCH 0/3] swig: update from 4.2.1 to 4.3.0 Martin Jansa
2024-12-05 15:07 ` Mikko Rapeli
4 siblings, 0 replies; 10+ messages in thread
From: Mikko Rapeli @ 2024-12-05 9:32 UTC (permalink / raw)
To: openembedded-core; +Cc: Mikko Rapeli
To align with python3-dtc version. Changes:
https://github.com/dgibson/dtc/releases/tag/v1.7.2
Changes since v1.7.1 include:
* Build
- Fix automatic dependency handling for paths with spaces in them
- Fix to allow compilation with swig 4.3.0
- Disable pointless warnings on swig generated code
* fdtoverlay
- Improve error message with missing /__symbols__
https://github.com/dgibson/dtc/releases/tag/v1.7.1
Changes sinve v1.7.0 include:
* dtc
* Fix check for 10-bit I2C addresses
* Improve documentation of -@ option
* Update to libyaml >= 0.2.3
* Improvements & fixes for device graph checks
* Add -L / --local-fixups option
* Add check for length of interrupt-map properties
* libfdt
* Add fdt_path_getprop_namelen()
* Add fdt_get_symbol() and fdt_get_symbol_namelen()
* Correct documentation of fdt_path_offset()
* Correct documentation of fdt_appendprop_addrrange()
* Validate aliases is fdt_get_alias_namelen()
* Don't overwrite phandles when applying overlays
* Require Python 3
* pylibfdt
* Support boolean properties
* Fixes for current Python versions
* General
* Assorted bugfixes
* Assorted build improvements
* Assorted typo fixes in docs
* Some additional testcases
* Move to GitHub Actions based CI
Drop patches which were upstreamed.
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
...01-meson.build-bump-version-to-1.7.0.patch | 29 --------------
...n-allow-building-from-shallow-clones.patch | 38 -------------------
.../dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb} | 4 +-
3 files changed, 1 insertion(+), 70 deletions(-)
delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch
delete mode 100644 meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
rename meta/recipes-kernel/dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb} (86%)
diff --git a/meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch b/meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch
deleted file mode 100644
index 79a3b92b44..0000000000
--- a/meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9153522103bd4ed7e3299c4d073f66bb37cb2d42 Mon Sep 17 00:00:00 2001
-From: Nikolay Letov <letov.nikolay@gmail.com>
-Date: Wed, 22 Feb 2023 13:36:07 +0300
-Subject: [PATCH 1/2] meson.build: bump version to 1.7.0
-
-[This was botched in the actual 1.7.0 release :( - David Gibson]
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=64a907f08b9bedd89833c1eee674148cff2343c6]
-
-Signed-off-by: Nikolay Letov <letov.nikolay@gmail.com>
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 78251eb..d88cd9f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,5 +1,5 @@
- project('dtc', 'c',
-- version: '1.6.0',
-+ version: '1.7.0',
- license: ['GPL2+', 'BSD-2'],
- default_options: 'werror=true',
- )
---
-2.30.2
-
diff --git a/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch b/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
deleted file mode 100644
index 0284905913..0000000000
--- a/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4415b0baece3c4351a6d3637c2754abbefd4795d Mon Sep 17 00:00:00 2001
-From: Peter Marko <peter.marko@siemens.com>
-Date: Sat, 16 Dec 2023 18:58:31 +0100
-Subject: [PATCH 2/2] meson: allow building from shallow clones
-
-When building from shallow clone, tag is not available
-and version defaults to git hash.
-Problem is that some builds check DTC version and fail the comparison.
-Example is https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
-Which fails to build with following error:
-dtc version too old (039a994), you need at least version 1.4.4
-
-Drop --always from git describe command, see
-https://github.com/mesonbuild/meson/blob/1.3.0/mesonbuild/utils/universal.py#L773
-This will make it more closer to build via Makefile.
-
-Upstream-Status: Submitted [https://github.com/dgibson/dtc/pull/122]
-
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index 78251eb..fc0c92a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -56,6 +56,7 @@ py = py.find_installation(required: get_option('python'))
- swig = find_program('swig', required: get_option('python'))
-
- version_gen_h = vcs_tag(
-+ command: ['git', 'describe', '--dirty=+'],
- input: 'version_gen.h.in',
- output: 'version_gen.h',
- )
---
-2.30.2
-
diff --git a/meta/recipes-kernel/dtc/dtc_1.7.0.bb b/meta/recipes-kernel/dtc/dtc_1.7.2.bb
similarity index 86%
rename from meta/recipes-kernel/dtc/dtc_1.7.0.bb
rename to meta/recipes-kernel/dtc/dtc_1.7.2.bb
index 0702fc16df..93668e5544 100644
--- a/meta/recipes-kernel/dtc/dtc_1.7.0.bb
+++ b/meta/recipes-kernel/dtc/dtc_1.7.2.bb
@@ -10,10 +10,8 @@ LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = " \
git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main;protocol=https \
- file://0001-meson.build-bump-version-to-1.7.0.patch \
- file://0002-meson-allow-building-from-shallow-clones.patch \
"
-SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798"
+SRCREV = "2d10aa2afe35527728db30b35ec491ecb6959e5c"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH 0/3] swig: update from 4.2.1 to 4.3.0
2024-12-05 9:32 [PATCH 0/3] swig: update from 4.2.1 to 4.3.0 Mikko Rapeli
` (2 preceding siblings ...)
2024-12-05 9:32 ` [PATCH 3/3] dtc: " Mikko Rapeli
@ 2024-12-05 9:43 ` Martin Jansa
2024-12-05 10:11 ` Mikko Rapeli
2024-12-05 15:07 ` Mikko Rapeli
4 siblings, 1 reply; 10+ messages in thread
From: Martin Jansa @ 2024-12-05 9:43 UTC (permalink / raw)
To: mikko.rapeli; +Cc: openembedded-core
Does this swig upgrade fix the issue with work around added in:
https://git.openembedded.org/meta-openembedded/commit/?id=f9158ce32fffa6f18eed4008c3295146c81d55ea
if yes, can you please send revert of this work around to meta-oe?
On Thu, Dec 5, 2024 at 10:33 AM Mikko Rapeli via
lists.openembedded.org
<mikko.rapeli=linaro.org@lists.openembedded.org> wrote:
>
> Ran into some issues with swig generated code and python 3.13
> and prepared these but then the issues turned out to be something else.
> Sending these out anyway but there may be something missing
> and/or broken.
>
> Compiled obvious swig users:
>
> $ bitbake dtc swig-native u-boot libdnf python3-dtc lttng-tools gpgme libcap-ng-python
>
> Mikko Rapeli (3):
> swig: update from 4.2.1 to 4.3.0
> python3-dtc: update from 1.7.0 to 1.7.2
> dtc: update from 1.7.0 to 1.7.2
>
> ...erlay-make-overlay_get_target-public.patch | 132 ------------------
> ...hon3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} | 5 +-
> .../swig/swig/determinism.patch | 8 +-
> .../swig/{swig_4.2.1.bb => swig_4.3.0.bb} | 6 +-
> ...01-meson.build-bump-version-to-1.7.0.patch | 29 ----
> ...n-allow-building-from-shallow-clones.patch | 38 -----
> .../dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb} | 4 +-
> 7 files changed, 10 insertions(+), 212 deletions(-)
> delete mode 100644 meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
> rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} (84%)
> rename meta/recipes-devtools/swig/{swig_4.2.1.bb => swig_4.3.0.bb} (87%)
> delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch
> delete mode 100644 meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
> rename meta/recipes-kernel/dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb} (86%)
>
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#208366): https://lists.openembedded.org/g/openembedded-core/message/208366
> Mute This Topic: https://lists.openembedded.org/mt/109936275/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH 0/3] swig: update from 4.2.1 to 4.3.0
2024-12-05 9:43 ` [OE-core] [PATCH 0/3] swig: update from 4.2.1 to 4.3.0 Martin Jansa
@ 2024-12-05 10:11 ` Mikko Rapeli
2024-12-05 10:39 ` Martin Jansa
0 siblings, 1 reply; 10+ messages in thread
From: Mikko Rapeli @ 2024-12-05 10:11 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
Hi,
On Thu, Dec 05, 2024 at 10:43:19AM +0100, Martin Jansa wrote:
> Does this swig upgrade fix the issue with work around added in:
> https://git.openembedded.org/meta-openembedded/commit/?id=f9158ce32fffa6f18eed4008c3295146c81d55ea
> if yes, can you please send revert of this work around to meta-oe?
Unfortunately no. Without f9158ce32fffa6f18eed4008c3295146 in meta-openembedded
python3-m2crypto fails:
| src/SWIG/_m2crypto_wrap.c: In function '_wrap_fd_set___fds_bits_set':
| src/SWIG/_m2crypto_wrap.c:11826:88: error: 'fd_set' has no member named '__fds_bits'; did you mean 'fds_bits'?
| 11826 | for (; ii < (size_t)1024/(8*(int) sizeof(__fd_mask)); ++ii) *(__fd_mask *)&arg1->__fds_bits[ii] = *((__fd_mask
*)arg2 + ii);
| | ^~~~~~~~~~
| | fds_bits
| src/SWIG/_m2crypto_wrap.c: In function '_wrap_fd_set___fds_bits_get':
| src/SWIG/_m2crypto_wrap.c:11851:48: error: 'fd_set' has no member named '__fds_bits'; did you mean 'fds_bits'?
| 11851 | result = (__fd_mask *)(__fd_mask *) ((arg1)->__fds_bits);
| | ^~~~~~~~~~
| | fds_bits
With workaround f9158ce32fffa6f18eed4008c3295146c build passes.
Cheers,
-Mikko
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH 0/3] swig: update from 4.2.1 to 4.3.0
2024-12-05 10:11 ` Mikko Rapeli
@ 2024-12-05 10:39 ` Martin Jansa
0 siblings, 0 replies; 10+ messages in thread
From: Martin Jansa @ 2024-12-05 10:39 UTC (permalink / raw)
To: Mikko Rapeli; +Cc: openembedded-core, peter.marko, Khem Raj
On Thu, Dec 5, 2024 at 11:11 AM Mikko Rapeli <mikko.rapeli@linaro.org> wrote:
>
> Hi,
>
> On Thu, Dec 05, 2024 at 10:43:19AM +0100, Martin Jansa wrote:
> > Does this swig upgrade fix the issue with work around added in:
> > https://git.openembedded.org/meta-openembedded/commit/?id=f9158ce32fffa6f18eed4008c3295146c81d55ea
> > if yes, can you please send revert of this work around to meta-oe?
>
> Unfortunately no. Without f9158ce32fffa6f18eed4008c3295146 in meta-openembedded
> python3-m2crypto fails:
>
> | src/SWIG/_m2crypto_wrap.c: In function '_wrap_fd_set___fds_bits_set':
> | src/SWIG/_m2crypto_wrap.c:11826:88: error: 'fd_set' has no member named '__fds_bits'; did you mean 'fds_bits'?
> | 11826 | for (; ii < (size_t)1024/(8*(int) sizeof(__fd_mask)); ++ii) *(__fd_mask *)&arg1->__fds_bits[ii] = *((__fd_mask
> *)arg2 + ii);
> | | ^~~~~~~~~~
> | | fds_bits
> | src/SWIG/_m2crypto_wrap.c: In function '_wrap_fd_set___fds_bits_get':
> | src/SWIG/_m2crypto_wrap.c:11851:48: error: 'fd_set' has no member named '__fds_bits'; did you mean 'fds_bits'?
> | 11851 | result = (__fd_mask *)(__fd_mask *) ((arg1)->__fds_bits);
> | | ^~~~~~~~~~
> | | fds_bits
>
> With workaround f9158ce32fffa6f18eed4008c3295146c build passes.
Thank you for checking.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/3] swig: update from 4.2.1 to 4.3.0
2024-12-05 9:32 [PATCH 0/3] swig: update from 4.2.1 to 4.3.0 Mikko Rapeli
` (3 preceding siblings ...)
2024-12-05 9:43 ` [OE-core] [PATCH 0/3] swig: update from 4.2.1 to 4.3.0 Martin Jansa
@ 2024-12-05 15:07 ` Mikko Rapeli
2024-12-05 15:13 ` [OE-core] " Alexander Kanavin
4 siblings, 1 reply; 10+ messages in thread
From: Mikko Rapeli @ 2024-12-05 15:07 UTC (permalink / raw)
To: openembedded-core
Hi,
These changes are already in master-next from Alexander Kanavin <alex@linutronix.de>.
Sorry about the noise. I should check email archives and master-next before working
with updates or bug fixes. Maybe even check bugzilla too :)
Cheers,
-Mikko
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH 0/3] swig: update from 4.2.1 to 4.3.0
2024-12-05 15:07 ` Mikko Rapeli
@ 2024-12-05 15:13 ` Alexander Kanavin
2024-12-05 15:20 ` Mikko Rapeli
0 siblings, 1 reply; 10+ messages in thread
From: Alexander Kanavin @ 2024-12-05 15:13 UTC (permalink / raw)
To: mikko.rapeli; +Cc: openembedded-core
It would still help to rebase your patches on top of mine. Sometimes
those duplicate commits contain additional useful tweaks that would
otherwise be lost.
Alex
On Thu, 5 Dec 2024 at 16:08, Mikko Rapeli via lists.openembedded.org
<mikko.rapeli=linaro.org@lists.openembedded.org> wrote:
>
> Hi,
>
> These changes are already in master-next from Alexander Kanavin <alex@linutronix.de>.
> Sorry about the noise. I should check email archives and master-next before working
> with updates or bug fixes. Maybe even check bugzilla too :)
>
> Cheers,
>
> -Mikko
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#208382): https://lists.openembedded.org/g/openembedded-core/message/208382
> Mute This Topic: https://lists.openembedded.org/mt/109936275/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [OE-core] [PATCH 0/3] swig: update from 4.2.1 to 4.3.0
2024-12-05 15:13 ` [OE-core] " Alexander Kanavin
@ 2024-12-05 15:20 ` Mikko Rapeli
0 siblings, 0 replies; 10+ messages in thread
From: Mikko Rapeli @ 2024-12-05 15:20 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: openembedded-core
Hi,
On Thu, Dec 05, 2024 at 04:13:39PM +0100, Alexander Kanavin wrote:
> It would still help to rebase your patches on top of mine. Sometimes
> those duplicate commits contain additional useful tweaks that would
> otherwise be lost.
I checked the details, commits are the same :)
Cheers,
-Mikko
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-12-05 15:20 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-05 9:32 [PATCH 0/3] swig: update from 4.2.1 to 4.3.0 Mikko Rapeli
2024-12-05 9:32 ` [PATCH 1/3] " Mikko Rapeli
2024-12-05 9:32 ` [PATCH 2/3] python3-dtc: update from 1.7.0 to 1.7.2 Mikko Rapeli
2024-12-05 9:32 ` [PATCH 3/3] dtc: " Mikko Rapeli
2024-12-05 9:43 ` [OE-core] [PATCH 0/3] swig: update from 4.2.1 to 4.3.0 Martin Jansa
2024-12-05 10:11 ` Mikko Rapeli
2024-12-05 10:39 ` Martin Jansa
2024-12-05 15:07 ` Mikko Rapeli
2024-12-05 15:13 ` [OE-core] " Alexander Kanavin
2024-12-05 15:20 ` Mikko Rapeli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox