diff mbox series

[meta-oe] minicoredumper: backport patch to build with glibc 2.43

Message ID 20260319050119.3289584-1-skandigraun@gmail.com
State Under Review
Headers show
Series [meta-oe] minicoredumper: backport patch to build with glibc 2.43 | expand

Commit Message

Gyorgy Sarvari March 19, 2026, 5:01 a.m. UTC
As the subject says.

Fixes compilation error:
| ../../../sources/minicoredumper-2.0.7/src/coreinject/main.c: In function 'inject_data':
| ../../../sources/minicoredumper-2.0.7/src/coreinject/main.c:248:11: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
|   248 |         p = strrchr(b_fname, '/');

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 ...x-assignment-of-const-qualified-type.patch | 44 +++++++++++++++++++
 .../minicoredumper/minicoredumper_2.0.7.bb    |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta-oe/recipes-kernel/minicoredumper/files/0001-coreinject-fix-assignment-of-const-qualified-type.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-kernel/minicoredumper/files/0001-coreinject-fix-assignment-of-const-qualified-type.patch b/meta-oe/recipes-kernel/minicoredumper/files/0001-coreinject-fix-assignment-of-const-qualified-type.patch
new file mode 100644
index 0000000000..ace46202b7
--- /dev/null
+++ b/meta-oe/recipes-kernel/minicoredumper/files/0001-coreinject-fix-assignment-of-const-qualified-type.patch
@@ -0,0 +1,44 @@ 
+From 07023a2d2ef059a039fef83ee4b33a7e47ca8e3e Mon Sep 17 00:00:00 2001
+From: John Ogness <john.ogness@linutronix.de>
+Date: Tue, 24 Feb 2026 11:33:40 +0106
+Subject: [PATCH] coreinject: fix assignment of const-qualified type
+
+coreinject fails to build with glibc 2.43.
+
+The issue is due to a new glibc feature:
+
+* For ISO C23, the functions bsearch, memchr, strchr, strpbrk, strrchr,
+  strstr, wcschr, wcspbrk, wcsrchr, wcsstr and wmemchr that return
+  pointers into their input arrays now have definitions as macros that
+  return a pointer to a const-qualified type when the input argument is
+  a pointer to a const-qualified type.
+
+The fix is trivial since the returned strrchr() value is only used in
+a way compatible with const pointers. The data type was simply defined
+incorrectly.
+
+Reported-by: Aurelien Jarno <aurel32@debian.org>
+Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1128695
+Signed-off-by: John Ogness <john.ogness@linutronix.de>
+
+Upstream-Status: Backport [https://github.com/diamon/minicoredumper/commit/eb66f10ae26edf94bf41d513ce90a4eb1e0f11b3]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/coreinject/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/coreinject/main.c b/src/coreinject/main.c
+index faf8edf..198485d 100644
+--- a/src/coreinject/main.c
++++ b/src/coreinject/main.c
+@@ -240,9 +240,9 @@ static int inject_data(FILE *f_core, FILE *f_symmap, const char *b_fname,
+ 	struct ident_data indirect;
+ 	struct ident_data direct;
+ 	const char *ident;
++	const char *p;
+ 	FILE *f_dump;
+ 	int err = 0;
+-	char *p;
+ 
+ 	/* extract ident name from file path */
+ 	p = strrchr(b_fname, '/');
diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
index 44d85550ee..ff4fdf358e 100644
--- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
+++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
@@ -18,6 +18,7 @@  SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \
            file://run-ptest \
            file://0001-corestripper-Fix-uninitialized-warning.patch \
            file://0002-Fix-2038-year-problem-in-timestamp-handling.patch \
+           file://0001-coreinject-fix-assignment-of-const-qualified-type.patch \
            "