From 5448c714225818745b994a0ca765f7d5ec53deac Mon Sep 17 00:00:00 2001 From: Beniamin Sandu Date: Thu, 22 Jun 2023 16:46:11 +0300 Subject: rasdaemon: upgrade to 0.8.0 * drop the strerror_r patch as it's now included * now builds with out-of-tree libtraceevent Signed-off-by: Beniamin Sandu Signed-off-by: Khem Raj --- ...e-XSI-version-of-strerror_r-on-non-glibc-.patch | 35 --------------- .../recipes-support/rasdaemon/rasdaemon_0.6.8.bb | 51 ---------------------- .../recipes-support/rasdaemon/rasdaemon_0.8.0.bb | 51 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 86 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 delete mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb create mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb (limited to 'meta-oe') 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 @@ -From e415152b51eacab8705b6b3274cc0d1a274772e0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- - 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.6.8.bb deleted file mode 100644 index 3a525e8a15..0000000000 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "Tools to provide a way to get Platform Reliability, Availability and Serviceability (RAS) reports made via the Kernel tracing events" -HOMEPAGE = "http://git.infradead.org/users/mchehab/rasdaemon.git" -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" - -S = "${WORKDIR}/git" - -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" - -inherit autotools pkgconfig update-rc.d systemd - -PACKAGECONFIG ??= "sqlite3 mce aer extlog devlink diskerror" -PACKAGECONFIG[sqlite3] = "--enable-sqlite3,--disable-sqlite3,sqlite3" -PACKAGECONFIG[mce] = "--enable-mce,--disable-mce" -PACKAGECONFIG[aer] = "--enable-aer,--disable-aer" -PACKAGECONFIG[extlog] = "--enable-extlog,--disable-extlog" -PACKAGECONFIG[devlink] = "--enable-devlink,--disable-devlink" -PACKAGECONFIG[diskerror] = "--enable-diskerror,--disable-diskerror" -PACKAGECONFIG[arm] = "--enable-arm,--disable-arm" -PACKAGECONFIG[hisi-ns-decode] = "--enable-hisi-ns-decode,--disable-hisi-ns-decode" -PACKAGECONFIG[non-standard] = "--enable-non-standard,--disable-non-standard" -PACKAGECONFIG[abrt-report] = "--enable-abrt-report,--disable-abrt-report" - -DEPENDS:append:libc-musl = " argp-standalone" -LDFLAGS:append:libc-musl = " -largp" - -do_install:append() { - install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system -} - -FILES:${PN} += "${sbindir}/rasdaemon \ - ${sysconfdir}/init.d \ - ${systemd_unitdir}/system/rasdaemon.service" - -SYSTEMD_SERVICE:${PN} = "rasdaemon.service" -SYSTEMD_AUTO_ENABLE = "enable" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME:${PN} = "rasdaemon" -INITSCRIPT_PARAMS:${PN} = "defaults 89" diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb new file mode 100644 index 0000000000..c083a3a37a --- /dev/null +++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb @@ -0,0 +1,51 @@ +DESCRIPTION = "Tools to provide a way to get Platform Reliability, Availability and Serviceability (RAS) reports made via the Kernel tracing events" +HOMEPAGE = "http://git.infradead.org/users/mchehab/rasdaemon.git" +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://rasdaemon.service \ + file://init" + +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" + +inherit autotools pkgconfig update-rc.d systemd + +PACKAGECONFIG ??= "sqlite3 mce aer extlog devlink diskerror" +PACKAGECONFIG[sqlite3] = "--enable-sqlite3,--disable-sqlite3,sqlite3" +PACKAGECONFIG[mce] = "--enable-mce,--disable-mce" +PACKAGECONFIG[aer] = "--enable-aer,--disable-aer" +PACKAGECONFIG[extlog] = "--enable-extlog,--disable-extlog" +PACKAGECONFIG[devlink] = "--enable-devlink,--disable-devlink" +PACKAGECONFIG[diskerror] = "--enable-diskerror,--disable-diskerror" +PACKAGECONFIG[arm] = "--enable-arm,--disable-arm" +PACKAGECONFIG[hisi-ns-decode] = "--enable-hisi-ns-decode,--disable-hisi-ns-decode" +PACKAGECONFIG[non-standard] = "--enable-non-standard,--disable-non-standard" +PACKAGECONFIG[abrt-report] = "--enable-abrt-report,--disable-abrt-report" + +DEPENDS:append:libc-musl = " argp-standalone" +LDFLAGS:append:libc-musl = " -largp" + +do_install:append() { + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system +} + +FILES:${PN} += "${sbindir}/rasdaemon \ + ${sysconfdir}/init.d \ + ${systemd_unitdir}/system/rasdaemon.service" + +SYSTEMD_SERVICE:${PN} = "rasdaemon.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "rasdaemon" +INITSCRIPT_PARAMS:${PN} = "defaults 89" -- cgit v1.2.3-54-g00ecf