mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v2] dtc: Version bump. 1.7.2 -> 1.8.1
@ 2026-06-11 16:42 Christian Melki
  2026-06-25 19:23 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2026-06-11 16:42 UTC (permalink / raw)
  To: ptxdist

Looks like mostly minor things.
https://github.com/dgibson/dtc/compare/v1.7.2...v1.8.1

* License hash changed. Typo fixes.

* Remove old patch, already in upstream.

* Add patch for ARM (32-bit) build failure.
See https://github.com/dgibson/dtc/issues/186

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 .../0001-Fix-discarded-const-qualifiers.patch | 80 -------------------
 ...omparison-of-integers-with-different.patch | 37 +++++++++
 patches/dtc-1.8.1/series                      |  4 +
 rules/dtc.make                                |  6 +-
 4 files changed, 44 insertions(+), 83 deletions(-)
 delete mode 100644 patches/dtc-1.7.2/0001-Fix-discarded-const-qualifiers.patch
 create mode 100644 patches/dtc-1.8.1/0001-livetree-Fix-a-comparison-of-integers-with-different.patch
 create mode 100644 patches/dtc-1.8.1/series

diff --git a/patches/dtc-1.7.2/0001-Fix-discarded-const-qualifiers.patch b/patches/dtc-1.7.2/0001-Fix-discarded-const-qualifiers.patch
deleted file mode 100644
index 766dbccc2..000000000
--- a/patches/dtc-1.7.2/0001-Fix-discarded-const-qualifiers.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Stephen Gallagher <sgallagh@redhat.com>
-Date: Tue, 6 Jan 2026 14:19:30 -0500
-Subject: [PATCH] Fix discarded const qualifiers
-
-It's unsafe to implicitly discard the const qualifier on a pointer. In
-overlay_fixup_phandle(), this was probably just an oversight, and making
-the "sep" variable a const char * is sufficient to fix it.
-
-In create_node(), however, the "p" variable is directly modifying the
-buffer pointed to by "const char* node_name". To fix this, we need to
-actually make a duplicate of the buffer and operate on that instead.
-
-This introduces a malloc()/free()  and an unbounded strdup() into the
-operation, but fdtput isn't a long-running service and the node_name
-argument comes directly from argv, so this shouldn't introduce a
-significant performance impact.
-
-Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
----
- fdtput.c             | 8 +++++---
- libfdt/fdt_overlay.c | 3 ++-
- meson.build          | 1 +
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/fdtput.c b/fdtput.c
-index c2fecf45a977..8deec7eebcf5 100644
---- a/fdtput.c
-+++ b/fdtput.c
-@@ -230,19 +230,21 @@ static int create_paths(char **blob, const char *in_path)
- static int create_node(char **blob, const char *node_name)
- {
- 	int node = 0;
--	char *p;
-+	const char *p;
-+	char *path = NULL;
- 
- 	p = strrchr(node_name, '/');
- 	if (!p) {
- 		report_error(node_name, -1, -FDT_ERR_BADPATH);
- 		return -1;
- 	}
--	*p = '\0';
- 
- 	*blob = realloc_node(*blob, p + 1);
- 
- 	if (p > node_name) {
--		node = fdt_path_offset(*blob, node_name);
-+		path = xstrndup(node_name, (size_t)(p - node_name));
-+		node = fdt_path_offset(*blob, path);
-+		free(path);
- 		if (node < 0) {
- 			report_error(node_name, -1, node);
- 			return -1;
-diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c
-index 28b667ffc490..5f8aa62b2686 100644
---- a/libfdt/fdt_overlay.c
-+++ b/libfdt/fdt_overlay.c
-@@ -409,7 +409,8 @@ static int overlay_fixup_phandle(void *fdt, void *fdto, int symbols_off,
- 		const char *fixup_str = value;
- 		uint32_t path_len, name_len;
- 		uint32_t fixup_len;
--		char *sep, *endptr;
-+		const char *sep;
-+		char *endptr;
- 		int poffset, ret;
- 
- 		fixup_end = memchr(value, '\0', len);
-diff --git a/meson.build b/meson.build
-index 310699f0c874..2966b0614a69 100644
---- a/meson.build
-+++ b/meson.build
-@@ -18,6 +18,7 @@ add_project_arguments(
-     '-Wshadow',
-     '-Wsuggest-attribute=format',
-     '-Wwrite-strings',
-+    '-Wdiscarded-qualifiers',
-   ]),
-   language: 'c'
- )
diff --git a/patches/dtc-1.8.1/0001-livetree-Fix-a-comparison-of-integers-with-different.patch b/patches/dtc-1.8.1/0001-livetree-Fix-a-comparison-of-integers-with-different.patch
new file mode 100644
index 000000000..d14fdc1af
--- /dev/null
+++ b/patches/dtc-1.8.1/0001-livetree-Fix-a-comparison-of-integers-with-different.patch
@@ -0,0 +1,37 @@
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@baylibre.com>
+Date: Mon, 8 Jun 2026 18:33:05 +0200
+Subject: [PATCH] livetree: Fix a comparison of integers with different
+ signedness
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On some architectures we have:
+
+	livetree.c: In function 'fixup_phandles':
+	livetree.c:1237:54: error: comparison of integer expressions of different signedness: 'long int' and 'unsigned int' [-Werror=sign-compare]
+	 1237 |                         if (offset < 0 || offset + 4 > p->val.len) {
+	      |                                                      ^
+	cc1: all warnings being treated as errors
+	make: *** [Makefile:307: livetree.o] Error 1
+
+Fixes: a26ef6400bd8 ("Restore phandle references from __fixups__ node")
+Closes: https://github.com/dgibson/dtc/issues/186
+Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
+---
+ livetree.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/livetree.c b/livetree.c
+index 5d72abceb526..8baed1fca8c5 100644
+--- a/livetree.c
++++ b/livetree.c
+@@ -1234,7 +1234,7 @@ void fixup_phandles(struct dt_info *dti, const char *name)
+ 				continue;
+ 
+ 			offset = strtol(soffset, NULL, 0);
+-			if (offset < 0 || offset + 4 > p->val.len) {
++			if (offset < 0 || (unsigned int)offset + 4 > p->val.len) {
+ 				if (quiet < 1)
+ 					fprintf(stderr,
+ 						"Warning: Label %s contains invalid offset for property %s in node %s\n",
diff --git a/patches/dtc-1.8.1/series b/patches/dtc-1.8.1/series
new file mode 100644
index 000000000..fe54adf1c
--- /dev/null
+++ b/patches/dtc-1.8.1/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-livetree-Fix-a-comparison-of-integers-with-different.patch
+# 75a849fa7e78e62b80e96c1499e71331  - git-ptx-patches magic
diff --git a/rules/dtc.make b/rules/dtc.make
index c9ad70681..6e653a92c 100644
--- a/rules/dtc.make
+++ b/rules/dtc.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_DTC) += dtc
 #
 # Paths and names
 #
-DTC_VERSION	:= 1.7.2
-DTC_SHA256	:= 8f1486962f093f28a2f79f01c1fd82f144ef640ceabe555536d43362212ceb7c
+DTC_VERSION	:= 1.8.1
+DTC_SHA256	:= 74b50bb19134f6562490afea53e59953dd6c4afb17e5ccb60be32221262d3390
 DTC		:= dtc-$(DTC_VERSION)
 DTC_SUFFIX	:= tar.gz
 DTC_URL		:= https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$(DTC).$(DTC_SUFFIX)
@@ -24,7 +24,7 @@ DTC_SOURCE	:= $(SRCDIR)/$(DTC).$(DTC_SUFFIX)
 DTC_DIR		:= $(BUILDDIR)/$(DTC)
 DTC_LICENSE	:= GPL-2.0-or-later OR BSD-2-Clause
 DTC_LICENSE_FILES := \
-	file://README.license;md5=a1eb22e37f09df5b5511b8a278992d0e \
+	file://README.license;md5=a5696bd07fcc7285cbbacc42c2132248 \
 	file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 	file://BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927
 
-- 
2.43.0




^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-06-25 19:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-11 16:42 [ptxdist] [PATCH v2] dtc: Version bump. 1.7.2 -> 1.8.1 Christian Melki
2026-06-25 19:23 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox