* [OE-core][PATCH 1/4 v2] python3-trove-classifiers: upgrade 2024.7.2 -> 2024.9.12
@ 2024-09-24 14:59 Trevor Gamblin
2024-09-24 14:59 ` [OE-core][PATCH 2/4 v2] python3-pytest: upgrade 8.3.2 -> 8.3.3 Trevor Gamblin
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Trevor Gamblin @ 2024-09-24 14:59 UTC (permalink / raw)
To: openembedded-core
Changelog (https://github.com/pypa/trove-classifiers/releases):
- Add Odoo 18 trove classifier (#187)
ptest output:
|root@qemux86-64:~# ptest-runner python3-trove-classifiers
|START: ptest-runner
|2024-09-24T12:45
|BEGIN: /usr/lib/python3-trove-classifiers/ptest
|PASS: tests/test_classifiers.py:test_success[classifiers0-deprecated_classifiers0]
|PASS: tests/test_classifiers.py:test_success[classifiers1-deprecated_classifiers1]
|PASS: tests/test_classifiers.py:test_failure[classifiers0-deprecated_classifiers0-Top-level classifier 'Foo' is invalid]
|PASS: tests/test_classifiers.py:test_failure[classifiers1-deprecated_classifiers1-Classifier 'Foo :: Bar' is missing]
|PASS: tests/test_classifiers.py:test_failure[classifiers2-deprecated_classifiers2-Classifier 'Bing :: Bang' does not exist]
|PASS: tests/test_classifiers.py:test_failure[classifiers3-deprecated_classifiers3-Classifier 'Foo :: Bar' in both valid and deprecated classifiers]
|PASS: tests/test_classifiers.py:test_failure[classifiers4-deprecated_classifiers4-Classifiers starting with 'Private' are invalid]
|PASS: tests/test_classifiers.py:test_failure[classifiers5-deprecated_classifiers5-Classifiers starting with 'Private' are invalid]
|PASS: tests/test_classifiers.py:test_failure[classifiers6-deprecated_classifiers6-Classifiers starting with 'Private' are invalid]
|PASS: tests/test_classifiers.py:test_failure[classifiers7-deprecated_classifiers7-Classifiers starting with 'Private' are invalid]
|PASS: tests/test_classifiers.py:test_failure[classifiers8-deprecated_classifiers8-Classifiers starting or ending with whitespace are invalid]
|PASS: tests/test_classifiers.py:test_failure[classifiers9-deprecated_classifiers9-Classifiers starting or ending with whitespace are invalid]
|PASS: tests/test_classifiers.py:test_failure[classifiers10-deprecated_classifiers10-Classifiers containing ':' are invalid]
|PASS: tests/test_classifiers.py:test_failure[classifiers11-deprecated_classifiers11-Classifiers containing ':' are invalid]
|PASS: tests/test_classifiers.py:test_failure[classifiers12-deprecated_classifiers12-Classifiers containing ':' are invalid]
|============================================================================
|Testsuite summary
|# TOTAL: 15
|# PASS: 15
|# SKIP: 0
|# XFAIL: 0
|# FAIL: 0
|# XPASS: 0
|# ERROR: 0
|DURATION: 0
|END: /usr/lib/python3-trove-classifiers/ptest
|2024-09-24T12:45
|STOP: ptest-runner
|TOTAL: 1 FAIL: 0
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
v2 adds the missing signoff.
...fiers_2024.7.2.bb => python3-trove-classifiers_2024.9.12.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-trove-classifiers_2024.7.2.bb => python3-trove-classifiers_2024.9.12.bb} (87%)
diff --git a/meta/recipes-devtools/python/python3-trove-classifiers_2024.7.2.bb b/meta/recipes-devtools/python/python3-trove-classifiers_2024.9.12.bb
similarity index 87%
rename from meta/recipes-devtools/python/python3-trove-classifiers_2024.7.2.bb
rename to meta/recipes-devtools/python/python3-trove-classifiers_2024.9.12.bb
index 934c6d4be0d..c3a4eea1c77 100644
--- a/meta/recipes-devtools/python/python3-trove-classifiers_2024.7.2.bb
+++ b/meta/recipes-devtools/python/python3-trove-classifiers_2024.9.12.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pypa/trove-classifiers"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-SRC_URI[sha256sum] = "8328f2ac2ce3fd773cbb37c765a0ed7a83f89dc564c7d452f039b69249d0ac35"
+SRC_URI[sha256sum] = "4b46b3e134a4d01999ac5bc6e528afcc10cc48f0f724f185f267e276005768f4"
PYPI_PACKAGE = "trove_classifiers"
--
2.39.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [OE-core][PATCH 2/4 v2] python3-pytest: upgrade 8.3.2 -> 8.3.3
2024-09-24 14:59 [OE-core][PATCH 1/4 v2] python3-trove-classifiers: upgrade 2024.7.2 -> 2024.9.12 Trevor Gamblin
@ 2024-09-24 14:59 ` Trevor Gamblin
2024-09-24 15:00 ` [OE-core][PATCH 3/4 v2] python3-hypothesis: upgrade 6.111.2 -> 6.112.1 Trevor Gamblin
2024-09-24 15:00 ` [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1 Trevor Gamblin
2 siblings, 0 replies; 11+ messages in thread
From: Trevor Gamblin @ 2024-09-24 14:59 UTC (permalink / raw)
To: openembedded-core
Changelog (https://docs.pytest.org/en/stable/changelog.html):
Bug fixes
#12446: Avoid calling @property (and other instance descriptors) during fixture discovery – by @asottile
#12659: Fixed the issue of not displaying assertion failure differences when using the parameter --import-mode=importlib in pytest>=8.1.
#12667: Fixed a regression where type change in ExceptionInfo.errisinstance caused mypy to fail.
#12744: Fixed typing compatibility with Python 3.9 or less – replaced typing.Self with typing_extensions.Self – by @Avasam
#12745: Fixed an issue with backslashes being incorrectly converted in nodeid paths on Windows, ensuring consistent path handling across environments.
#6682: Fixed bug where the verbosity levels where not being respected when printing the “msg” part of failed assertion (as in assert condition, msg).
#9422: Fix bug where disabling the terminal plugin via -p no:terminal would cause crashes related to missing the verbose option.
– by @GTowers1
Improved documentation
#12663: Clarify that the pytest_deselected hook should be called from pytest_collection_modifyitems hook implementations when items are deselected.
#12678: Remove erroneous quotes from tmp_path_retention_policy example in docs.
Miscellaneous internal changes
#12769: Fix typos discovered by codespell and add codespell to pre-commit hooks.
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
v2 adds the missing signoff.
.../python/{python3-pytest_8.3.2.bb => python3-pytest_8.3.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-pytest_8.3.2.bb => python3-pytest_8.3.3.bb} (91%)
diff --git a/meta/recipes-devtools/python/python3-pytest_8.3.2.bb b/meta/recipes-devtools/python/python3-pytest_8.3.3.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-pytest_8.3.2.bb
rename to meta/recipes-devtools/python/python3-pytest_8.3.3.bb
index 459d91f1beb..dbd984208d6 100644
--- a/meta/recipes-devtools/python/python3-pytest_8.3.2.bb
+++ b/meta/recipes-devtools/python/python3-pytest_8.3.3.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c"
-SRC_URI[sha256sum] = "c132345d12ce551242c87269de812483f5bcc87cdbb4722e48487ba194f9fdce"
+SRC_URI[sha256sum] = "70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181"
DEPENDS += "python3-setuptools-scm-native"
--
2.39.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [OE-core][PATCH 3/4 v2] python3-hypothesis: upgrade 6.111.2 -> 6.112.1
2024-09-24 14:59 [OE-core][PATCH 1/4 v2] python3-trove-classifiers: upgrade 2024.7.2 -> 2024.9.12 Trevor Gamblin
2024-09-24 14:59 ` [OE-core][PATCH 2/4 v2] python3-pytest: upgrade 8.3.2 -> 8.3.3 Trevor Gamblin
@ 2024-09-24 15:00 ` Trevor Gamblin
2024-09-24 15:00 ` [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1 Trevor Gamblin
2 siblings, 0 replies; 11+ messages in thread
From: Trevor Gamblin @ 2024-09-24 15:00 UTC (permalink / raw)
To: openembedded-core
Changelog (https://hypothesis.readthedocs.io/en/latest/changes.html):
6.112.1 - 2024-09-13
This patch removes a now-incorrect internal assertion about numpy’s
typing after recent numpy changes (currently only in numpy’s nightly
release).
6.112.0 - 2024-09-05
This release adds support for variable-width bytes in our IR layer
(issue #3921), which should mean improved performance anywhere you use
binary(). If you maintain an alternative backend as part of our (for now
explicitly unstable) Alternative backends for Hypothesis, this release
changes the draw_* interface and may be a breaking change for you.
ptest output:
|root@qemux86-64:~# ptest-runner python3-hypothesis
|START: ptest-runner
|2024-09-24T13:22
|BEGIN: /usr/lib/python3-hypothesis/ptest
|PASS: examples/test_binary_search.py:test_insert_is_sorted
|PASS: examples/test_binary_search.py:test_is_minimal
|PASS: examples/test_binary_search.py:test_inserts_into_same_place_twice
|PASS: examples/test_rle.py:test_decodes_to_starting_sequence
|PASS: examples/test_rle.py:test_duplicating_an_element_does_not_increase_length
|============================================================================
|Testsuite summary
|# TOTAL: 5
|# PASS: 5
|# SKIP: 0
|# XFAIL: 0
|# FAIL: 0
|# XPASS: 0
|# ERROR: 0
|DURATION: 1
|END: /usr/lib/python3-hypothesis/ptest
|2024-09-24T13:22
|STOP: ptest-runner
|TOTAL: 1 FAIL: 0
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
v2 adds the missing signoff.
...hon3-hypothesis_6.111.2.bb => python3-hypothesis_6.112.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-hypothesis_6.111.2.bb => python3-hypothesis_6.112.1.bb} (91%)
diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.111.2.bb b/meta/recipes-devtools/python/python3-hypothesis_6.112.1.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-hypothesis_6.111.2.bb
rename to meta/recipes-devtools/python/python3-hypothesis_6.112.1.bb
index 3da0ce8c045..e4b7b53579f 100644
--- a/meta/recipes-devtools/python/python3-hypothesis_6.111.2.bb
+++ b/meta/recipes-devtools/python/python3-hypothesis_6.112.1.bb
@@ -13,7 +13,7 @@ SRC_URI += " \
file://test_rle.py \
"
-SRC_URI[sha256sum] = "0496ad28c7240ee9ba89fcc7fb1dc74e89f3e40fbcbbb5f73c0091558dec8e6e"
+SRC_URI[sha256sum] = "b070d7a1bb9bd84706c31885c9aeddc138e2b36a9c112a91984f49501c567856"
RDEPENDS:${PN} += " \
python3-attrs \
--
2.39.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1
2024-09-24 14:59 [OE-core][PATCH 1/4 v2] python3-trove-classifiers: upgrade 2024.7.2 -> 2024.9.12 Trevor Gamblin
2024-09-24 14:59 ` [OE-core][PATCH 2/4 v2] python3-pytest: upgrade 8.3.2 -> 8.3.3 Trevor Gamblin
2024-09-24 15:00 ` [OE-core][PATCH 3/4 v2] python3-hypothesis: upgrade 6.111.2 -> 6.112.1 Trevor Gamblin
@ 2024-09-24 15:00 ` Trevor Gamblin
2024-09-26 11:50 ` Ross Burton
2 siblings, 1 reply; 11+ messages in thread
From: Trevor Gamblin @ 2024-09-24 15:00 UTC (permalink / raw)
To: openembedded-core
Patch '0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch'
had to be adjusted to apply on the latest version.
Changelog:
99031e3 (tag: v1.7.1, origin/master, origin/main, origin/HEAD, master) Bump version to v1.7.1
3d5e376 setup: Move setting of srcdir down to the bottom
e277553 setup: Collect top-level code together
7e5a889 setup: Move version and full_description into a function
78b6a85 Tidy up some pylint warnings
3501d37 Require Python 3
bcd02b5 fdtoverlay: remove wrong singular article in a comment
84b056a checks: relax graph checks for overlays
1df7b04 pylibfdt/Makefile.pylibfdt: use project's flags to compile the extension
61e88fd libfdt: overlay: Fix phandle overwrite check for new subtrees
49d3089 meson: fix installation with meson-python
d54aaf9 pylibfdt: clean up python build directory
ab86f1e pylibfdt: add VERSION.txt to Python sdist
7b8a30e pylibfdt: fix Python version
ff4f17e pylibfdt/Makefile.pylibfdt: fix Python library being rebuild during install
9e313b1 pylibfdt/meson.build: fix Python library being rebuilt during install
d598fc3 tests/run_tests.sh: fix Meson library path being dropped
b98239d tests/meson.build: fix python and yaml tests not running
c17d76a checks: Check the overall length of "interrupt-map"
ae26223 libfdt: overlay: Refactor overlay_fixup_phandle
4dd831a libfdt: tests: Update test case for overlay_bad_fixup
e6d2942 tests: Remove two_roots and named_root from LIBTREE_TESTS_L and add all dtb filenames generated by dumptrees to TESTS_TREES_L in Makefile.tests
855c934 tests: fix tests broken under Meson
4fd3f4f github: enforce testing pylibfdt and yaml support
9ca7d62 meson: split run-tests by type
bb51223 meson: fix dependencies of tests
e819006 meson: fix pylibfdt missing dependency on libfdt
8221238 pylibfdt: fix get_mem_rsv for newer Python versions
1fad065 libfdt: overlay: ensure that existing phandles are not overwritten
b0aacd0 github: add windows/msys CI build
ae97d97 github: Don't accidentally suppress test errors
057a7db github: Display meson test logs on failure
92b5d4e pylibfdt: Remove some apparently deprecated options from setup.py
417e329 github: Update to newer checkout action
5e6cefa fix MinGW format attribute
24f6001 libfdt: Simplify adjustment of values for local fixups
da39ee0 libfdt: rework shared/static libraries
a669223 Makefile: do not hardcode the `install` program path
3fbfdd0 libfdt: fix duplicate meson target
dcef5f8 tests: use correct pkg-config when cross compiling
0b8026f meson: allow building from shallow clones
95c74d7 treesource: Restore string list output when no type markers
2283dd7 libfdt: fdt_path_offset_namelen: Reject empty path
79b9e32 libfdt: fdt_get_alias_namelen: Validate aliases
52157f1 pylibfdt: Support boolean properties
d774337 dtc: fix missing string in usage_opts_help
ad8bf9f libfdt: Fix fdt_appendprop_addrrange documentation
6c5e189 github: add workflow for Meson builds
a3dc9f0 libfdt: rename libfdt-X.Y.Z.so to libfdt.so.X.Y.Z
3501994 workflows: build: remove setuptools_scm hack
cd3e230 pylibfdt: use fallback version in tarballs
0f58645 move release version into VERSION.txt
3816595 libfdt: add missing version symbols
5e98b59 editorconfig: use tab indentation for version.lds
d030a89 tests: generate dtbs in Meson build directory
8d8372b tests: fix use of deprecated meson methods
761114e pylibtfdt: fix use of deprecated meson method
bf6377a meson: set minimum Meson version to 0.56.0
4c68e4b libfdt: fix library version to match project version
bdc5c87 meson: allow disabling tests
f088e38 Makefile: allow to install libfdt without building executables
6df5328 Fix use of <ctype.h> functions
ccf1f62 libfdt: Fix a typo in libfdt.h
71a8b8e libfdt: meson: Fix linking on macOS linker
589d8c7 dtc: Add an option to generate __local_fixups__ and __fixups__
e836466 CI: Add build matrix with multiple Linux distributions
3b02a94 dtc: Correct invalid dts output with mixed phandles and integers
d488895 tests: Add additional tests for device graph checks
ea3b9a1 checks: Fix crash in graph_child_address if 'reg' cell size != 1
b2b9671 livetree: fix off-by-one in propval_cell_n() bounds check
ab481e4 Add definition for a GitHub Actions CI job
c88038c Drop obsolete/broken CI definitions
0ac8b30 yaml: Depend on libyaml >= 0.2.3
f1657b2 tests: Add test cases for bad endpoint node and remote-endpoint prop checks
44bb89c checks: Fix segmentation fault in check_graph_node
60bcf1c improve documentation for fdt_path_offset()
a6f997b add fdt_get_symbol() and fdt_get_symbol_namelen() functions
18f5ec1 use fdt_path_getprop_namelen() in fdt_get_alias_namelen()
df09327 add fdt_path_getprop_namelen() helper
129bb4b doc: dt-object-internal: Fix a typo
390f481 fdtoverlay: Drop a a repeated article
9f8b382 manual: Fix and improve documentation about -@
2cdf93a fdtoverlay: Fix usage string to not mention "<type>"
72fc810 build-sys: add -Wwrite-strings
083ab26 tests: fix leaks spotted by ASAN
6f8b28f livetree: fix leak spotted by ASAN
fd68bb8 Make name_node() xstrdup its name argument
4718189 Delay xstrdup() of node and property names coming from a flat tree
0b842c3 Make build_property() xstrdup its name argument
9cceabe checks: correct I2C 10-bit address check
0d56145 yamltree.c: fix -Werror=discarded-qualifiers & -Werror=cast-qual
61fa22b checks: make check.data const
7a1d72a checks.c: fix check_msg() leak
ee57999 checks.c: fix heap-buffer-overflow
44c9b73 tests: fix -Wwrite-strings
5b60f51 srcpos.c: fix -Wwrite-strings
32174a6 meson: Fix cell overflow tests when running from meson
64a907f meson.build: bump version to 1.7.0
e3cde06 Add -Wsuggest-attribute=format warning, correct warnings thus generated
4182182 Use #ifdef NO_VALGRIND
71c19f2 Do not redefine _GNU_SOURCE if already set
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
v2 adds my signoff to the carried patch, which was adjusted to apply on
v1.7.1.
...erlay-make-overlay_get_target-public.patch | 25 +++++++++++--------
...hon3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} | 2 +-
2 files changed, 15 insertions(+), 12 deletions(-)
rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} (94%)
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
index a2df482e3aa..70dd93f7471 100644
--- 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
@@ -1,4 +1,4 @@
-From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001
+From 20b224b8ab1837778dfd0e7171643a5d26675f95 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"
@@ -7,6 +7,9 @@ This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb.
Upstream-Status: Inappropriate [embedded specific]
+Adjust to apply on v1.7.1.
+
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++-------
libfdt/libfdt.h | 18 ------------------
@@ -14,7 +17,7 @@ Upstream-Status: Inappropriate [embedded specific]
3 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
-index 5c0c398..d217e79 100644
+index 28b667f..e6e9382 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)
@@ -59,7 +62,7 @@ index 5c0c398..d217e79 100644
if (path)
ret = fdt_path_offset(fdt, path);
else
-@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto)
+@@ -848,7 +863,7 @@ static int overlay_merge(void *fdt, void *fdto)
if (overlay < 0)
return overlay;
@@ -68,7 +71,7 @@ index 5c0c398..d217e79 100644
if (target < 0)
return target;
-@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
+@@ -991,7 +1006,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
return -FDT_ERR_BADOVERLAY;
/* get the target of the fragment */
@@ -77,7 +80,7 @@ index 5c0c398..d217e79 100644
if (ret < 0)
return ret;
target = ret;
-@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
+@@ -1013,7 +1028,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
if (!target_path) {
/* again in case setprop_placeholder changed it */
@@ -87,10 +90,10 @@ index 5c0c398..d217e79 100644
return ret;
target = ret;
diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
-index a7f432c..7f117e8 100644
+index 0677fea..c72337b 100644
--- a/libfdt/libfdt.h
+++ b/libfdt/libfdt.h
-@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
+@@ -2184,24 +2184,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
*/
int fdt_overlay_apply(void *fdt, void *fdto);
@@ -116,7 +119,7 @@ index a7f432c..7f117e8 100644
/* Debugging / informational functions */
/**********************************************************************/
diff --git a/libfdt/version.lds b/libfdt/version.lds
-index cbce5d4..7ab85f1 100644
+index 989cd89..ae5f8c6 100644
--- a/libfdt/version.lds
+++ b/libfdt/version.lds
@@ -77,7 +77,6 @@ LIBFDT_1.2 {
@@ -124,9 +127,9 @@ index cbce5d4..7ab85f1 100644
fdt_setprop_inplace_namelen_partial;
fdt_create_with_flags;
- fdt_overlay_target_offset;
+ fdt_get_symbol;
+ fdt_get_symbol_namelen;
local:
- *;
- };
--
-2.19.1
+2.39.5
diff --git a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
similarity index 94%
rename from meta/recipes-devtools/python/python3-dtc_1.7.0.bb
rename to meta/recipes-devtools/python/python3-dtc_1.7.1.bb
index 85e48d46942..269095bd8c9 100644
--- a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb
+++ b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
@@ -14,7 +14,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90"
-SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798"
+SRCREV = "99031e3a4a6e479466ae795790b44727434ca27d"
S = "${WORKDIR}/git"
--
2.39.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1
2024-09-24 15:00 ` [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1 Trevor Gamblin
@ 2024-09-26 11:50 ` Ross Burton
2024-09-26 11:51 ` Ross Burton
2024-09-26 17:02 ` Khem Raj
0 siblings, 2 replies; 11+ messages in thread
From: Ross Burton @ 2024-09-26 11:50 UTC (permalink / raw)
To: Trevor Gamblin; +Cc: openembedded-core@lists.openembedded.org
This breaks meta-virt, which uses python3-dtc in its build:
Traceback (most recent call last):
File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/bin/lopper", line 8, in <module>
sys.exit(main())
^^^^^^
File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/__main__.py", line 220, in main
import lopper.fdt
File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/fdt.py", line 46, in <module>
import libfdt
File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/libfdt.py", line 12, in <module>
import _libfdt
ImportError: [...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/_libfdt.cpython-312-x86_64-linux-gnu.so: undefined symbol: fdt_get_symbol
Ross
> On 24 Sep 2024, at 16:00, Trevor Gamblin via lists.openembedded.org <tgamblin=baylibre.com@lists.openembedded.org> wrote:
>
> Patch '0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch'
> had to be adjusted to apply on the latest version.
>
> Changelog:
>
> 99031e3 (tag: v1.7.1, origin/master, origin/main, origin/HEAD, master) Bump version to v1.7.1
> 3d5e376 setup: Move setting of srcdir down to the bottom
> e277553 setup: Collect top-level code together
> 7e5a889 setup: Move version and full_description into a function
> 78b6a85 Tidy up some pylint warnings
> 3501d37 Require Python 3
> bcd02b5 fdtoverlay: remove wrong singular article in a comment
> 84b056a checks: relax graph checks for overlays
> 1df7b04 pylibfdt/Makefile.pylibfdt: use project's flags to compile the extension
> 61e88fd libfdt: overlay: Fix phandle overwrite check for new subtrees
> 49d3089 meson: fix installation with meson-python
> d54aaf9 pylibfdt: clean up python build directory
> ab86f1e pylibfdt: add VERSION.txt to Python sdist
> 7b8a30e pylibfdt: fix Python version
> ff4f17e pylibfdt/Makefile.pylibfdt: fix Python library being rebuild during install
> 9e313b1 pylibfdt/meson.build: fix Python library being rebuilt during install
> d598fc3 tests/run_tests.sh: fix Meson library path being dropped
> b98239d tests/meson.build: fix python and yaml tests not running
> c17d76a checks: Check the overall length of "interrupt-map"
> ae26223 libfdt: overlay: Refactor overlay_fixup_phandle
> 4dd831a libfdt: tests: Update test case for overlay_bad_fixup
> e6d2942 tests: Remove two_roots and named_root from LIBTREE_TESTS_L and add all dtb filenames generated by dumptrees to TESTS_TREES_L in Makefile.tests
> 855c934 tests: fix tests broken under Meson
> 4fd3f4f github: enforce testing pylibfdt and yaml support
> 9ca7d62 meson: split run-tests by type
> bb51223 meson: fix dependencies of tests
> e819006 meson: fix pylibfdt missing dependency on libfdt
> 8221238 pylibfdt: fix get_mem_rsv for newer Python versions
> 1fad065 libfdt: overlay: ensure that existing phandles are not overwritten
> b0aacd0 github: add windows/msys CI build
> ae97d97 github: Don't accidentally suppress test errors
> 057a7db github: Display meson test logs on failure
> 92b5d4e pylibfdt: Remove some apparently deprecated options from setup.py
> 417e329 github: Update to newer checkout action
> 5e6cefa fix MinGW format attribute
> 24f6001 libfdt: Simplify adjustment of values for local fixups
> da39ee0 libfdt: rework shared/static libraries
> a669223 Makefile: do not hardcode the `install` program path
> 3fbfdd0 libfdt: fix duplicate meson target
> dcef5f8 tests: use correct pkg-config when cross compiling
> 0b8026f meson: allow building from shallow clones
> 95c74d7 treesource: Restore string list output when no type markers
> 2283dd7 libfdt: fdt_path_offset_namelen: Reject empty path
> 79b9e32 libfdt: fdt_get_alias_namelen: Validate aliases
> 52157f1 pylibfdt: Support boolean properties
> d774337 dtc: fix missing string in usage_opts_help
> ad8bf9f libfdt: Fix fdt_appendprop_addrrange documentation
> 6c5e189 github: add workflow for Meson builds
> a3dc9f0 libfdt: rename libfdt-X.Y.Z.so to libfdt.so.X.Y.Z
> 3501994 workflows: build: remove setuptools_scm hack
> cd3e230 pylibfdt: use fallback version in tarballs
> 0f58645 move release version into VERSION.txt
> 3816595 libfdt: add missing version symbols
> 5e98b59 editorconfig: use tab indentation for version.lds
> d030a89 tests: generate dtbs in Meson build directory
> 8d8372b tests: fix use of deprecated meson methods
> 761114e pylibtfdt: fix use of deprecated meson method
> bf6377a meson: set minimum Meson version to 0.56.0
> 4c68e4b libfdt: fix library version to match project version
> bdc5c87 meson: allow disabling tests
> f088e38 Makefile: allow to install libfdt without building executables
> 6df5328 Fix use of <ctype.h> functions
> ccf1f62 libfdt: Fix a typo in libfdt.h
> 71a8b8e libfdt: meson: Fix linking on macOS linker
> 589d8c7 dtc: Add an option to generate __local_fixups__ and __fixups__
> e836466 CI: Add build matrix with multiple Linux distributions
> 3b02a94 dtc: Correct invalid dts output with mixed phandles and integers
> d488895 tests: Add additional tests for device graph checks
> ea3b9a1 checks: Fix crash in graph_child_address if 'reg' cell size != 1
> b2b9671 livetree: fix off-by-one in propval_cell_n() bounds check
> ab481e4 Add definition for a GitHub Actions CI job
> c88038c Drop obsolete/broken CI definitions
> 0ac8b30 yaml: Depend on libyaml >= 0.2.3
> f1657b2 tests: Add test cases for bad endpoint node and remote-endpoint prop checks
> 44bb89c checks: Fix segmentation fault in check_graph_node
> 60bcf1c improve documentation for fdt_path_offset()
> a6f997b add fdt_get_symbol() and fdt_get_symbol_namelen() functions
> 18f5ec1 use fdt_path_getprop_namelen() in fdt_get_alias_namelen()
> df09327 add fdt_path_getprop_namelen() helper
> 129bb4b doc: dt-object-internal: Fix a typo
> 390f481 fdtoverlay: Drop a a repeated article
> 9f8b382 manual: Fix and improve documentation about -@
> 2cdf93a fdtoverlay: Fix usage string to not mention "<type>"
> 72fc810 build-sys: add -Wwrite-strings
> 083ab26 tests: fix leaks spotted by ASAN
> 6f8b28f livetree: fix leak spotted by ASAN
> fd68bb8 Make name_node() xstrdup its name argument
> 4718189 Delay xstrdup() of node and property names coming from a flat tree
> 0b842c3 Make build_property() xstrdup its name argument
> 9cceabe checks: correct I2C 10-bit address check
> 0d56145 yamltree.c: fix -Werror=discarded-qualifiers & -Werror=cast-qual
> 61fa22b checks: make check.data const
> 7a1d72a checks.c: fix check_msg() leak
> ee57999 checks.c: fix heap-buffer-overflow
> 44c9b73 tests: fix -Wwrite-strings
> 5b60f51 srcpos.c: fix -Wwrite-strings
> 32174a6 meson: Fix cell overflow tests when running from meson
> 64a907f meson.build: bump version to 1.7.0
> e3cde06 Add -Wsuggest-attribute=format warning, correct warnings thus generated
> 4182182 Use #ifdef NO_VALGRIND
> 71c19f2 Do not redefine _GNU_SOURCE if already set
>
> Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
> ---
> v2 adds my signoff to the carried patch, which was adjusted to apply on
> v1.7.1.
>
> ...erlay-make-overlay_get_target-public.patch | 25 +++++++++++--------
> ...hon3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} | 2 +-
> 2 files changed, 15 insertions(+), 12 deletions(-)
> rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} (94%)
>
> 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
> index a2df482e3aa..70dd93f7471 100644
> --- 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
> @@ -1,4 +1,4 @@
> -From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001
> +From 20b224b8ab1837778dfd0e7171643a5d26675f95 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"
> @@ -7,6 +7,9 @@ This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb.
>
> Upstream-Status: Inappropriate [embedded specific]
>
> +Adjust to apply on v1.7.1.
> +
> +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
> ---
> libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++-------
> libfdt/libfdt.h | 18 ------------------
> @@ -14,7 +17,7 @@ Upstream-Status: Inappropriate [embedded specific]
> 3 files changed, 22 insertions(+), 26 deletions(-)
>
> diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
> -index 5c0c398..d217e79 100644
> +index 28b667f..e6e9382 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)
> @@ -59,7 +62,7 @@ index 5c0c398..d217e79 100644
> if (path)
> ret = fdt_path_offset(fdt, path);
> else
> -@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto)
> +@@ -848,7 +863,7 @@ static int overlay_merge(void *fdt, void *fdto)
> if (overlay < 0)
> return overlay;
>
> @@ -68,7 +71,7 @@ index 5c0c398..d217e79 100644
> if (target < 0)
> return target;
>
> -@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
> +@@ -991,7 +1006,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
> return -FDT_ERR_BADOVERLAY;
>
> /* get the target of the fragment */
> @@ -77,7 +80,7 @@ index 5c0c398..d217e79 100644
> if (ret < 0)
> return ret;
> target = ret;
> -@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
> +@@ -1013,7 +1028,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
>
> if (!target_path) {
> /* again in case setprop_placeholder changed it */
> @@ -87,10 +90,10 @@ index 5c0c398..d217e79 100644
> return ret;
> target = ret;
> diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
> -index a7f432c..7f117e8 100644
> +index 0677fea..c72337b 100644
> --- a/libfdt/libfdt.h
> +++ b/libfdt/libfdt.h
> -@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
> +@@ -2184,24 +2184,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
> */
> int fdt_overlay_apply(void *fdt, void *fdto);
>
> @@ -116,7 +119,7 @@ index a7f432c..7f117e8 100644
> /* Debugging / informational functions */
> /**********************************************************************/
> diff --git a/libfdt/version.lds b/libfdt/version.lds
> -index cbce5d4..7ab85f1 100644
> +index 989cd89..ae5f8c6 100644
> --- a/libfdt/version.lds
> +++ b/libfdt/version.lds
> @@ -77,7 +77,6 @@ LIBFDT_1.2 {
> @@ -124,9 +127,9 @@ index cbce5d4..7ab85f1 100644
> fdt_setprop_inplace_namelen_partial;
> fdt_create_with_flags;
> - fdt_overlay_target_offset;
> + fdt_get_symbol;
> + fdt_get_symbol_namelen;
> local:
> - *;
> - };
> --
> -2.19.1
> +2.39.5
>
> diff --git a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
> similarity index 94%
> rename from meta/recipes-devtools/python/python3-dtc_1.7.0.bb
> rename to meta/recipes-devtools/python/python3-dtc_1.7.1.bb
> index 85e48d46942..269095bd8c9 100644
> --- a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb
> +++ b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
> @@ -14,7 +14,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
>
> LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90"
>
> -SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798"
> +SRCREV = "99031e3a4a6e479466ae795790b44727434ca27d"
>
> S = "${WORKDIR}/git"
>
> --
> 2.39.5
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#204876): https://lists.openembedded.org/g/openembedded-core/message/204876
> Mute This Topic: https://lists.openembedded.org/mt/108629987/6875888
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ross.burton@arm.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1
2024-09-26 11:50 ` Ross Burton
@ 2024-09-26 11:51 ` Ross Burton
2024-09-26 12:34 ` Trevor Gamblin
[not found] ` <17F8CB639310258B.14701@lists.openembedded.org>
2024-09-26 17:02 ` Khem Raj
1 sibling, 2 replies; 11+ messages in thread
From: Ross Burton @ 2024-09-26 11:51 UTC (permalink / raw)
To: Trevor Gamblin; +Cc: openembedded-core@lists.openembedded.org
I suspect the problem is the rebase of the symbol visibility patch went wrong?
Ross
> On 26 Sep 2024, at 12:50, Ross Burton <ross.burton@arm.com> wrote:
>
> This breaks meta-virt, which uses python3-dtc in its build:
>
> Traceback (most recent call last):
> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/bin/lopper", line 8, in <module>
> sys.exit(main())
> ^^^^^^
> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/__main__.py", line 220, in main
> import lopper.fdt
> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/fdt.py", line 46, in <module>
> import libfdt
> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/libfdt.py", line 12, in <module>
> import _libfdt
> ImportError: [...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/_libfdt.cpython-312-x86_64-linux-gnu.so: undefined symbol: fdt_get_symbol
>
> Ross
>
>> On 24 Sep 2024, at 16:00, Trevor Gamblin via lists.openembedded.org <tgamblin=baylibre.com@lists.openembedded.org> wrote:
>>
>> Patch '0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch'
>> had to be adjusted to apply on the latest version.
>>
>> Changelog:
>>
>> 99031e3 (tag: v1.7.1, origin/master, origin/main, origin/HEAD, master) Bump version to v1.7.1
>> 3d5e376 setup: Move setting of srcdir down to the bottom
>> e277553 setup: Collect top-level code together
>> 7e5a889 setup: Move version and full_description into a function
>> 78b6a85 Tidy up some pylint warnings
>> 3501d37 Require Python 3
>> bcd02b5 fdtoverlay: remove wrong singular article in a comment
>> 84b056a checks: relax graph checks for overlays
>> 1df7b04 pylibfdt/Makefile.pylibfdt: use project's flags to compile the extension
>> 61e88fd libfdt: overlay: Fix phandle overwrite check for new subtrees
>> 49d3089 meson: fix installation with meson-python
>> d54aaf9 pylibfdt: clean up python build directory
>> ab86f1e pylibfdt: add VERSION.txt to Python sdist
>> 7b8a30e pylibfdt: fix Python version
>> ff4f17e pylibfdt/Makefile.pylibfdt: fix Python library being rebuild during install
>> 9e313b1 pylibfdt/meson.build: fix Python library being rebuilt during install
>> d598fc3 tests/run_tests.sh: fix Meson library path being dropped
>> b98239d tests/meson.build: fix python and yaml tests not running
>> c17d76a checks: Check the overall length of "interrupt-map"
>> ae26223 libfdt: overlay: Refactor overlay_fixup_phandle
>> 4dd831a libfdt: tests: Update test case for overlay_bad_fixup
>> e6d2942 tests: Remove two_roots and named_root from LIBTREE_TESTS_L and add all dtb filenames generated by dumptrees to TESTS_TREES_L in Makefile.tests
>> 855c934 tests: fix tests broken under Meson
>> 4fd3f4f github: enforce testing pylibfdt and yaml support
>> 9ca7d62 meson: split run-tests by type
>> bb51223 meson: fix dependencies of tests
>> e819006 meson: fix pylibfdt missing dependency on libfdt
>> 8221238 pylibfdt: fix get_mem_rsv for newer Python versions
>> 1fad065 libfdt: overlay: ensure that existing phandles are not overwritten
>> b0aacd0 github: add windows/msys CI build
>> ae97d97 github: Don't accidentally suppress test errors
>> 057a7db github: Display meson test logs on failure
>> 92b5d4e pylibfdt: Remove some apparently deprecated options from setup.py
>> 417e329 github: Update to newer checkout action
>> 5e6cefa fix MinGW format attribute
>> 24f6001 libfdt: Simplify adjustment of values for local fixups
>> da39ee0 libfdt: rework shared/static libraries
>> a669223 Makefile: do not hardcode the `install` program path
>> 3fbfdd0 libfdt: fix duplicate meson target
>> dcef5f8 tests: use correct pkg-config when cross compiling
>> 0b8026f meson: allow building from shallow clones
>> 95c74d7 treesource: Restore string list output when no type markers
>> 2283dd7 libfdt: fdt_path_offset_namelen: Reject empty path
>> 79b9e32 libfdt: fdt_get_alias_namelen: Validate aliases
>> 52157f1 pylibfdt: Support boolean properties
>> d774337 dtc: fix missing string in usage_opts_help
>> ad8bf9f libfdt: Fix fdt_appendprop_addrrange documentation
>> 6c5e189 github: add workflow for Meson builds
>> a3dc9f0 libfdt: rename libfdt-X.Y.Z.so to libfdt.so.X.Y.Z
>> 3501994 workflows: build: remove setuptools_scm hack
>> cd3e230 pylibfdt: use fallback version in tarballs
>> 0f58645 move release version into VERSION.txt
>> 3816595 libfdt: add missing version symbols
>> 5e98b59 editorconfig: use tab indentation for version.lds
>> d030a89 tests: generate dtbs in Meson build directory
>> 8d8372b tests: fix use of deprecated meson methods
>> 761114e pylibtfdt: fix use of deprecated meson method
>> bf6377a meson: set minimum Meson version to 0.56.0
>> 4c68e4b libfdt: fix library version to match project version
>> bdc5c87 meson: allow disabling tests
>> f088e38 Makefile: allow to install libfdt without building executables
>> 6df5328 Fix use of <ctype.h> functions
>> ccf1f62 libfdt: Fix a typo in libfdt.h
>> 71a8b8e libfdt: meson: Fix linking on macOS linker
>> 589d8c7 dtc: Add an option to generate __local_fixups__ and __fixups__
>> e836466 CI: Add build matrix with multiple Linux distributions
>> 3b02a94 dtc: Correct invalid dts output with mixed phandles and integers
>> d488895 tests: Add additional tests for device graph checks
>> ea3b9a1 checks: Fix crash in graph_child_address if 'reg' cell size != 1
>> b2b9671 livetree: fix off-by-one in propval_cell_n() bounds check
>> ab481e4 Add definition for a GitHub Actions CI job
>> c88038c Drop obsolete/broken CI definitions
>> 0ac8b30 yaml: Depend on libyaml >= 0.2.3
>> f1657b2 tests: Add test cases for bad endpoint node and remote-endpoint prop checks
>> 44bb89c checks: Fix segmentation fault in check_graph_node
>> 60bcf1c improve documentation for fdt_path_offset()
>> a6f997b add fdt_get_symbol() and fdt_get_symbol_namelen() functions
>> 18f5ec1 use fdt_path_getprop_namelen() in fdt_get_alias_namelen()
>> df09327 add fdt_path_getprop_namelen() helper
>> 129bb4b doc: dt-object-internal: Fix a typo
>> 390f481 fdtoverlay: Drop a a repeated article
>> 9f8b382 manual: Fix and improve documentation about -@
>> 2cdf93a fdtoverlay: Fix usage string to not mention "<type>"
>> 72fc810 build-sys: add -Wwrite-strings
>> 083ab26 tests: fix leaks spotted by ASAN
>> 6f8b28f livetree: fix leak spotted by ASAN
>> fd68bb8 Make name_node() xstrdup its name argument
>> 4718189 Delay xstrdup() of node and property names coming from a flat tree
>> 0b842c3 Make build_property() xstrdup its name argument
>> 9cceabe checks: correct I2C 10-bit address check
>> 0d56145 yamltree.c: fix -Werror=discarded-qualifiers & -Werror=cast-qual
>> 61fa22b checks: make check.data const
>> 7a1d72a checks.c: fix check_msg() leak
>> ee57999 checks.c: fix heap-buffer-overflow
>> 44c9b73 tests: fix -Wwrite-strings
>> 5b60f51 srcpos.c: fix -Wwrite-strings
>> 32174a6 meson: Fix cell overflow tests when running from meson
>> 64a907f meson.build: bump version to 1.7.0
>> e3cde06 Add -Wsuggest-attribute=format warning, correct warnings thus generated
>> 4182182 Use #ifdef NO_VALGRIND
>> 71c19f2 Do not redefine _GNU_SOURCE if already set
>>
>> Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
>> ---
>> v2 adds my signoff to the carried patch, which was adjusted to apply on
>> v1.7.1.
>>
>> ...erlay-make-overlay_get_target-public.patch | 25 +++++++++++--------
>> ...hon3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} | 2 +-
>> 2 files changed, 15 insertions(+), 12 deletions(-)
>> rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} (94%)
>>
>> 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
>> index a2df482e3aa..70dd93f7471 100644
>> --- 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
>> @@ -1,4 +1,4 @@
>> -From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001
>> +From 20b224b8ab1837778dfd0e7171643a5d26675f95 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"
>> @@ -7,6 +7,9 @@ This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb.
>>
>> Upstream-Status: Inappropriate [embedded specific]
>>
>> +Adjust to apply on v1.7.1.
>> +
>> +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
>> ---
>> libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++-------
>> libfdt/libfdt.h | 18 ------------------
>> @@ -14,7 +17,7 @@ Upstream-Status: Inappropriate [embedded specific]
>> 3 files changed, 22 insertions(+), 26 deletions(-)
>>
>> diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
>> -index 5c0c398..d217e79 100644
>> +index 28b667f..e6e9382 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)
>> @@ -59,7 +62,7 @@ index 5c0c398..d217e79 100644
>> if (path)
>> ret = fdt_path_offset(fdt, path);
>> else
>> -@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto)
>> +@@ -848,7 +863,7 @@ static int overlay_merge(void *fdt, void *fdto)
>> if (overlay < 0)
>> return overlay;
>>
>> @@ -68,7 +71,7 @@ index 5c0c398..d217e79 100644
>> if (target < 0)
>> return target;
>>
>> -@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
>> +@@ -991,7 +1006,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
>> return -FDT_ERR_BADOVERLAY;
>>
>> /* get the target of the fragment */
>> @@ -77,7 +80,7 @@ index 5c0c398..d217e79 100644
>> if (ret < 0)
>> return ret;
>> target = ret;
>> -@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
>> +@@ -1013,7 +1028,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
>>
>> if (!target_path) {
>> /* again in case setprop_placeholder changed it */
>> @@ -87,10 +90,10 @@ index 5c0c398..d217e79 100644
>> return ret;
>> target = ret;
>> diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
>> -index a7f432c..7f117e8 100644
>> +index 0677fea..c72337b 100644
>> --- a/libfdt/libfdt.h
>> +++ b/libfdt/libfdt.h
>> -@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
>> +@@ -2184,24 +2184,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
>> */
>> int fdt_overlay_apply(void *fdt, void *fdto);
>>
>> @@ -116,7 +119,7 @@ index a7f432c..7f117e8 100644
>> /* Debugging / informational functions */
>> /**********************************************************************/
>> diff --git a/libfdt/version.lds b/libfdt/version.lds
>> -index cbce5d4..7ab85f1 100644
>> +index 989cd89..ae5f8c6 100644
>> --- a/libfdt/version.lds
>> +++ b/libfdt/version.lds
>> @@ -77,7 +77,6 @@ LIBFDT_1.2 {
>> @@ -124,9 +127,9 @@ index cbce5d4..7ab85f1 100644
>> fdt_setprop_inplace_namelen_partial;
>> fdt_create_with_flags;
>> - fdt_overlay_target_offset;
>> + fdt_get_symbol;
>> + fdt_get_symbol_namelen;
>> local:
>> - *;
>> - };
>> --
>> -2.19.1
>> +2.39.5
>>
>> diff --git a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
>> similarity index 94%
>> rename from meta/recipes-devtools/python/python3-dtc_1.7.0.bb
>> rename to meta/recipes-devtools/python/python3-dtc_1.7.1.bb
>> index 85e48d46942..269095bd8c9 100644
>> --- a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb
>> +++ b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
>> @@ -14,7 +14,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
>>
>> LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90"
>>
>> -SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798"
>> +SRCREV = "99031e3a4a6e479466ae795790b44727434ca27d"
>>
>> S = "${WORKDIR}/git"
>>
>> --
>> 2.39.5
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#204876): https://lists.openembedded.org/g/openembedded-core/message/204876
>> Mute This Topic: https://lists.openembedded.org/mt/108629987/6875888
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ross.burton@arm.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1
2024-09-26 11:51 ` Ross Burton
@ 2024-09-26 12:34 ` Trevor Gamblin
[not found] ` <17F8CB639310258B.14701@lists.openembedded.org>
1 sibling, 0 replies; 11+ messages in thread
From: Trevor Gamblin @ 2024-09-26 12:34 UTC (permalink / raw)
To: Ross Burton; +Cc: openembedded-core@lists.openembedded.org
On 2024-09-26 07:51, Ross Burton wrote:
> I suspect the problem is the rebase of the symbol visibility patch went wrong?
Possibly. I'll take another look.
>
> Ross
>
>> On 26 Sep 2024, at 12:50, Ross Burton <ross.burton@arm.com> wrote:
>>
>> This breaks meta-virt, which uses python3-dtc in its build:
>>
>> Traceback (most recent call last):
>> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/bin/lopper", line 8, in <module>
>> sys.exit(main())
>> ^^^^^^
>> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/__main__.py", line 220, in main
>> import lopper.fdt
>> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/fdt.py", line 46, in <module>
>> import libfdt
>> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/libfdt.py", line 12, in <module>
>> import _libfdt
>> ImportError: [...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/_libfdt.cpython-312-x86_64-linux-gnu.so: undefined symbol: fdt_get_symbol
>>
>> Ross
>>
>>> On 24 Sep 2024, at 16:00, Trevor Gamblin via lists.openembedded.org <tgamblin=baylibre.com@lists.openembedded.org> wrote:
>>>
>>> Patch '0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch'
>>> had to be adjusted to apply on the latest version.
>>>
>>> Changelog:
>>>
>>> 99031e3 (tag: v1.7.1, origin/master, origin/main, origin/HEAD, master) Bump version to v1.7.1
>>> 3d5e376 setup: Move setting of srcdir down to the bottom
>>> e277553 setup: Collect top-level code together
>>> 7e5a889 setup: Move version and full_description into a function
>>> 78b6a85 Tidy up some pylint warnings
>>> 3501d37 Require Python 3
>>> bcd02b5 fdtoverlay: remove wrong singular article in a comment
>>> 84b056a checks: relax graph checks for overlays
>>> 1df7b04 pylibfdt/Makefile.pylibfdt: use project's flags to compile the extension
>>> 61e88fd libfdt: overlay: Fix phandle overwrite check for new subtrees
>>> 49d3089 meson: fix installation with meson-python
>>> d54aaf9 pylibfdt: clean up python build directory
>>> ab86f1e pylibfdt: add VERSION.txt to Python sdist
>>> 7b8a30e pylibfdt: fix Python version
>>> ff4f17e pylibfdt/Makefile.pylibfdt: fix Python library being rebuild during install
>>> 9e313b1 pylibfdt/meson.build: fix Python library being rebuilt during install
>>> d598fc3 tests/run_tests.sh: fix Meson library path being dropped
>>> b98239d tests/meson.build: fix python and yaml tests not running
>>> c17d76a checks: Check the overall length of "interrupt-map"
>>> ae26223 libfdt: overlay: Refactor overlay_fixup_phandle
>>> 4dd831a libfdt: tests: Update test case for overlay_bad_fixup
>>> e6d2942 tests: Remove two_roots and named_root from LIBTREE_TESTS_L and add all dtb filenames generated by dumptrees to TESTS_TREES_L in Makefile.tests
>>> 855c934 tests: fix tests broken under Meson
>>> 4fd3f4f github: enforce testing pylibfdt and yaml support
>>> 9ca7d62 meson: split run-tests by type
>>> bb51223 meson: fix dependencies of tests
>>> e819006 meson: fix pylibfdt missing dependency on libfdt
>>> 8221238 pylibfdt: fix get_mem_rsv for newer Python versions
>>> 1fad065 libfdt: overlay: ensure that existing phandles are not overwritten
>>> b0aacd0 github: add windows/msys CI build
>>> ae97d97 github: Don't accidentally suppress test errors
>>> 057a7db github: Display meson test logs on failure
>>> 92b5d4e pylibfdt: Remove some apparently deprecated options from setup.py
>>> 417e329 github: Update to newer checkout action
>>> 5e6cefa fix MinGW format attribute
>>> 24f6001 libfdt: Simplify adjustment of values for local fixups
>>> da39ee0 libfdt: rework shared/static libraries
>>> a669223 Makefile: do not hardcode the `install` program path
>>> 3fbfdd0 libfdt: fix duplicate meson target
>>> dcef5f8 tests: use correct pkg-config when cross compiling
>>> 0b8026f meson: allow building from shallow clones
>>> 95c74d7 treesource: Restore string list output when no type markers
>>> 2283dd7 libfdt: fdt_path_offset_namelen: Reject empty path
>>> 79b9e32 libfdt: fdt_get_alias_namelen: Validate aliases
>>> 52157f1 pylibfdt: Support boolean properties
>>> d774337 dtc: fix missing string in usage_opts_help
>>> ad8bf9f libfdt: Fix fdt_appendprop_addrrange documentation
>>> 6c5e189 github: add workflow for Meson builds
>>> a3dc9f0 libfdt: rename libfdt-X.Y.Z.so to libfdt.so.X.Y.Z
>>> 3501994 workflows: build: remove setuptools_scm hack
>>> cd3e230 pylibfdt: use fallback version in tarballs
>>> 0f58645 move release version into VERSION.txt
>>> 3816595 libfdt: add missing version symbols
>>> 5e98b59 editorconfig: use tab indentation for version.lds
>>> d030a89 tests: generate dtbs in Meson build directory
>>> 8d8372b tests: fix use of deprecated meson methods
>>> 761114e pylibtfdt: fix use of deprecated meson method
>>> bf6377a meson: set minimum Meson version to 0.56.0
>>> 4c68e4b libfdt: fix library version to match project version
>>> bdc5c87 meson: allow disabling tests
>>> f088e38 Makefile: allow to install libfdt without building executables
>>> 6df5328 Fix use of <ctype.h> functions
>>> ccf1f62 libfdt: Fix a typo in libfdt.h
>>> 71a8b8e libfdt: meson: Fix linking on macOS linker
>>> 589d8c7 dtc: Add an option to generate __local_fixups__ and __fixups__
>>> e836466 CI: Add build matrix with multiple Linux distributions
>>> 3b02a94 dtc: Correct invalid dts output with mixed phandles and integers
>>> d488895 tests: Add additional tests for device graph checks
>>> ea3b9a1 checks: Fix crash in graph_child_address if 'reg' cell size != 1
>>> b2b9671 livetree: fix off-by-one in propval_cell_n() bounds check
>>> ab481e4 Add definition for a GitHub Actions CI job
>>> c88038c Drop obsolete/broken CI definitions
>>> 0ac8b30 yaml: Depend on libyaml >= 0.2.3
>>> f1657b2 tests: Add test cases for bad endpoint node and remote-endpoint prop checks
>>> 44bb89c checks: Fix segmentation fault in check_graph_node
>>> 60bcf1c improve documentation for fdt_path_offset()
>>> a6f997b add fdt_get_symbol() and fdt_get_symbol_namelen() functions
>>> 18f5ec1 use fdt_path_getprop_namelen() in fdt_get_alias_namelen()
>>> df09327 add fdt_path_getprop_namelen() helper
>>> 129bb4b doc: dt-object-internal: Fix a typo
>>> 390f481 fdtoverlay: Drop a a repeated article
>>> 9f8b382 manual: Fix and improve documentation about -@
>>> 2cdf93a fdtoverlay: Fix usage string to not mention "<type>"
>>> 72fc810 build-sys: add -Wwrite-strings
>>> 083ab26 tests: fix leaks spotted by ASAN
>>> 6f8b28f livetree: fix leak spotted by ASAN
>>> fd68bb8 Make name_node() xstrdup its name argument
>>> 4718189 Delay xstrdup() of node and property names coming from a flat tree
>>> 0b842c3 Make build_property() xstrdup its name argument
>>> 9cceabe checks: correct I2C 10-bit address check
>>> 0d56145 yamltree.c: fix -Werror=discarded-qualifiers & -Werror=cast-qual
>>> 61fa22b checks: make check.data const
>>> 7a1d72a checks.c: fix check_msg() leak
>>> ee57999 checks.c: fix heap-buffer-overflow
>>> 44c9b73 tests: fix -Wwrite-strings
>>> 5b60f51 srcpos.c: fix -Wwrite-strings
>>> 32174a6 meson: Fix cell overflow tests when running from meson
>>> 64a907f meson.build: bump version to 1.7.0
>>> e3cde06 Add -Wsuggest-attribute=format warning, correct warnings thus generated
>>> 4182182 Use #ifdef NO_VALGRIND
>>> 71c19f2 Do not redefine _GNU_SOURCE if already set
>>>
>>> Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
>>> ---
>>> v2 adds my signoff to the carried patch, which was adjusted to apply on
>>> v1.7.1.
>>>
>>> ...erlay-make-overlay_get_target-public.patch | 25 +++++++++++--------
>>> ...hon3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} | 2 +-
>>> 2 files changed, 15 insertions(+), 12 deletions(-)
>>> rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} (94%)
>>>
>>> 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
>>> index a2df482e3aa..70dd93f7471 100644
>>> --- 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
>>> @@ -1,4 +1,4 @@
>>> -From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001
>>> +From 20b224b8ab1837778dfd0e7171643a5d26675f95 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"
>>> @@ -7,6 +7,9 @@ This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb.
>>>
>>> Upstream-Status: Inappropriate [embedded specific]
>>>
>>> +Adjust to apply on v1.7.1.
>>> +
>>> +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
>>> ---
>>> libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++-------
>>> libfdt/libfdt.h | 18 ------------------
>>> @@ -14,7 +17,7 @@ Upstream-Status: Inappropriate [embedded specific]
>>> 3 files changed, 22 insertions(+), 26 deletions(-)
>>>
>>> diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
>>> -index 5c0c398..d217e79 100644
>>> +index 28b667f..e6e9382 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)
>>> @@ -59,7 +62,7 @@ index 5c0c398..d217e79 100644
>>> if (path)
>>> ret = fdt_path_offset(fdt, path);
>>> else
>>> -@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto)
>>> +@@ -848,7 +863,7 @@ static int overlay_merge(void *fdt, void *fdto)
>>> if (overlay < 0)
>>> return overlay;
>>>
>>> @@ -68,7 +71,7 @@ index 5c0c398..d217e79 100644
>>> if (target < 0)
>>> return target;
>>>
>>> -@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
>>> +@@ -991,7 +1006,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
>>> return -FDT_ERR_BADOVERLAY;
>>>
>>> /* get the target of the fragment */
>>> @@ -77,7 +80,7 @@ index 5c0c398..d217e79 100644
>>> if (ret < 0)
>>> return ret;
>>> target = ret;
>>> -@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
>>> +@@ -1013,7 +1028,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
>>>
>>> if (!target_path) {
>>> /* again in case setprop_placeholder changed it */
>>> @@ -87,10 +90,10 @@ index 5c0c398..d217e79 100644
>>> return ret;
>>> target = ret;
>>> diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
>>> -index a7f432c..7f117e8 100644
>>> +index 0677fea..c72337b 100644
>>> --- a/libfdt/libfdt.h
>>> +++ b/libfdt/libfdt.h
>>> -@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
>>> +@@ -2184,24 +2184,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
>>> */
>>> int fdt_overlay_apply(void *fdt, void *fdto);
>>>
>>> @@ -116,7 +119,7 @@ index a7f432c..7f117e8 100644
>>> /* Debugging / informational functions */
>>> /**********************************************************************/
>>> diff --git a/libfdt/version.lds b/libfdt/version.lds
>>> -index cbce5d4..7ab85f1 100644
>>> +index 989cd89..ae5f8c6 100644
>>> --- a/libfdt/version.lds
>>> +++ b/libfdt/version.lds
>>> @@ -77,7 +77,6 @@ LIBFDT_1.2 {
>>> @@ -124,9 +127,9 @@ index cbce5d4..7ab85f1 100644
>>> fdt_setprop_inplace_namelen_partial;
>>> fdt_create_with_flags;
>>> - fdt_overlay_target_offset;
>>> + fdt_get_symbol;
>>> + fdt_get_symbol_namelen;
>>> local:
>>> - *;
>>> - };
>>> --
>>> -2.19.1
>>> +2.39.5
>>>
>>> diff --git a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
>>> similarity index 94%
>>> rename from meta/recipes-devtools/python/python3-dtc_1.7.0.bb
>>> rename to meta/recipes-devtools/python/python3-dtc_1.7.1.bb
>>> index 85e48d46942..269095bd8c9 100644
>>> --- a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb
>>> +++ b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
>>> @@ -14,7 +14,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
>>>
>>> LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90"
>>>
>>> -SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798"
>>> +SRCREV = "99031e3a4a6e479466ae795790b44727434ca27d"
>>>
>>> S = "${WORKDIR}/git"
>>>
>>> --
>>> 2.39.5
>>>
>>>
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>> Links: You receive all messages sent to this group.
>>> View/Reply Online (#204876): https://lists.openembedded.org/g/openembedded-core/message/204876
>>> Mute This Topic: https://lists.openembedded.org/mt/108629987/6875888
>>> Group Owner: openembedded-core+owner@lists.openembedded.org
>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ross.burton@arm.com]
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1
2024-09-26 11:50 ` Ross Burton
2024-09-26 11:51 ` Ross Burton
@ 2024-09-26 17:02 ` Khem Raj
1 sibling, 0 replies; 11+ messages in thread
From: Khem Raj @ 2024-09-26 17:02 UTC (permalink / raw)
To: ross.burton; +Cc: Trevor Gamblin, openembedded-core@lists.openembedded.org
On Thu, Sep 26, 2024 at 4:51 AM Ross Burton via lists.openembedded.org
<ross.burton=arm.com@lists.openembedded.org> wrote:
>
> This breaks meta-virt, which uses python3-dtc in its build:
>
> Traceback (most recent call last):
> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/bin/lopper", line 8, in <module>
> sys.exit(main())
> ^^^^^^
> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/__main__.py", line 220, in main
> import lopper.fdt
> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/fdt.py", line 46, in <module>
> import libfdt
> File "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/libfdt.py", line 12, in <module>
> import _libfdt
> ImportError: [...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/_libfdt.cpython-312-x86_64-linux-gnu.so: undefined symbol: fdt_get_symbol
>
Having the libfdt.so (dtc) installed on the build host vs not having
it can also make the difference. Maybe it needs a dependency
on dtc-native to avoid that sort of problem.
> Ross
>
> > On 24 Sep 2024, at 16:00, Trevor Gamblin via lists.openembedded.org <tgamblin=baylibre.com@lists.openembedded.org> wrote:
> >
> > Patch '0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch'
> > had to be adjusted to apply on the latest version.
> >
> > Changelog:
> >
> > 99031e3 (tag: v1.7.1, origin/master, origin/main, origin/HEAD, master) Bump version to v1.7.1
> > 3d5e376 setup: Move setting of srcdir down to the bottom
> > e277553 setup: Collect top-level code together
> > 7e5a889 setup: Move version and full_description into a function
> > 78b6a85 Tidy up some pylint warnings
> > 3501d37 Require Python 3
> > bcd02b5 fdtoverlay: remove wrong singular article in a comment
> > 84b056a checks: relax graph checks for overlays
> > 1df7b04 pylibfdt/Makefile.pylibfdt: use project's flags to compile the extension
> > 61e88fd libfdt: overlay: Fix phandle overwrite check for new subtrees
> > 49d3089 meson: fix installation with meson-python
> > d54aaf9 pylibfdt: clean up python build directory
> > ab86f1e pylibfdt: add VERSION.txt to Python sdist
> > 7b8a30e pylibfdt: fix Python version
> > ff4f17e pylibfdt/Makefile.pylibfdt: fix Python library being rebuild during install
> > 9e313b1 pylibfdt/meson.build: fix Python library being rebuilt during install
> > d598fc3 tests/run_tests.sh: fix Meson library path being dropped
> > b98239d tests/meson.build: fix python and yaml tests not running
> > c17d76a checks: Check the overall length of "interrupt-map"
> > ae26223 libfdt: overlay: Refactor overlay_fixup_phandle
> > 4dd831a libfdt: tests: Update test case for overlay_bad_fixup
> > e6d2942 tests: Remove two_roots and named_root from LIBTREE_TESTS_L and add all dtb filenames generated by dumptrees to TESTS_TREES_L in Makefile.tests
> > 855c934 tests: fix tests broken under Meson
> > 4fd3f4f github: enforce testing pylibfdt and yaml support
> > 9ca7d62 meson: split run-tests by type
> > bb51223 meson: fix dependencies of tests
> > e819006 meson: fix pylibfdt missing dependency on libfdt
> > 8221238 pylibfdt: fix get_mem_rsv for newer Python versions
> > 1fad065 libfdt: overlay: ensure that existing phandles are not overwritten
> > b0aacd0 github: add windows/msys CI build
> > ae97d97 github: Don't accidentally suppress test errors
> > 057a7db github: Display meson test logs on failure
> > 92b5d4e pylibfdt: Remove some apparently deprecated options from setup.py
> > 417e329 github: Update to newer checkout action
> > 5e6cefa fix MinGW format attribute
> > 24f6001 libfdt: Simplify adjustment of values for local fixups
> > da39ee0 libfdt: rework shared/static libraries
> > a669223 Makefile: do not hardcode the `install` program path
> > 3fbfdd0 libfdt: fix duplicate meson target
> > dcef5f8 tests: use correct pkg-config when cross compiling
> > 0b8026f meson: allow building from shallow clones
> > 95c74d7 treesource: Restore string list output when no type markers
> > 2283dd7 libfdt: fdt_path_offset_namelen: Reject empty path
> > 79b9e32 libfdt: fdt_get_alias_namelen: Validate aliases
> > 52157f1 pylibfdt: Support boolean properties
> > d774337 dtc: fix missing string in usage_opts_help
> > ad8bf9f libfdt: Fix fdt_appendprop_addrrange documentation
> > 6c5e189 github: add workflow for Meson builds
> > a3dc9f0 libfdt: rename libfdt-X.Y.Z.so to libfdt.so.X.Y.Z
> > 3501994 workflows: build: remove setuptools_scm hack
> > cd3e230 pylibfdt: use fallback version in tarballs
> > 0f58645 move release version into VERSION.txt
> > 3816595 libfdt: add missing version symbols
> > 5e98b59 editorconfig: use tab indentation for version.lds
> > d030a89 tests: generate dtbs in Meson build directory
> > 8d8372b tests: fix use of deprecated meson methods
> > 761114e pylibtfdt: fix use of deprecated meson method
> > bf6377a meson: set minimum Meson version to 0.56.0
> > 4c68e4b libfdt: fix library version to match project version
> > bdc5c87 meson: allow disabling tests
> > f088e38 Makefile: allow to install libfdt without building executables
> > 6df5328 Fix use of <ctype.h> functions
> > ccf1f62 libfdt: Fix a typo in libfdt.h
> > 71a8b8e libfdt: meson: Fix linking on macOS linker
> > 589d8c7 dtc: Add an option to generate __local_fixups__ and __fixups__
> > e836466 CI: Add build matrix with multiple Linux distributions
> > 3b02a94 dtc: Correct invalid dts output with mixed phandles and integers
> > d488895 tests: Add additional tests for device graph checks
> > ea3b9a1 checks: Fix crash in graph_child_address if 'reg' cell size != 1
> > b2b9671 livetree: fix off-by-one in propval_cell_n() bounds check
> > ab481e4 Add definition for a GitHub Actions CI job
> > c88038c Drop obsolete/broken CI definitions
> > 0ac8b30 yaml: Depend on libyaml >= 0.2.3
> > f1657b2 tests: Add test cases for bad endpoint node and remote-endpoint prop checks
> > 44bb89c checks: Fix segmentation fault in check_graph_node
> > 60bcf1c improve documentation for fdt_path_offset()
> > a6f997b add fdt_get_symbol() and fdt_get_symbol_namelen() functions
> > 18f5ec1 use fdt_path_getprop_namelen() in fdt_get_alias_namelen()
> > df09327 add fdt_path_getprop_namelen() helper
> > 129bb4b doc: dt-object-internal: Fix a typo
> > 390f481 fdtoverlay: Drop a a repeated article
> > 9f8b382 manual: Fix and improve documentation about -@
> > 2cdf93a fdtoverlay: Fix usage string to not mention "<type>"
> > 72fc810 build-sys: add -Wwrite-strings
> > 083ab26 tests: fix leaks spotted by ASAN
> > 6f8b28f livetree: fix leak spotted by ASAN
> > fd68bb8 Make name_node() xstrdup its name argument
> > 4718189 Delay xstrdup() of node and property names coming from a flat tree
> > 0b842c3 Make build_property() xstrdup its name argument
> > 9cceabe checks: correct I2C 10-bit address check
> > 0d56145 yamltree.c: fix -Werror=discarded-qualifiers & -Werror=cast-qual
> > 61fa22b checks: make check.data const
> > 7a1d72a checks.c: fix check_msg() leak
> > ee57999 checks.c: fix heap-buffer-overflow
> > 44c9b73 tests: fix -Wwrite-strings
> > 5b60f51 srcpos.c: fix -Wwrite-strings
> > 32174a6 meson: Fix cell overflow tests when running from meson
> > 64a907f meson.build: bump version to 1.7.0
> > e3cde06 Add -Wsuggest-attribute=format warning, correct warnings thus generated
> > 4182182 Use #ifdef NO_VALGRIND
> > 71c19f2 Do not redefine _GNU_SOURCE if already set
> >
> > Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
> > ---
> > v2 adds my signoff to the carried patch, which was adjusted to apply on
> > v1.7.1.
> >
> > ...erlay-make-overlay_get_target-public.patch | 25 +++++++++++--------
> > ...hon3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} | 2 +-
> > 2 files changed, 15 insertions(+), 12 deletions(-)
> > rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} (94%)
> >
> > 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
> > index a2df482e3aa..70dd93f7471 100644
> > --- 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
> > @@ -1,4 +1,4 @@
> > -From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001
> > +From 20b224b8ab1837778dfd0e7171643a5d26675f95 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"
> > @@ -7,6 +7,9 @@ This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb.
> >
> > Upstream-Status: Inappropriate [embedded specific]
> >
> > +Adjust to apply on v1.7.1.
> > +
> > +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
> > ---
> > libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++-------
> > libfdt/libfdt.h | 18 ------------------
> > @@ -14,7 +17,7 @@ Upstream-Status: Inappropriate [embedded specific]
> > 3 files changed, 22 insertions(+), 26 deletions(-)
> >
> > diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
> > -index 5c0c398..d217e79 100644
> > +index 28b667f..e6e9382 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)
> > @@ -59,7 +62,7 @@ index 5c0c398..d217e79 100644
> > if (path)
> > ret = fdt_path_offset(fdt, path);
> > else
> > -@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto)
> > +@@ -848,7 +863,7 @@ static int overlay_merge(void *fdt, void *fdto)
> > if (overlay < 0)
> > return overlay;
> >
> > @@ -68,7 +71,7 @@ index 5c0c398..d217e79 100644
> > if (target < 0)
> > return target;
> >
> > -@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
> > +@@ -991,7 +1006,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
> > return -FDT_ERR_BADOVERLAY;
> >
> > /* get the target of the fragment */
> > @@ -77,7 +80,7 @@ index 5c0c398..d217e79 100644
> > if (ret < 0)
> > return ret;
> > target = ret;
> > -@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
> > +@@ -1013,7 +1028,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
> >
> > if (!target_path) {
> > /* again in case setprop_placeholder changed it */
> > @@ -87,10 +90,10 @@ index 5c0c398..d217e79 100644
> > return ret;
> > target = ret;
> > diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
> > -index a7f432c..7f117e8 100644
> > +index 0677fea..c72337b 100644
> > --- a/libfdt/libfdt.h
> > +++ b/libfdt/libfdt.h
> > -@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
> > +@@ -2184,24 +2184,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
> > */
> > int fdt_overlay_apply(void *fdt, void *fdto);
> >
> > @@ -116,7 +119,7 @@ index a7f432c..7f117e8 100644
> > /* Debugging / informational functions */
> > /**********************************************************************/
> > diff --git a/libfdt/version.lds b/libfdt/version.lds
> > -index cbce5d4..7ab85f1 100644
> > +index 989cd89..ae5f8c6 100644
> > --- a/libfdt/version.lds
> > +++ b/libfdt/version.lds
> > @@ -77,7 +77,6 @@ LIBFDT_1.2 {
> > @@ -124,9 +127,9 @@ index cbce5d4..7ab85f1 100644
> > fdt_setprop_inplace_namelen_partial;
> > fdt_create_with_flags;
> > - fdt_overlay_target_offset;
> > + fdt_get_symbol;
> > + fdt_get_symbol_namelen;
> > local:
> > - *;
> > - };
> > --
> > -2.19.1
> > +2.39.5
> >
> > diff --git a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
> > similarity index 94%
> > rename from meta/recipes-devtools/python/python3-dtc_1.7.0.bb
> > rename to meta/recipes-devtools/python/python3-dtc_1.7.1.bb
> > index 85e48d46942..269095bd8c9 100644
> > --- a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb
> > +++ b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
> > @@ -14,7 +14,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
> >
> > LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90"
> >
> > -SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798"
> > +SRCREV = "99031e3a4a6e479466ae795790b44727434ca27d"
> >
> > S = "${WORKDIR}/git"
> >
> > --
> > 2.39.5
> >
> >
> >
> >
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#204978): https://lists.openembedded.org/g/openembedded-core/message/204978
> Mute This Topic: https://lists.openembedded.org/mt/108629987/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1
[not found] ` <17F8CB639310258B.14701@lists.openembedded.org>
@ 2024-10-21 19:04 ` Trevor Gamblin
2024-10-24 6:56 ` Mathieu Dubois-Briand
0 siblings, 1 reply; 11+ messages in thread
From: Trevor Gamblin @ 2024-10-21 19:04 UTC (permalink / raw)
To: Ross Burton; +Cc: openembedded-core@lists.openembedded.org
On 2024-09-26 08:34, Trevor Gamblin via lists.openembedded.org wrote:
>
> On 2024-09-26 07:51, Ross Burton wrote:
>> I suspect the problem is the rebase of the symbol visibility patch
>> went wrong?
> Possibly. I'll take another look.
I came back to this today. Looks like there was an update to lopper in
meta-virt on September 30th. I can't reproduce this failure with MACHINE
= "qemuarm64" and building either lopper or lopper-native. I do,
however, run into a do_rootfs dnf error that I'm assuming is a problem
with me forgetting something for meta-virt:
|No match for argument: kernel-module-xen-blkback
|No match for argument: kernel-module-xen-gntalloc
|No match for argument: kernel-module-xen-gntdev
|No match for argument: kernel-module-xen-netback
|No match for argument: kernel-module-xen-wdt
|Error: Unable to find a match: kernel-module-xen-blkback
kernel-module-xen-gntalloc kernel-module-xen-gntdev
kernel-module-xen-netback kernel-module-xen-wdt
Could this patch be re-tested (assuming that error isn't hiding the issue)?
>>
>> Ross
>>
>>> On 26 Sep 2024, at 12:50, Ross Burton <ross.burton@arm.com> wrote:
>>>
>>> This breaks meta-virt, which uses python3-dtc in its build:
>>>
>>> Traceback (most recent call last):
>>> File
>>> "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/bin/lopper",
>>> line 8, in <module>
>>> sys.exit(main())
>>> ^^^^^^
>>> File
>>> "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/__main__.py",
>>> line 220, in main
>>> import lopper.fdt
>>> File
>>> "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/fdt.py",
>>> line 46, in <module>
>>> import libfdt
>>> File
>>> "[...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/libfdt.py",
>>> line 12, in <module>
>>> import _libfdt
>>> ImportError:
>>> [...]/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/_libfdt.cpython-312-x86_64-linux-gnu.so:
>>> undefined symbol: fdt_get_symbol
>>>
>>> Ross
>>>
>>>> On 24 Sep 2024, at 16:00, Trevor Gamblin via lists.openembedded.org
>>>> <tgamblin=baylibre.com@lists.openembedded.org> wrote:
>>>>
>>>> Patch
>>>> '0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch'
>>>> had to be adjusted to apply on the latest version.
>>>>
>>>> Changelog:
>>>>
>>>> 99031e3 (tag: v1.7.1, origin/master, origin/main, origin/HEAD,
>>>> master) Bump version to v1.7.1
>>>> 3d5e376 setup: Move setting of srcdir down to the bottom
>>>> e277553 setup: Collect top-level code together
>>>> 7e5a889 setup: Move version and full_description into a function
>>>> 78b6a85 Tidy up some pylint warnings
>>>> 3501d37 Require Python 3
>>>> bcd02b5 fdtoverlay: remove wrong singular article in a comment
>>>> 84b056a checks: relax graph checks for overlays
>>>> 1df7b04 pylibfdt/Makefile.pylibfdt: use project's flags to compile
>>>> the extension
>>>> 61e88fd libfdt: overlay: Fix phandle overwrite check for new subtrees
>>>> 49d3089 meson: fix installation with meson-python
>>>> d54aaf9 pylibfdt: clean up python build directory
>>>> ab86f1e pylibfdt: add VERSION.txt to Python sdist
>>>> 7b8a30e pylibfdt: fix Python version
>>>> ff4f17e pylibfdt/Makefile.pylibfdt: fix Python library being
>>>> rebuild during install
>>>> 9e313b1 pylibfdt/meson.build: fix Python library being rebuilt
>>>> during install
>>>> d598fc3 tests/run_tests.sh: fix Meson library path being dropped
>>>> b98239d tests/meson.build: fix python and yaml tests not running
>>>> c17d76a checks: Check the overall length of "interrupt-map"
>>>> ae26223 libfdt: overlay: Refactor overlay_fixup_phandle
>>>> 4dd831a libfdt: tests: Update test case for overlay_bad_fixup
>>>> e6d2942 tests: Remove two_roots and named_root from LIBTREE_TESTS_L
>>>> and add all dtb filenames generated by dumptrees to TESTS_TREES_L
>>>> in Makefile.tests
>>>> 855c934 tests: fix tests broken under Meson
>>>> 4fd3f4f github: enforce testing pylibfdt and yaml support
>>>> 9ca7d62 meson: split run-tests by type
>>>> bb51223 meson: fix dependencies of tests
>>>> e819006 meson: fix pylibfdt missing dependency on libfdt
>>>> 8221238 pylibfdt: fix get_mem_rsv for newer Python versions
>>>> 1fad065 libfdt: overlay: ensure that existing phandles are not
>>>> overwritten
>>>> b0aacd0 github: add windows/msys CI build
>>>> ae97d97 github: Don't accidentally suppress test errors
>>>> 057a7db github: Display meson test logs on failure
>>>> 92b5d4e pylibfdt: Remove some apparently deprecated options from
>>>> setup.py
>>>> 417e329 github: Update to newer checkout action
>>>> 5e6cefa fix MinGW format attribute
>>>> 24f6001 libfdt: Simplify adjustment of values for local fixups
>>>> da39ee0 libfdt: rework shared/static libraries
>>>> a669223 Makefile: do not hardcode the `install` program path
>>>> 3fbfdd0 libfdt: fix duplicate meson target
>>>> dcef5f8 tests: use correct pkg-config when cross compiling
>>>> 0b8026f meson: allow building from shallow clones
>>>> 95c74d7 treesource: Restore string list output when no type markers
>>>> 2283dd7 libfdt: fdt_path_offset_namelen: Reject empty path
>>>> 79b9e32 libfdt: fdt_get_alias_namelen: Validate aliases
>>>> 52157f1 pylibfdt: Support boolean properties
>>>> d774337 dtc: fix missing string in usage_opts_help
>>>> ad8bf9f libfdt: Fix fdt_appendprop_addrrange documentation
>>>> 6c5e189 github: add workflow for Meson builds
>>>> a3dc9f0 libfdt: rename libfdt-X.Y.Z.so to libfdt.so.X.Y.Z
>>>> 3501994 workflows: build: remove setuptools_scm hack
>>>> cd3e230 pylibfdt: use fallback version in tarballs
>>>> 0f58645 move release version into VERSION.txt
>>>> 3816595 libfdt: add missing version symbols
>>>> 5e98b59 editorconfig: use tab indentation for version.lds
>>>> d030a89 tests: generate dtbs in Meson build directory
>>>> 8d8372b tests: fix use of deprecated meson methods
>>>> 761114e pylibtfdt: fix use of deprecated meson method
>>>> bf6377a meson: set minimum Meson version to 0.56.0
>>>> 4c68e4b libfdt: fix library version to match project version
>>>> bdc5c87 meson: allow disabling tests
>>>> f088e38 Makefile: allow to install libfdt without building executables
>>>> 6df5328 Fix use of <ctype.h> functions
>>>> ccf1f62 libfdt: Fix a typo in libfdt.h
>>>> 71a8b8e libfdt: meson: Fix linking on macOS linker
>>>> 589d8c7 dtc: Add an option to generate __local_fixups__ and __fixups__
>>>> e836466 CI: Add build matrix with multiple Linux distributions
>>>> 3b02a94 dtc: Correct invalid dts output with mixed phandles and
>>>> integers
>>>> d488895 tests: Add additional tests for device graph checks
>>>> ea3b9a1 checks: Fix crash in graph_child_address if 'reg' cell size
>>>> != 1
>>>> b2b9671 livetree: fix off-by-one in propval_cell_n() bounds check
>>>> ab481e4 Add definition for a GitHub Actions CI job
>>>> c88038c Drop obsolete/broken CI definitions
>>>> 0ac8b30 yaml: Depend on libyaml >= 0.2.3
>>>> f1657b2 tests: Add test cases for bad endpoint node and
>>>> remote-endpoint prop checks
>>>> 44bb89c checks: Fix segmentation fault in check_graph_node
>>>> 60bcf1c improve documentation for fdt_path_offset()
>>>> a6f997b add fdt_get_symbol() and fdt_get_symbol_namelen() functions
>>>> 18f5ec1 use fdt_path_getprop_namelen() in fdt_get_alias_namelen()
>>>> df09327 add fdt_path_getprop_namelen() helper
>>>> 129bb4b doc: dt-object-internal: Fix a typo
>>>> 390f481 fdtoverlay: Drop a a repeated article
>>>> 9f8b382 manual: Fix and improve documentation about -@
>>>> 2cdf93a fdtoverlay: Fix usage string to not mention "<type>"
>>>> 72fc810 build-sys: add -Wwrite-strings
>>>> 083ab26 tests: fix leaks spotted by ASAN
>>>> 6f8b28f livetree: fix leak spotted by ASAN
>>>> fd68bb8 Make name_node() xstrdup its name argument
>>>> 4718189 Delay xstrdup() of node and property names coming from a
>>>> flat tree
>>>> 0b842c3 Make build_property() xstrdup its name argument
>>>> 9cceabe checks: correct I2C 10-bit address check
>>>> 0d56145 yamltree.c: fix -Werror=discarded-qualifiers &
>>>> -Werror=cast-qual
>>>> 61fa22b checks: make check.data const
>>>> 7a1d72a checks.c: fix check_msg() leak
>>>> ee57999 checks.c: fix heap-buffer-overflow
>>>> 44c9b73 tests: fix -Wwrite-strings
>>>> 5b60f51 srcpos.c: fix -Wwrite-strings
>>>> 32174a6 meson: Fix cell overflow tests when running from meson
>>>> 64a907f meson.build: bump version to 1.7.0
>>>> e3cde06 Add -Wsuggest-attribute=format warning, correct warnings
>>>> thus generated
>>>> 4182182 Use #ifdef NO_VALGRIND
>>>> 71c19f2 Do not redefine _GNU_SOURCE if already set
>>>>
>>>> Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
>>>> ---
>>>> v2 adds my signoff to the carried patch, which was adjusted to
>>>> apply on
>>>> v1.7.1.
>>>>
>>>> ...erlay-make-overlay_get_target-public.patch | 25 +++++++++++--------
>>>> ...hon3-dtc_1.7.0.bb => python3-dtc_1.7.1.bb} | 2 +-
>>>> 2 files changed, 15 insertions(+), 12 deletions(-)
>>>> rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb =>
>>>> python3-dtc_1.7.1.bb} (94%)
>>>>
>>>> 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
>>>>
>>>> index a2df482e3aa..70dd93f7471 100644
>>>> ---
>>>> 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
>>>> @@ -1,4 +1,4 @@
>>>> -From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00
>>>> 2001
>>>> +From 20b224b8ab1837778dfd0e7171643a5d26675f95 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"
>>>> @@ -7,6 +7,9 @@ This reverts commit
>>>> 45f3d1a095dd3440578d5c6313eba555a791f3fb.
>>>>
>>>> Upstream-Status: Inappropriate [embedded specific]
>>>>
>>>> +Adjust to apply on v1.7.1.
>>>> +
>>>> +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
>>>> ---
>>>> libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++-------
>>>> libfdt/libfdt.h | 18 ------------------
>>>> @@ -14,7 +17,7 @@ Upstream-Status: Inappropriate [embedded specific]
>>>> 3 files changed, 22 insertions(+), 26 deletions(-)
>>>>
>>>> diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
>>>> -index 5c0c398..d217e79 100644
>>>> +index 28b667f..e6e9382 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)
>>>> @@ -59,7 +62,7 @@ index 5c0c398..d217e79 100644
>>>> if (path)
>>>> ret = fdt_path_offset(fdt, path);
>>>> else
>>>> -@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto)
>>>> +@@ -848,7 +863,7 @@ static int overlay_merge(void *fdt, void *fdto)
>>>> if (overlay < 0)
>>>> return overlay;
>>>>
>>>> @@ -68,7 +71,7 @@ index 5c0c398..d217e79 100644
>>>> if (target < 0)
>>>> return target;
>>>>
>>>> -@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt,
>>>> void *fdto)
>>>> +@@ -991,7 +1006,7 @@ static int overlay_symbol_update(void *fdt,
>>>> void *fdto)
>>>> return -FDT_ERR_BADOVERLAY;
>>>>
>>>> /* get the target of the fragment */
>>>> @@ -77,7 +80,7 @@ index 5c0c398..d217e79 100644
>>>> if (ret < 0)
>>>> return ret;
>>>> target = ret;
>>>> -@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt,
>>>> void *fdto)
>>>> +@@ -1013,7 +1028,7 @@ static int overlay_symbol_update(void *fdt,
>>>> void *fdto)
>>>>
>>>> if (!target_path) {
>>>> /* again in case setprop_placeholder changed it */
>>>> @@ -87,10 +90,10 @@ index 5c0c398..d217e79 100644
>>>> return ret;
>>>> target = ret;
>>>> diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
>>>> -index a7f432c..7f117e8 100644
>>>> +index 0677fea..c72337b 100644
>>>> --- a/libfdt/libfdt.h
>>>> +++ b/libfdt/libfdt.h
>>>> -@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
>>>> +@@ -2184,24 +2184,6 @@ int fdt_del_node(void *fdt, int nodeoffset);
>>>> */
>>>> int fdt_overlay_apply(void *fdt, void *fdto);
>>>>
>>>> @@ -116,7 +119,7 @@ index a7f432c..7f117e8 100644
>>>> /* Debugging / informational
>>>> functions */
>>>> /**********************************************************************/
>>>>
>>>> diff --git a/libfdt/version.lds b/libfdt/version.lds
>>>> -index cbce5d4..7ab85f1 100644
>>>> +index 989cd89..ae5f8c6 100644
>>>> --- a/libfdt/version.lds
>>>> +++ b/libfdt/version.lds
>>>> @@ -77,7 +77,6 @@ LIBFDT_1.2 {
>>>> @@ -124,9 +127,9 @@ index cbce5d4..7ab85f1 100644
>>>> fdt_setprop_inplace_namelen_partial;
>>>> fdt_create_with_flags;
>>>> - fdt_overlay_target_offset;
>>>> + fdt_get_symbol;
>>>> + fdt_get_symbol_namelen;
>>>> local:
>>>> - *;
>>>> - };
>>>> --
>>>> -2.19.1
>>>> +2.39.5
>>>>
>>>> diff --git a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb
>>>> b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
>>>> similarity index 94%
>>>> rename from meta/recipes-devtools/python/python3-dtc_1.7.0.bb
>>>> rename to meta/recipes-devtools/python/python3-dtc_1.7.1.bb
>>>> index 85e48d46942..269095bd8c9 100644
>>>> --- a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb
>>>> +++ b/meta/recipes-devtools/python/python3-dtc_1.7.1.bb
>>>> @@ -14,7 +14,7 @@ UPSTREAM_CHECK_GITTAGREGEX =
>>>> "v(?P<pver>\d+(\.\d+)+)"
>>>>
>>>> LIC_FILES_CHKSUM =
>>>> "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90"
>>>>
>>>> -SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798"
>>>> +SRCREV = "99031e3a4a6e479466ae795790b44727434ca27d"
>>>>
>>>> S = "${WORKDIR}/git"
>>>>
>>>> --
>>>> 2.39.5
>>>>
>>>>
>>>>
>>>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#204983): https://lists.openembedded.org/g/openembedded-core/message/204983
> Mute This Topic: https://lists.openembedded.org/mt/108629987/7611679
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [tgamblin@baylibre.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1
2024-10-21 19:04 ` Trevor Gamblin
@ 2024-10-24 6:56 ` Mathieu Dubois-Briand
2024-10-24 12:48 ` Trevor Gamblin
0 siblings, 1 reply; 11+ messages in thread
From: Mathieu Dubois-Briand @ 2024-10-24 6:56 UTC (permalink / raw)
To: Trevor Gamblin; +Cc: Ross Burton, openembedded-core@lists.openembedded.org
On Mon, Oct 21, 2024 at 03:04:21PM -0400, Trevor Gamblin wrote:
>
> On 2024-09-26 08:34, Trevor Gamblin via lists.openembedded.org wrote:
> >
> > On 2024-09-26 07:51, Ross Burton wrote:
> > > I suspect the problem is the rebase of the symbol visibility patch
> > > went wrong?
> > Possibly. I'll take another look.
> I came back to this today. Looks like there was an update to lopper in
> meta-virt on September 30th. I can't reproduce this failure with MACHINE =
> "qemuarm64" and building either lopper or lopper-native. I do, however, run
> into a do_rootfs dnf error that I'm assuming is a problem with me forgetting
> something for meta-virt:
>
> |No match for argument: kernel-module-xen-blkback
> |No match for argument: kernel-module-xen-gntalloc
> |No match for argument: kernel-module-xen-gntdev
> |No match for argument: kernel-module-xen-netback
> |No match for argument: kernel-module-xen-wdt
> |Error: Unable to find a match: kernel-module-xen-blkback
> kernel-module-xen-gntalloc kernel-module-xen-gntdev
> kernel-module-xen-netback kernel-module-xen-wdt
>
> Could this patch be re-tested (assuming that error isn't hiding the issue)?
Hi Trevor,
Sorry, I retested your patch, and it seems the issue is still there:
https://valkyrie.yoctoproject.org/#/builders/89/builds/274/steps/16/logs/stdio
| [WARNING]: cant load yaml, disabling support: No module named 'ruamel'
| Traceback (most recent call last):
| File
"/srv/pokybuild/yocto-worker/meta-virt/build/build/tmp/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/fdt.py",
line 39, in <module>
| import libfdt
| File
"/srv/pokybuild/yocto-worker/meta-virt/build/build/tmp/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/libfdt.py",
line 12, in <module>
| import _libfdt
| ImportError:
/srv/pokybuild/yocto-worker/meta-virt/build/build/tmp/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/_libfdt.cpython-312-x86_64-linux-gnu.so:
undefined symbol: fdt_get_symbol
|
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1
2024-10-24 6:56 ` Mathieu Dubois-Briand
@ 2024-10-24 12:48 ` Trevor Gamblin
0 siblings, 0 replies; 11+ messages in thread
From: Trevor Gamblin @ 2024-10-24 12:48 UTC (permalink / raw)
To: Ross Burton, openembedded-core@lists.openembedded.org
On 2024-10-24 02:56, Mathieu Dubois-Briand wrote:
> On Mon, Oct 21, 2024 at 03:04:21PM -0400, Trevor Gamblin wrote:
>> On 2024-09-26 08:34, Trevor Gamblin via lists.openembedded.org wrote:
>>> On 2024-09-26 07:51, Ross Burton wrote:
>>>> I suspect the problem is the rebase of the symbol visibility patch
>>>> went wrong?
>>> Possibly. I'll take another look.
>> I came back to this today. Looks like there was an update to lopper in
>> meta-virt on September 30th. I can't reproduce this failure with MACHINE =
>> "qemuarm64" and building either lopper or lopper-native. I do, however, run
>> into a do_rootfs dnf error that I'm assuming is a problem with me forgetting
>> something for meta-virt:
>>
>> |No match for argument: kernel-module-xen-blkback
>> |No match for argument: kernel-module-xen-gntalloc
>> |No match for argument: kernel-module-xen-gntdev
>> |No match for argument: kernel-module-xen-netback
>> |No match for argument: kernel-module-xen-wdt
>> |Error: Unable to find a match: kernel-module-xen-blkback
>> kernel-module-xen-gntalloc kernel-module-xen-gntdev
>> kernel-module-xen-netback kernel-module-xen-wdt
>>
>> Could this patch be re-tested (assuming that error isn't hiding the issue)?
> Hi Trevor,
>
> Sorry, I retested your patch, and it seems the issue is still there:
>
> https://valkyrie.yoctoproject.org/#/builders/89/builds/274/steps/16/logs/stdio
Alright. I'll keep trying to reproduce. It's odd that I can't hit these
issues on my end.
>
> | [WARNING]: cant load yaml, disabling support: No module named 'ruamel'
> | Traceback (most recent call last):
> | File
> "/srv/pokybuild/yocto-worker/meta-virt/build/build/tmp/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/lopper/fdt.py",
> line 39, in <module>
> | import libfdt
> | File
> "/srv/pokybuild/yocto-worker/meta-virt/build/build/tmp/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/libfdt.py",
> line 12, in <module>
> | import _libfdt
> | ImportError:
> /srv/pokybuild/yocto-worker/meta-virt/build/build/tmp/work/qemuarm64-poky-linux/xen-image-minimal/1.0/recipe-sysroot-native/usr/lib/python3.12/site-packages/_libfdt.cpython-312-x86_64-linux-gnu.so:
> undefined symbol: fdt_get_symbol
> |
>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-10-24 12:48 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-24 14:59 [OE-core][PATCH 1/4 v2] python3-trove-classifiers: upgrade 2024.7.2 -> 2024.9.12 Trevor Gamblin
2024-09-24 14:59 ` [OE-core][PATCH 2/4 v2] python3-pytest: upgrade 8.3.2 -> 8.3.3 Trevor Gamblin
2024-09-24 15:00 ` [OE-core][PATCH 3/4 v2] python3-hypothesis: upgrade 6.111.2 -> 6.112.1 Trevor Gamblin
2024-09-24 15:00 ` [OE-core][PATCH 4/4 v2] python3-dtc: upgrade 1.7.0 -> 1.7.1 Trevor Gamblin
2024-09-26 11:50 ` Ross Burton
2024-09-26 11:51 ` Ross Burton
2024-09-26 12:34 ` Trevor Gamblin
[not found] ` <17F8CB639310258B.14701@lists.openembedded.org>
2024-10-21 19:04 ` Trevor Gamblin
2024-10-24 6:56 ` Mathieu Dubois-Briand
2024-10-24 12:48 ` Trevor Gamblin
2024-09-26 17:02 ` Khem Raj
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.