diff mbox series

[meta-oe,2/3] crash: Fix build with glibc 2.38+

Message ID 20230712234819.1008911-2-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,1/3] pcp: Disable parallel build | expand

Commit Message

Khem Raj July 12, 2023, 11:48 p.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...001-make-src-string-const-in-strlcpy.patch | 43 +++++++++++++++++++
 meta-oe/recipes-kernel/crash/crash_8.0.2.bb   |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 meta-oe/recipes-kernel/crash/crash/0001-make-src-string-const-in-strlcpy.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-kernel/crash/crash/0001-make-src-string-const-in-strlcpy.patch b/meta-oe/recipes-kernel/crash/crash/0001-make-src-string-const-in-strlcpy.patch
new file mode 100644
index 0000000000..ff1c35f5c9
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0001-make-src-string-const-in-strlcpy.patch
@@ -0,0 +1,43 @@ 
+From 7f02a81117a30cc57c8e74c01098af8c9284d64b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 12 Jul 2023 14:47:13 -0700
+Subject: [PATCH] make src string const in strlcpy
+
+This also fixes build with glibc 2.38+ which now implements strlcpy too
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ defs.h  | 2 +-
+ tools.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/defs.h b/defs.h
+index afdcf6c..c108172 100644
+--- a/defs.h
++++ b/defs.h
+@@ -5298,7 +5298,7 @@ uint32_t swap32(uint32_t, int);
+ uint64_t swap64(uint64_t, int);
+ ulong *get_cpumask_buf(void);
+ int make_cpumask(char *, ulong *, int, int *);
+-size_t strlcpy(char *, char *, size_t);
++size_t strlcpy(char *, const char *, size_t);
+ struct rb_node *rb_first(struct rb_root *);
+ struct rb_node *rb_parent(struct rb_node *, struct rb_node *);
+ struct rb_node *rb_right(struct rb_node *, struct rb_node *);
+diff --git a/tools.c b/tools.c
+index 39306c1..bb647e7 100644
+--- a/tools.c
++++ b/tools.c
+@@ -6762,7 +6762,7 @@ make_cpumask_error:
+  * always be NULL-terminated.
+  */
+ size_t 
+-strlcpy(char *dest, char *src, size_t size)
++strlcpy(char *dest, const char *src, size_t size)
+ {
+ 	size_t ret = strlen(src);
+ 
+-- 
+2.41.0
+
diff --git a/meta-oe/recipes-kernel/crash/crash_8.0.2.bb b/meta-oe/recipes-kernel/crash/crash_8.0.2.bb
index f58bb6ef54..f8a460b8ce 100644
--- a/meta-oe/recipes-kernel/crash/crash_8.0.2.bb
+++ b/meta-oe/recipes-kernel/crash/crash_8.0.2.bb
@@ -20,6 +20,7 @@  SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=http
            file://0001-cross_add_configure_option.patch \
            file://donnot-extract-gdb-during-do-compile.patch \
            file://gdb_build_jobs_and_not_write_crash_target.patch \
+           file://0001-make-src-string-const-in-strlcpy.patch \
            "
 SRCREV = "f1cd581d1c4afa5b8ffdfaa6a3ea9f545fe4ec91"