To align with python3-dtc version. Changes: https://github.com/dgibson/dtc/releases/tag/v1.7.2
Changes since v1.7.1 include: * Build - Fix automatic dependency handling for paths with spaces in them - Fix to allow compilation with swig 4.3.0 - Disable pointless warnings on swig generated code * fdtoverlay - Improve error message with missing /__symbols__ https://github.com/dgibson/dtc/releases/tag/v1.7.1 Changes sinve v1.7.0 include: * dtc * Fix check for 10-bit I2C addresses * Improve documentation of -@ option * Update to libyaml >= 0.2.3 * Improvements & fixes for device graph checks * Add -L / --local-fixups option * Add check for length of interrupt-map properties * libfdt * Add fdt_path_getprop_namelen() * Add fdt_get_symbol() and fdt_get_symbol_namelen() * Correct documentation of fdt_path_offset() * Correct documentation of fdt_appendprop_addrrange() * Validate aliases is fdt_get_alias_namelen() * Don't overwrite phandles when applying overlays * Require Python 3 * pylibfdt * Support boolean properties * Fixes for current Python versions * General * Assorted bugfixes * Assorted build improvements * Assorted typo fixes in docs * Some additional testcases * Move to GitHub Actions based CI Drop patches which were upstreamed. Signed-off-by: Mikko Rapeli <[email protected]> --- ...01-meson.build-bump-version-to-1.7.0.patch | 29 -------------- ...n-allow-building-from-shallow-clones.patch | 38 ------------------- .../dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb} | 4 +- 3 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch delete mode 100644 meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch rename meta/recipes-kernel/dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb} (86%) diff --git a/meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch b/meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch deleted file mode 100644 index 79a3b92b44..0000000000 --- a/meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9153522103bd4ed7e3299c4d073f66bb37cb2d42 Mon Sep 17 00:00:00 2001 -From: Nikolay Letov <[email protected]> -Date: Wed, 22 Feb 2023 13:36:07 +0300 -Subject: [PATCH 1/2] meson.build: bump version to 1.7.0 - -[This was botched in the actual 1.7.0 release :( - David Gibson] - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=64a907f08b9bedd89833c1eee674148cff2343c6] - -Signed-off-by: Nikolay Letov <[email protected]> -Signed-off-by: Peter Marko <[email protected]> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 78251eb..d88cd9f 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,5 +1,5 @@ - project('dtc', 'c', -- version: '1.6.0', -+ version: '1.7.0', - license: ['GPL2+', 'BSD-2'], - default_options: 'werror=true', - ) --- -2.30.2 - diff --git a/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch b/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch deleted file mode 100644 index 0284905913..0000000000 --- a/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4415b0baece3c4351a6d3637c2754abbefd4795d Mon Sep 17 00:00:00 2001 -From: Peter Marko <[email protected]> -Date: Sat, 16 Dec 2023 18:58:31 +0100 -Subject: [PATCH 2/2] meson: allow building from shallow clones - -When building from shallow clone, tag is not available -and version defaults to git hash. -Problem is that some builds check DTC version and fail the comparison. -Example is https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git -Which fails to build with following error: -dtc version too old (039a994), you need at least version 1.4.4 - -Drop --always from git describe command, see -https://github.com/mesonbuild/meson/blob/1.3.0/mesonbuild/utils/universal.py#L773 -This will make it more closer to build via Makefile. - -Upstream-Status: Submitted [https://github.com/dgibson/dtc/pull/122] - -Signed-off-by: Peter Marko <[email protected]> ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 78251eb..fc0c92a 100644 ---- a/meson.build -+++ b/meson.build -@@ -56,6 +56,7 @@ py = py.find_installation(required: get_option('python')) - swig = find_program('swig', required: get_option('python')) - - version_gen_h = vcs_tag( -+ command: ['git', 'describe', '--dirty=+'], - input: 'version_gen.h.in', - output: 'version_gen.h', - ) --- -2.30.2 - diff --git a/meta/recipes-kernel/dtc/dtc_1.7.0.bb b/meta/recipes-kernel/dtc/dtc_1.7.2.bb similarity index 86% rename from meta/recipes-kernel/dtc/dtc_1.7.0.bb rename to meta/recipes-kernel/dtc/dtc_1.7.2.bb index 0702fc16df..93668e5544 100644 --- a/meta/recipes-kernel/dtc/dtc_1.7.0.bb +++ b/meta/recipes-kernel/dtc/dtc_1.7.2.bb @@ -10,10 +10,8 @@ LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = " \ git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main;protocol=https \ - file://0001-meson.build-bump-version-to-1.7.0.patch \ - file://0002-meson-allow-building-from-shallow-clones.patch \ " -SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798" +SRCREV = "2d10aa2afe35527728db30b35ec491ecb6959e5c" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#208369): https://lists.openembedded.org/g/openembedded-core/message/208369 Mute This Topic: https://lists.openembedded.org/mt/109936278/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
