3 files changed, 109 insertions, 3 deletions

diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-Add-riscv32-support.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-Add-riscv32-support.patch
new file mode 100644
index 0000000000..80f0b6d378
--- /dev/null
+++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-Add-riscv32-support.patch
@@ -0,0 +1,48 @@
+From da22e9f4eec22163feab5a0a4488627ea992daa9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 16 Sep 2024 23:58:36 +0000
+Subject: [PATCH] Add riscv32 support
+
+Add missing definitions for the RISC-V 32-bit architecture.
+
+Upstream-Status: Submitted [https://github.com/systemd/systemd-bootchart/pull/54]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac       | 1 +
+ src/architecture.h | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5c9c20f..f977c78 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,6 +45,7 @@ SET_ARCH(IA32, i*86*)
+ SET_ARCH(MIPS, mips*)
+ SET_ARCH(AARCH64, aarch64*)
+ SET_ARCH(RISCV64, riscv64*)
++SET_ARCH(RISCV32, riscv32*)
+ 
+ AC_CHECK_SIZEOF(pid_t)
+ AC_CHECK_SIZEOF(uid_t)
+diff --git a/src/architecture.h b/src/architecture.h
+index cbf1795..f33cd00 100644
+--- a/src/architecture.h
++++ b/src/architecture.h
+@@ -58,6 +58,7 @@ enum {
+         ARCHITECTURE_TILEGX,
+         ARCHITECTURE_CRIS,
+         ARCHITECTURE_RISCV64,
++        ARCHITECTURE_RISCV32,
+        ARCHITECTURE_LOONGARCH,
+         _ARCHITECTURE_MAX,
+         _ARCHITECTURE_INVALID = -1
+@@ -151,6 +152,9 @@ int uname_architecture(void);
+ #elif defined(__riscv) && __riscv_xlen == 64
+ #  define native_architecture() ARCHITECTURE_RISCV64
+ #  define define LIB_ARCH_TUPLE "riscv64-linux-gnu"
++#elif defined(__riscv) && __riscv_xlen == 32
++#  define native_architecture() ARCHITECTURE_RISCV32
++#  define define LIB_ARCH_TUPLE "riscv32-linux-gnu"
+ #elif defined(__loongarch__) && __loongarch_grlen == 64
+ #  define native_architecture() ARCHITECTURE_LOONGARCH
+ #  define define LIB_ARCH_TUPLE "loongarch64-linux-gnu"
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-Define-portable-basename-function.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-Define-portable-basename-function.patch
new file mode 100644
index 0000000000..dc4c44c6af
--- /dev/null
+++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-Define-portable-basename-function.patch
@@ -0,0 +1,59 @@
+From 4b19c32791fb8a8663b3335f8a3675a2bbabe688 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 20 May 2024 18:40:36 -0700
+Subject: [PATCH] Define portable basename function
+
+Newer version of musl have removed prototype for basename in string.h [1]
+which now makes it fail to compile with GCC14+ compiler therefore
+define local basename utility function.
+
+[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
+
+Upstream-Status: Submitted [https://github.com/systemd/systemd-bootchart/pull/53]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/conf-files.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/conf-files.c b/src/conf-files.c
+index 5dd2d7d..b932bb2 100644
+--- a/src/conf-files.c
++++ b/src/conf-files.c
+@@ -35,6 +35,16 @@
+ #include "strv.h"
+ #include "util.h"
+ 
++/***
++ * basename is implemented differently across different C libraries. This
++ * implementation matches the one provided by the GNU libc, and does not
++ * modify its input parameter.
++***/
++static const char *sbc_basename(const char *path) {
++        const char *base = strrchr(path, '/');
++        return base ? base + 1 : path;
++}
++
+ static int files_add(Hashmap *h, const char *root, const char *path, const char *suffix) {
+         _cleanup_closedir_ DIR *dir = NULL;
+         const char *dirpath;
+@@ -63,7 +73,7 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char
+                 if (!p)
+                         return -ENOMEM;
+ 
+-                r = hashmap_put(h, basename(p), p);
++                r = hashmap_put(h, sbc_basename(p), p);
+                 if (r == -EEXIST) {
+                         log_debug("Skipping overridden file: %s.", p);
+                         free(p);
+@@ -84,7 +94,7 @@ static int base_cmp(const void *a, const void *b) {
+ 
+         s1 = *(char * const *)a;
+         s2 = *(char * const *)b;
+-        return strcmp(basename(s1), basename(s2));
++        return strcmp(sbc_basename(s1), sbc_basename(s2));
+ }
+ 
+ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const char *root, char **dirs) {
+-- 
+2.45.1
+
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb
index 25544029d5..31f3add89f 100644
--- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb
+++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb
@@ -11,19 +11,18 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c
 SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https;branch=main \
            file://mips64.patch \
            file://no_lto.patch \
+           file://0001-Add-riscv32-support.patch \
 "
 
 SRC_URI:append:libc-musl = " \
     file://0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch \
     file://0002-musl-does-not-provide-printf-h.patch \
     file://0003-musl-does-not-provide-canonicalize_file_name.patch \
+    file://0001-Define-portable-basename-function.patch \
     "
 
-
 SRCREV = "8ab9680a1bd5eb8fe7a7dcc44897af7ee41e56e7"
 
-S = "${WORKDIR}/git"
-
 DEPENDS = "systemd libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool"
 
 inherit pkgconfig autotools systemd features_check