* drop the strerror_r patch as it's now included * now builds with out-of-tree libtraceevent
Signed-off-by: Beniamin Sandu <[email protected]> --- ...-version-of-strerror_r-on-non-glibc-.patch | 35 ------------------- ...{rasdaemon_0.6.8.bb => rasdaemon_0.8.0.bb} | 4 +-- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch rename meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/{rasdaemon_0.6.8.bb => rasdaemon_0.8.0.bb} (93%) 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 fef71afde..000000000 --- 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 @@ -From e415152b51eacab8705b6b3274cc0d1a274772e0 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 30 Aug 2022 19:54:35 -0700 -Subject: [PATCH] libtrace: Use XSI version of strerror_r on non glibc systems - -The version used is glibc specific therefore make it so -and provide a fallback for non-glibc systems - -Upstream-Status: Submitted [https://github.com/mchehab/rasdaemon/pull/70] -Signed-off-by: Khem Raj <[email protected]> ---- - libtrace/event-parse.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libtrace/event-parse.c b/libtrace/event-parse.c -index 6c705c3..6b651d5 100644 ---- a/libtrace/event-parse.c -+++ b/libtrace/event-parse.c -@@ -5071,7 +5071,13 @@ int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum, - const char *msg; - - if (errnum >= 0) { -+#if defined(__GLIBC__) - msg = strerror_r(errnum, buf, buflen); -+#else -+ if (strerror_r(errnum, buf, buflen) != 0) -+ snprintf(buf, buflen, "unknown error %i", errnum); -+ msg = buf; -+#endif - if (msg != buf) { - size_t len = strlen(msg); - memcpy(buf, msg, min(buflen - 1, len)); --- -2.37.3 - 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 similarity index 93% rename from meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb rename to meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb index 3a525e8a1..c083a3a37 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" LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \ - file://0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch \ file://rasdaemon.service \ file://init" -SRCREV = "c2255178a49f62c53009a456bc37dd5e37332f09" +SRCREV = "4e83b848e7961af25028f3a2cecf37a63279a2bf" S = "${WORKDIR}/git" +DEPENDS = "libtraceevent" RDEPENDS:${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \ perl-module-posix perl-module-file-glob libdbi-perl libdbd-sqlite-perl" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#103486): https://lists.openembedded.org/g/openembedded-devel/message/103486 Mute This Topic: https://lists.openembedded.org/mt/99697823/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
