summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch35
-rw-r--r--meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb (renamed from meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb)4
2 files changed, 2 insertions, 37 deletions
diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch
deleted file mode 100644
index fef71afde5..0000000000
--- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From e415152b51eacab8705b6b3274cc0d1a274772e0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 30 Aug 2022 19:54:35 -0700
4Subject: [PATCH] libtrace: Use XSI version of strerror_r on non glibc systems
5
6The version used is glibc specific therefore make it so
7and provide a fallback for non-glibc systems
8
9Upstream-Status: Submitted [https://github.com/mchehab/rasdaemon/pull/70]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 libtrace/event-parse.c | 6 ++++++
13 1 file changed, 6 insertions(+)
14
15diff --git a/libtrace/event-parse.c b/libtrace/event-parse.c
16index 6c705c3..6b651d5 100644
17--- a/libtrace/event-parse.c
18+++ b/libtrace/event-parse.c
19@@ -5071,7 +5071,13 @@ int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum,
20 const char *msg;
21
22 if (errnum >= 0) {
23+#if defined(__GLIBC__)
24 msg = strerror_r(errnum, buf, buflen);
25+#else
26+ if (strerror_r(errnum, buf, buflen) != 0)
27+ snprintf(buf, buflen, "unknown error %i", errnum);
28+ msg = buf;
29+#endif
30 if (msg != buf) {
31 size_t len = strlen(msg);
32 memcpy(buf, msg, min(buflen - 1, len));
33--
342.37.3
35
diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb
index 3a525e8a15..c083a3a37a 100644
--- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb
+++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb
@@ -4,14 +4,14 @@ LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" 4LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc"
5 5
6SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \ 6SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \
7 file://0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch \
8 file://rasdaemon.service \ 7 file://rasdaemon.service \
9 file://init" 8 file://init"
10 9
11SRCREV = "c2255178a49f62c53009a456bc37dd5e37332f09" 10SRCREV = "4e83b848e7961af25028f3a2cecf37a63279a2bf"
12 11
13S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
14 13
14DEPENDS = "libtraceevent"
15RDEPENDS:${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \ 15RDEPENDS:${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \
16 perl-module-posix perl-module-file-glob libdbi-perl libdbd-sqlite-perl" 16 perl-module-posix perl-module-file-glob libdbi-perl libdbd-sqlite-perl"
17 17