From b84c1993271bd36571b0d0e34526901ab51668a3 Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Wed, 26 Nov 2025 15:09:59 +0800 Subject: rasdaemon: upgrade 0.8.3 -> 0.8.4 1.Changelog: https://github.com/mchehab/rasdaemon/commit/5a1efb8f324498df8cbaaa5adff0e9db96f648a9 2.Remove 0001-rasdaemon-fix-post-processing-options.patch as it was merged upstream. Signed-off-by: Liu Yiding Signed-off-by: Khem Raj --- ...001-rasdaemon-fix-post-processing-options.patch | 83 ---------------------- .../recipes-support/rasdaemon/rasdaemon_0.8.3.bb | 51 ------------- .../recipes-support/rasdaemon/rasdaemon_0.8.4.bb | 50 +++++++++++++ 3 files changed, 50 insertions(+), 134 deletions(-) delete mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-rasdaemon-fix-post-processing-options.patch delete mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.3.bb create mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.4.bb (limited to 'meta-oe') diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-rasdaemon-fix-post-processing-options.patch b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-rasdaemon-fix-post-processing-options.patch deleted file mode 100644 index d999f288dc..0000000000 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-rasdaemon-fix-post-processing-options.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 64bc04705ea8606eed1b1e810904cc8296e99472 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Sat, 2 Aug 2025 15:43:11 +0800 -Subject: [PATCH] rasdaemon: fix post-processing options - -Some post-processing options require an argument, otherwise a segfault -will occur: - -root@qemux86-64:~# rasdaemon -p --status --ipid -Segmentation fault (core dumped) rasdaemon -p --status --ipid - -According to the specification of argp, when an option requires an -argument, we should use the 'arg' parameter, which points to the -argument string for that option. Therefore we set char* arg for these -options in struct argp_option and use it in parse_opt_offline function -instead of state->argv[state->next]. - -Fix #220 - -Upstream-Status: Backport -[https://github.com/mchehab/rasdaemon/commit/64bc04705ea8606eed1b1e810904cc8296e99472] - -Signed-off-by: Yi Zhao -Signed-off-by: Mauro Carvalho Chehab ---- - rasdaemon.c | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/rasdaemon.c b/rasdaemon.c -index be5c390..9368b12 100644 ---- a/rasdaemon.c -+++ b/rasdaemon.c -@@ -98,22 +98,22 @@ static error_t parse_opt_offline(int key, char *arg, - event.smca = true; - break; - case MODEL: -- event.model = strtoul(state->argv[state->next], NULL, 0); -+ event.model = strtoul(arg, NULL, 0); - break; - case FAMILY: -- event.family = strtoul(state->argv[state->next], NULL, 0); -+ event.family = strtoul(arg, NULL, 0); - break; - case BANK_NUM: -- event.bank = atoi(state->argv[state->next]); -+ event.bank = atoi(arg); - break; - case IPID_REG: -- event.ipid = strtoull(state->argv[state->next], NULL, 0); -+ event.ipid = strtoull(arg, NULL, 0); - break; - case STATUS_REG: -- event.status = strtoull(state->argv[state->next], NULL, 0); -+ event.status = strtoull(arg, NULL, 0); - break; - case SYNDROME_REG: -- event.synd = strtoull(state->argv[state->next], NULL, 0); -+ event.synd = strtoull(arg, NULL, 0); - break; - default: - return ARGP_ERR_UNKNOWN; -@@ -146,12 +146,12 @@ int main(int argc, char *argv[]) - #ifdef HAVE_MCE - const struct argp_option offline_options[] = { - {"smca", SMCA, 0, 0, "AMD SMCA Error Decoding"}, -- {"model", MODEL, 0, 0, "CPU Model"}, -- {"family", FAMILY, 0, 0, "CPU Family"}, -- {"bank", BANK_NUM, 0, 0, "Bank Number"}, -- {"ipid", IPID_REG, 0, 0, "IPID Register (for SMCA systems only)"}, -- {"status", STATUS_REG, 0, 0, "Status Register"}, -- {"synd", SYNDROME_REG, 0, 0, "Syndrome Register"}, -+ {"model", MODEL, "MODEL", 0, "CPU Model"}, -+ {"family", FAMILY, "FAMILY", 0, "CPU Family"}, -+ {"bank", BANK_NUM, "BANK_NUM", 0, "Bank Number"}, -+ {"ipid", IPID_REG, "IPID_REG", 0, "IPID Register (for SMCA systems only)"}, -+ {"status", STATUS_REG, "STATUS_REG", 0, "Status Register"}, -+ {"synd", SYNDROME_REG, "SYNDROME_REG", 0, "Syndrome Register"}, - {0, 0, 0, 0, 0, 0}, - }; - --- -2.43.0 - diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.3.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.3.bb deleted file mode 100644 index 2cc2a26acb..0000000000 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.3.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 = "https://github.com/mchehab/rasdaemon" -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-rasdaemon-fix-post-processing-options.patch \ - file://rasdaemon.service \ - file://init" - -SRCREV = "db0870edd2919f4f4d0101843136bcae92ab0743" - - -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 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${UNPACKDIR}/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.4.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.4.bb new file mode 100644 index 0000000000..0024729a91 --- /dev/null +++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.4.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "Tools to provide a way to get Platform Reliability, Availability and Serviceability (RAS) reports made via the Kernel tracing events" +HOMEPAGE = "https://github.com/mchehab/rasdaemon" +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 = "5a1efb8f324498df8cbaaa5adff0e9db96f648a9" + +DEPENDS = "libtraceevent pciutils" +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 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system +} + +FILES:${PN} += "${sbindir}/rasdaemon \ + ${sysconfdir}/init.d \ + ${datadir} \ + ${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