4 files changed, 11 insertions, 93 deletions

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 <yi.zhao@windriver.com>
-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 <yi.zhao@windriver.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
----
- 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.4.bb
index 2cc2a26acb..0024729a91 100644
--- 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.4.bb
@@ -4,14 +4,12 @@ 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"
+SRCREV = "5a1efb8f324498df8cbaaa5adff0e9db96f648a9"
 
-
-DEPENDS = "libtraceevent"
+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"
 
@@ -41,6 +39,7 @@ do_install:append() {
 
 FILES:${PN} += "${sbindir}/rasdaemon \
                 ${sysconfdir}/init.d \
+                ${datadir} \
                 ${systemd_unitdir}/system/rasdaemon.service"
 
 SYSTEMD_SERVICE:${PN} = "rasdaemon.service"
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
index d3a01e444c..439ab800f8 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
@@ -3,8 +3,10 @@ HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 
 LICENSE = "LGPL-2.1-only & GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
-                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = " \
+        file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \
+        file://COPYING.tools;md5=570a9b3749dd0463a1778803b12a6dce \
+"
 
 DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native"
 
@@ -14,7 +16,7 @@ inherit gnomebase features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl x11"
 
-SRC_URI[archive.sha256sum] = "9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda"
+SRC_URI[archive.sha256sum] = "daad9bf9b70f90975f91781fc7a656c923a91374261f576c883cd3aebd59c833"
 
 EXTRA_OEMESON = "-Dbuild-demos=false"
 
diff --git a/meta-python/recipes-devtools/python/python3-pytest-cov_6.2.1.bb b/meta-python/recipes-devtools/python/python3-pytest-cov_7.0.0.bb
index af4ce4b770..117767d1ee 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-cov_6.2.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pytest-cov_7.0.0.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE;md5=cbc4e25353c748c817db2daffe605e43 \
 "
 
-SRC_URI[sha256sum] = "25cc6cc0a5358204b8108ecedc51a9b57b34cc6b8c967cc2c01a4e00d8a67da2"
+SRC_URI[sha256sum] = "33c97eda2e049a0c5298e91f519302a1334c26ac65c1a483d6206fd458361af1"
 
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta python_hatchling
 
-DEPENDS += "python3-setuptools-scm-native"
+DEPENDS += "python3-setuptools-scm-native python3-hatch-fancy-pypi-readme-native"
 RDEPENDS:${PN} += "python3-coverage python3-pytest python3-pluggy"
 
 PYPI_PACKAGE = "pytest_cov"