To fix compatibility with new swig version. Changes: https://github.com/dgibson/dtc/releases/tag/v1.7.2
Changes since v1.7.1 include: * Build - Fix automatic dependency handling for paths with spaces in them - Fix to allow compilation with swig 4.3.0 - Disable pointless warnings on swig generated code * fdtoverlay - Improve error message with missing /__symbols__ https://github.com/dgibson/dtc/releases/tag/v1.7.1 Changes sinve v1.7.0 include: * dtc * Fix check for 10-bit I2C addresses * Improve documentation of -@ option * Update to libyaml >= 0.2.3 * Improvements & fixes for device graph checks * Add -L / --local-fixups option * Add check for length of interrupt-map properties * libfdt * Add fdt_path_getprop_namelen() * Add fdt_get_symbol() and fdt_get_symbol_namelen() * Correct documentation of fdt_path_offset() * Correct documentation of fdt_appendprop_addrrange() * Validate aliases is fdt_get_alias_namelen() * Don't overwrite phandles when applying overlays * Require Python 3 * pylibfdt * Support boolean properties * Fixes for current Python versions * General * Assorted bugfixes * Assorted build improvements * Assorted typo fixes in docs * Some additional testcases * Move to GitHub Actions based CI Drop revert patch. Will align dtc version with separate commit. Signed-off-by: Mikko Rapeli <[email protected]> --- ...erlay-make-overlay_get_target-public.patch | 132 ------------------ ...hon3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} | 5 +- 2 files changed, 2 insertions(+), 135 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} (84%) diff --git a/meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch b/meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch deleted file mode 100644 index a2df482e3a..0000000000 --- a/meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 4d4703e0199fb3556c37694e4d951785abca22fd Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <[email protected]> -Date: Wed, 19 Jan 2022 12:46:42 -0500 -Subject: [PATCH] Revert "libfdt: overlay: make overlay_get_target() public" - -This reverts commit 45f3d1a095dd3440578d5c6313eba555a791f3fb. - -Upstream-Status: Inappropriate [embedded specific] - ---- - libfdt/fdt_overlay.c | 29 ++++++++++++++++++++++------- - libfdt/libfdt.h | 18 ------------------ - libfdt/version.lds | 1 - - 3 files changed, 22 insertions(+), 26 deletions(-) - -diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c -index 5c0c398..d217e79 100644 ---- a/libfdt/fdt_overlay.c -+++ b/libfdt/fdt_overlay.c -@@ -40,22 +40,37 @@ static uint32_t overlay_get_target_phandle(const void *fdto, int fragment) - return fdt32_to_cpu(*val); - } - --int fdt_overlay_target_offset(const void *fdt, const void *fdto, -- int fragment_offset, char const **pathp) -+/** -+ * overlay_get_target - retrieves the offset of a fragment's target -+ * @fdt: Base device tree blob -+ * @fdto: Device tree overlay blob -+ * @fragment: node offset of the fragment in the overlay -+ * @pathp: pointer which receives the path of the target (or NULL) -+ * -+ * overlay_get_target() retrieves the target offset in the base -+ * device tree of a fragment, no matter how the actual targeting is -+ * done (through a phandle or a path) -+ * -+ * returns: -+ * the targeted node offset in the base device tree -+ * Negative error code on error -+ */ -+static int overlay_get_target(const void *fdt, const void *fdto, -+ int fragment, char const **pathp) - { - uint32_t phandle; - const char *path = NULL; - int path_len = 0, ret; - - /* Try first to do a phandle based lookup */ -- phandle = overlay_get_target_phandle(fdto, fragment_offset); -+ phandle = overlay_get_target_phandle(fdto, fragment); - if (phandle == (uint32_t)-1) - return -FDT_ERR_BADPHANDLE; - - /* no phandle, try path */ - if (!phandle) { - /* And then a path based lookup */ -- path = fdt_getprop(fdto, fragment_offset, "target-path", &path_len); -+ path = fdt_getprop(fdto, fragment, "target-path", &path_len); - if (path) - ret = fdt_path_offset(fdt, path); - else -@@ -621,7 +636,7 @@ static int overlay_merge(void *fdt, void *fdto) - if (overlay < 0) - return overlay; - -- target = fdt_overlay_target_offset(fdt, fdto, fragment, NULL); -+ target = overlay_get_target(fdt, fdto, fragment, NULL); - if (target < 0) - return target; - -@@ -764,7 +779,7 @@ static int overlay_symbol_update(void *fdt, void *fdto) - return -FDT_ERR_BADOVERLAY; - - /* get the target of the fragment */ -- ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path); -+ ret = overlay_get_target(fdt, fdto, fragment, &target_path); - if (ret < 0) - return ret; - target = ret; -@@ -786,7 +801,7 @@ static int overlay_symbol_update(void *fdt, void *fdto) - - if (!target_path) { - /* again in case setprop_placeholder changed it */ -- ret = fdt_overlay_target_offset(fdt, fdto, fragment, &target_path); -+ ret = overlay_get_target(fdt, fdto, fragment, &target_path); - if (ret < 0) - return ret; - target = ret; -diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h -index a7f432c..7f117e8 100644 ---- a/libfdt/libfdt.h -+++ b/libfdt/libfdt.h -@@ -2116,24 +2116,6 @@ int fdt_del_node(void *fdt, int nodeoffset); - */ - int fdt_overlay_apply(void *fdt, void *fdto); - --/** -- * fdt_overlay_target_offset - retrieves the offset of a fragment's target -- * @fdt: Base device tree blob -- * @fdto: Device tree overlay blob -- * @fragment_offset: node offset of the fragment in the overlay -- * @pathp: pointer which receives the path of the target (or NULL) -- * -- * fdt_overlay_target_offset() retrieves the target offset in the base -- * device tree of a fragment, no matter how the actual targeting is -- * done (through a phandle or a path) -- * -- * returns: -- * the targeted node offset in the base device tree -- * Negative error code on error -- */ --int fdt_overlay_target_offset(const void *fdt, const void *fdto, -- int fragment_offset, char const **pathp); -- - /**********************************************************************/ - /* Debugging / informational functions */ - /**********************************************************************/ -diff --git a/libfdt/version.lds b/libfdt/version.lds -index cbce5d4..7ab85f1 100644 ---- a/libfdt/version.lds -+++ b/libfdt/version.lds -@@ -77,7 +77,6 @@ LIBFDT_1.2 { - fdt_appendprop_addrrange; - fdt_setprop_inplace_namelen_partial; - fdt_create_with_flags; -- fdt_overlay_target_offset; - local: - *; - }; --- -2.19.1 - diff --git a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb b/meta/recipes-devtools/python/python3-dtc_1.7.2.bb similarity index 84% rename from meta/recipes-devtools/python/python3-dtc_1.7.0.bb rename to meta/recipes-devtools/python/python3-dtc_1.7.2.bb index 85e48d4694..c301c9550f 100644 --- a/meta/recipes-devtools/python/python3-dtc_1.7.0.bb +++ b/meta/recipes-devtools/python/python3-dtc_1.7.2.bb @@ -6,15 +6,14 @@ LICENSE = "GPL-2.0-only | BSD-2-Clause" DEPENDS = "flex-native bison-native swig-native python3-setuptools-scm-native libyaml dtc" -SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ - file://0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90" -SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798" +SRCREV = "2d10aa2afe35527728db30b35ec491ecb6959e5c" S = "${WORKDIR}/git" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#208368): https://lists.openembedded.org/g/openembedded-core/message/208368 Mute This Topic: https://lists.openembedded.org/mt/109936277/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
