dtc: upgrade 1.7.0 -> 1.7.2

Remove patches (both applied upstream).

Add a tests option that is disabled by default
(as previously it was inside a is_cross() condition and
so was always disabled).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 (file)
index 79a3b92..0000000
--- a/meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9153522103bd4ed7e3299c4d073f66bb37cb2d42 Mon Sep 17 00:00:00 2001
-From: Nikolay Letov <letov.nikolay@gmail.com>
-Date: Wed, 22 Feb 2023 13:36:07 +0300
-Subject: [PATCH 1/2] meson.build: bump version to 1.7.0
-
-[This was botched in the actual 1.7.0 release :( - David Gibson]
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=64a907f08b9bedd89833c1eee674148cff2343c6]
-
-Signed-off-by: Nikolay Letov <letov.nikolay@gmail.com>
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 78251eb..d88cd9f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,5 +1,5 @@
- project('dtc', 'c',
--  version: '1.6.0',
-+  version: '1.7.0',
-   license: ['GPL2+', 'BSD-2'],
-   default_options: 'werror=true',
- )
--- 
-2.30.2
-

diff --git a/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch b/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
deleted file mode 100644 (file)
index 0284905..0000000
--- a/meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4415b0baece3c4351a6d3637c2754abbefd4795d Mon Sep 17 00:00:00 2001
-From: Peter Marko <peter.marko@siemens.com>
-Date: Sat, 16 Dec 2023 18:58:31 +0100
-Subject: [PATCH 2/2] meson: allow building from shallow clones
-
-When building from shallow clone, tag is not available
-and version defaults to git hash.
-Problem is that some builds check DTC version and fail the comparison.
-Example is https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
-Which fails to build with following error:
-dtc version too old (039a994), you need at least version 1.4.4
-
-Drop --always from git describe command, see
-https://github.com/mesonbuild/meson/blob/1.3.0/mesonbuild/utils/universal.py#L773
-This will make it more closer to build via Makefile.
-
-Upstream-Status: Submitted [https://github.com/dgibson/dtc/pull/122]
-
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index 78251eb..fc0c92a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -56,6 +56,7 @@ py = py.find_installation(required: get_option('python'))
- swig = find_program('swig', required: get_option('python'))
- 
- version_gen_h = vcs_tag(
-+  command: ['git', 'describe', '--dirty=+'],
-   input: 'version_gen.h.in',
-   output: 'version_gen.h',
- )
--- 
-2.30.2
-

diff --git a/meta/recipes-kernel/dtc/dtc_1.7.0.bb b/meta/recipes-kernel/dtc/dtc_1.7.2.bb
similarity index 86%
rename from meta/recipes-kernel/dtc/dtc_1.7.0.bb
rename to meta/recipes-kernel/dtc/dtc_1.7.2.bb
index 0702fc16dfacdf0db4c5021c04c6c950ccfc8fdc..3df95ec1ee3cab749cecf78594afe969b83cda40 100644 (file)
--- 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+)+)"
 
@@ -24,6 +22,7 @@ inherit meson pkgconfig
 EXTRA_OEMESON = "-Dpython=disabled -Dvalgrind=disabled"
 
 PACKAGECONFIG ??= "tools"
+PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,"
 PACKAGECONFIG[tools] = "-Dtools=true,-Dtools=false,flex-native bison-native"
 PACKAGECONFIG[yaml] = "-Dyaml=enabled,-Dyaml=disabled,libyaml"