summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb16
-rw-r--r--meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-rasdaemon-fix-post-processing-options.patch83
-rw-r--r--meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.4.bb (renamed from meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.3.bb)7
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch25
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch15
-rw-r--r--meta-oe/recipes-extended/wxwidgets/wxwidgets_3.3.1.bb (renamed from meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb)6
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb (renamed from meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb)8
-rw-r--r--meta-python/conf/include/ptest-packagelists-meta-python.inc2
-rw-r--r--meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb1
-rw-r--r--meta-python/recipes-devtools/python/python3-pytest-cov_7.0.0.bb (renamed from meta-python/recipes-devtools/python/python3-pytest-cov_6.2.1.bb)6
-rw-r--r--meta-python/recipes-devtools/python/python3-pytest-picked/0001-adjust-failing-tests-to-capture-only-ptest-output.patch50
-rw-r--r--meta-python/recipes-devtools/python/python3-pytest-picked/run-ptest5
-rw-r--r--meta-python/recipes-devtools/python/python3-pytest-picked_0.5.1.bb20
-rw-r--r--meta-python/recipes-devtools/python/python3-tenacity/0001-ptest-skip-a-test-that-does-not-pass-on-qemu.patch27
-rw-r--r--meta-python/recipes-devtools/python/python3-tenacity_9.1.2.bb19
15 files changed, 176 insertions, 114 deletions
diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
index 219735acd1..b7b925da0e 100644
--- a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
+++ b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
@@ -39,7 +39,21 @@ do_install_ptest() {
39 ${D}${PTEST_PATH}/build/autom4te.cache \ 39 ${D}${PTEST_PATH}/build/autom4te.cache \
40 ${D}${PTEST_PATH}/*/*/.git ${D}${PTEST_PATH}/*/*/.github \ 40 ${D}${PTEST_PATH}/*/*/.git ${D}${PTEST_PATH}/*/*/.github \
41 ${D}${PTEST_PATH}/*/*/autom4te.cache 41 ${D}${PTEST_PATH}/*/*/autom4te.cache
42 sed -i -e 's;${TMPDIR};;g' ${D}${PTEST_PATH}/build/config.status 42 sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \
43 -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
44 -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
45 -e 's@[^ ]*--sysroot=[^ "]*@@g' \
46 -e 's@[^ ]*--with-libtool-sysroot=[^ "]*@@g' \
47 -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \
48 -e '/EXT2FS_CFLAGS/d' \
49 -e '/LDFLAGS/d' \
50 -e '/PKG_CONFIG_PATH/d' \
51 -e '/PKG_CONFIG_LIBDIR/d' \
52 -e 's@${S}@${PTEST_PATH}@g' \
53 -e 's@${B}@${PTEST_PATH}/build@g' \
54 -e 's@${HOSTTOOLS_DIR}@@g' \
55 -e 's@${RECIPE_SYSROOT}@@g' \
56 -i ${D}${PTEST_PATH}/build/config.status
43} 57}
44 58
45RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl" 59RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl"
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 @@
1From 64bc04705ea8606eed1b1e810904cc8296e99472 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Sat, 2 Aug 2025 15:43:11 +0800
4Subject: [PATCH] rasdaemon: fix post-processing options
5
6Some post-processing options require an argument, otherwise a segfault
7will occur:
8
9root@qemux86-64:~# rasdaemon -p --status --ipid
10Segmentation fault (core dumped) rasdaemon -p --status --ipid
11
12According to the specification of argp, when an option requires an
13argument, we should use the 'arg' parameter, which points to the
14argument string for that option. Therefore we set char* arg for these
15options in struct argp_option and use it in parse_opt_offline function
16instead of state->argv[state->next].
17
18Fix #220
19
20Upstream-Status: Backport
21[https://github.com/mchehab/rasdaemon/commit/64bc04705ea8606eed1b1e810904cc8296e99472]
22
23Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
24Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
25---
26 rasdaemon.c | 24 ++++++++++++------------
27 1 file changed, 12 insertions(+), 12 deletions(-)
28
29diff --git a/rasdaemon.c b/rasdaemon.c
30index be5c390..9368b12 100644
31--- a/rasdaemon.c
32+++ b/rasdaemon.c
33@@ -98,22 +98,22 @@ static error_t parse_opt_offline(int key, char *arg,
34 event.smca = true;
35 break;
36 case MODEL:
37- event.model = strtoul(state->argv[state->next], NULL, 0);
38+ event.model = strtoul(arg, NULL, 0);
39 break;
40 case FAMILY:
41- event.family = strtoul(state->argv[state->next], NULL, 0);
42+ event.family = strtoul(arg, NULL, 0);
43 break;
44 case BANK_NUM:
45- event.bank = atoi(state->argv[state->next]);
46+ event.bank = atoi(arg);
47 break;
48 case IPID_REG:
49- event.ipid = strtoull(state->argv[state->next], NULL, 0);
50+ event.ipid = strtoull(arg, NULL, 0);
51 break;
52 case STATUS_REG:
53- event.status = strtoull(state->argv[state->next], NULL, 0);
54+ event.status = strtoull(arg, NULL, 0);
55 break;
56 case SYNDROME_REG:
57- event.synd = strtoull(state->argv[state->next], NULL, 0);
58+ event.synd = strtoull(arg, NULL, 0);
59 break;
60 default:
61 return ARGP_ERR_UNKNOWN;
62@@ -146,12 +146,12 @@ int main(int argc, char *argv[])
63 #ifdef HAVE_MCE
64 const struct argp_option offline_options[] = {
65 {"smca", SMCA, 0, 0, "AMD SMCA Error Decoding"},
66- {"model", MODEL, 0, 0, "CPU Model"},
67- {"family", FAMILY, 0, 0, "CPU Family"},
68- {"bank", BANK_NUM, 0, 0, "Bank Number"},
69- {"ipid", IPID_REG, 0, 0, "IPID Register (for SMCA systems only)"},
70- {"status", STATUS_REG, 0, 0, "Status Register"},
71- {"synd", SYNDROME_REG, 0, 0, "Syndrome Register"},
72+ {"model", MODEL, "MODEL", 0, "CPU Model"},
73+ {"family", FAMILY, "FAMILY", 0, "CPU Family"},
74+ {"bank", BANK_NUM, "BANK_NUM", 0, "Bank Number"},
75+ {"ipid", IPID_REG, "IPID_REG", 0, "IPID Register (for SMCA systems only)"},
76+ {"status", STATUS_REG, "STATUS_REG", 0, "Status Register"},
77+ {"synd", SYNDROME_REG, "SYNDROME_REG", 0, "Syndrome Register"},
78 {0, 0, 0, 0, 0, 0},
79 };
80
81--
822.43.0
83
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"
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-rasdaemon-fix-post-processing-options.patch \
8 file://rasdaemon.service \ 7 file://rasdaemon.service \
9 file://init" 8 file://init"
10 9
11SRCREV = "db0870edd2919f4f4d0101843136bcae92ab0743" 10SRCREV = "5a1efb8f324498df8cbaaa5adff0e9db96f648a9"
12 11
13 12DEPENDS = "libtraceevent pciutils"
14DEPENDS = "libtraceevent"
15RDEPENDS:${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \ 13RDEPENDS:${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" 14 perl-module-posix perl-module-file-glob libdbi-perl libdbd-sqlite-perl"
17 15
@@ -41,6 +39,7 @@ do_install:append() {
41 39
42FILES:${PN} += "${sbindir}/rasdaemon \ 40FILES:${PN} += "${sbindir}/rasdaemon \
43 ${sysconfdir}/init.d \ 41 ${sysconfdir}/init.d \
42 ${datadir} \
44 ${systemd_unitdir}/system/rasdaemon.service" 43 ${systemd_unitdir}/system/rasdaemon.service"
45 44
46SYSTEMD_SERVICE:${PN} = "rasdaemon.service" 45SYSTEMD_SERVICE:${PN} = "rasdaemon.service"
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
index cd0417612f..bc6c4e6f54 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
@@ -15,6 +15,9 @@ Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX
15in this patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass. 15in this patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
16 16
17Signed-off-by: Kai Kang <kai.kang@windriver.com> 17Signed-off-by: Kai Kang <kai.kang@windriver.com>
18
19Update for 3.3.1
20Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
18--- 21---
19 CMakeLists.txt | 2 +- 22 CMakeLists.txt | 2 +-
20 build/cmake/config.cmake | 2 +- 23 build/cmake/config.cmake | 2 +-
@@ -23,7 +26,7 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
23 4 files changed, 9 insertions(+), 9 deletions(-) 26 4 files changed, 9 insertions(+), 9 deletions(-)
24 27
25diff --git a/CMakeLists.txt b/CMakeLists.txt 28diff --git a/CMakeLists.txt b/CMakeLists.txt
26index d6a4b49..9e86b87 100644 29index 6112fb7fac..42c0430598 100644
27--- a/CMakeLists.txt 30--- a/CMakeLists.txt
28+++ b/CMakeLists.txt 31+++ b/CMakeLists.txt
29@@ -43,7 +43,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE) 32@@ -43,7 +43,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE)
@@ -36,7 +39,7 @@ index d6a4b49..9e86b87 100644
36 # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION 39 # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION
37 file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS) 40 file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS)
38diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake 41diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
39index addd8d6..9ec6775 100644 42index fe6c0f84c7..6845aacbe0 100644
40--- a/build/cmake/config.cmake 43--- a/build/cmake/config.cmake
41+++ b/build/cmake/config.cmake 44+++ b/build/cmake/config.cmake
42@@ -100,7 +100,7 @@ function(wx_write_config_inplace) 45@@ -100,7 +100,7 @@ function(wx_write_config_inplace)
@@ -49,10 +52,10 @@ index addd8d6..9ec6775 100644
49 ) 52 )
50 endfunction() 53 endfunction()
51diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake 54diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
52index 202d054..e255e0b 100644 55index a373983043..225a112ca5 100644
53--- a/build/cmake/install.cmake 56--- a/build/cmake/install.cmake
54+++ b/build/cmake/install.cmake 57+++ b/build/cmake/install.cmake
55@@ -44,11 +44,11 @@ if(WIN32_MSVC_NAMING) 58@@ -51,11 +51,11 @@ if(WIN32_MSVC_NAMING)
56 else() 59 else()
57 install( 60 install(
58 DIRECTORY "${wxSETUP_HEADER_PATH}" 61 DIRECTORY "${wxSETUP_HEADER_PATH}"
@@ -66,12 +69,12 @@ index 202d054..e255e0b 100644
66 PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ 69 PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
67 GROUP_EXECUTE GROUP_READ 70 GROUP_EXECUTE GROUP_READ
68 WORLD_EXECUTE WORLD_READ 71 WORLD_EXECUTE WORLD_READ
69@@ -57,13 +57,13 @@ else() 72@@ -64,13 +64,13 @@ else()
70 install(DIRECTORY DESTINATION "bin") 73 install(DIRECTORY DESTINATION "bin")
71 install(CODE "execute_process( \ 74 install(CODE "execute_process( \
72 COMMAND ${CMAKE_COMMAND} -E create_symlink \ 75 COMMAND ${CMAKE_COMMAND} -E create_symlink \
73- \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \ 76- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
74+ \"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \ 77+ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
75 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ 78 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
76 )" 79 )"
77 ) 80 )
@@ -82,7 +85,7 @@ index 202d054..e255e0b 100644
82 85
83 # find_package config file 86 # find_package config file
84 include(CMakePackageConfigHelpers) 87 include(CMakePackageConfigHelpers)
85@@ -86,11 +86,11 @@ write_basic_package_version_file( 88@@ -93,11 +93,11 @@ write_basic_package_version_file(
86 configure_package_config_file( 89 configure_package_config_file(
87 "${wxSOURCE_DIR}/build/cmake/wxWidgetsConfig.cmake.in" 90 "${wxSOURCE_DIR}/build/cmake/wxWidgetsConfig.cmake.in"
88 "${projectConfig}" 91 "${projectConfig}"
@@ -97,10 +100,10 @@ index 202d054..e255e0b 100644
97 100
98 # uninstall target 101 # uninstall target
99diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt 102diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
100index 2cb35e7..7977a84 100644 103index 84ba0351d7..e68ab16d1b 100644
101--- a/build/cmake/lib/webview/CMakeLists.txt 104--- a/build/cmake/lib/webview/CMakeLists.txt
102+++ b/build/cmake/lib/webview/CMakeLists.txt 105+++ b/build/cmake/lib/webview/CMakeLists.txt
103@@ -146,7 +146,7 @@ if(WXGTK AND wxUSE_WEBVIEW_WEBKIT2) 106@@ -153,7 +153,7 @@ if(WXGTK AND wxUSE_WEBVIEW_WEBKIT2)
104 ${WEBKIT2_LIBRARIES} 107 ${WEBKIT2_LIBRARIES}
105 ) 108 )
106 109
@@ -110,5 +113,5 @@ index 2cb35e7..7977a84 100644
110 wx_add_dependencies(wxwebview wxwebkit2_ext) 113 wx_add_dependencies(wxwebview wxwebkit2_ext)
111 endif() 114 endif()
112-- 115--
1132.49.0 1162.43.0
114 117
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
index dbede0304f..f0d22ec56d 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
@@ -24,37 +24,40 @@ Create symlink with relative path to fix the issues.
24Upstream-Status: Pending 24Upstream-Status: Pending
25 25
26Signed-off-by: Kai Kang <kai.kang@windriver.com> 26Signed-off-by: Kai Kang <kai.kang@windriver.com>
27
28Update for 3.3.1.
29Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
27--- 30---
28 build/cmake/install.cmake | 2 +- 31 build/cmake/install.cmake | 2 +-
29 build/cmake/utils/CMakeLists.txt | 2 +- 32 build/cmake/utils/CMakeLists.txt | 2 +-
30 2 files changed, 2 insertions(+), 2 deletions(-) 33 2 files changed, 2 insertions(+), 2 deletions(-)
31 34
32diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake 35diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
33index d3303faabb..c79e187f37 100644 36index 5a54fcb895..1dcd1b2886 100644
34--- a/build/cmake/install.cmake 37--- a/build/cmake/install.cmake
35+++ b/build/cmake/install.cmake 38+++ b/build/cmake/install.cmake
36@@ -42,7 +42,7 @@ else() 39@@ -64,7 +64,7 @@ else()
37 install(DIRECTORY DESTINATION "bin") 40 install(DIRECTORY DESTINATION "bin")
38 install(CODE "execute_process( \ 41 install(CODE "execute_process( \
39 COMMAND ${CMAKE_COMMAND} -E create_symlink \ 42 COMMAND ${CMAKE_COMMAND} -E create_symlink \
40- \"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \ 43- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
41+ \"../lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \ 44+ \"../lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \
42 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ 45 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
43 )" 46 )"
44 ) 47 )
45diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt 48diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
46index dbed8cc9b3..1dbc3261d3 100644 49index 15f4339ef9..1dbc3261d3 100644
47--- a/build/cmake/utils/CMakeLists.txt 50--- a/build/cmake/utils/CMakeLists.txt
48+++ b/build/cmake/utils/CMakeLists.txt 51+++ b/build/cmake/utils/CMakeLists.txt
49@@ -40,7 +40,7 @@ if(wxUSE_XRC) 52@@ -40,7 +40,7 @@ if(wxUSE_XRC)
50 # Don't use wx_install() here to preserve escaping. 53 # Don't use wx_install() here to preserve escaping.
51 install(CODE "execute_process( \ 54 install(CODE "execute_process( \
52 COMMAND ${CMAKE_COMMAND} -E create_symlink \ 55 COMMAND ${CMAKE_COMMAND} -E create_symlink \
53- \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \ 56- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
54+ \"./${wxrc_output_name}${EXE_SUFFIX}\" \ 57+ \"./${wxrc_output_name}${EXE_SUFFIX}\" \
55 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ 58 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
56 )" 59 )"
57 ) 60 )
58-- 61--
592.25.1 622.43.0
60 63
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.3.1.bb
index fcb30b41b0..8e5c3e60c6 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.3.1.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
18 tiff \ 18 tiff \
19" 19"
20 20
21SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https;tag=v${PV} \ 21SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=master;protocol=https;tag=v${PV} \
22 file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ 22 file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
23 file://0002-fix-libdir-for-multilib.patch \ 23 file://0002-fix-libdir-for-multilib.patch \
24 file://0003-create-links-with-relative-path.patch \ 24 file://0003-create-links-with-relative-path.patch \
@@ -27,7 +27,7 @@ SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https;
27 file://0006-Fix-locale-on-musl.patch \ 27 file://0006-Fix-locale-on-musl.patch \
28 file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \ 28 file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
29 " 29 "
30SRCREV = "8aef5f40b93958719771331ca03866b7b6fff6bf" 30SRCREV = "49c6810948f40c457e3d0848b9111627b5b61de5"
31 31
32UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" 32UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
33 33
@@ -110,7 +110,7 @@ do_install:append() {
110 # fix host contamination 110 # fix host contamination
111 sed -i -e "s#${STAGING_DIR_NATIVE}##g" \ 111 sed -i -e "s#${STAGING_DIR_NATIVE}##g" \
112 -e "s#${STAGING_DIR_TARGET}##g" \ 112 -e "s#${STAGING_DIR_TARGET}##g" \
113 ${D}${libdir}/wx/config/*-unicode-3.2 \ 113 ${D}${libdir}/wx/config/*-unicode-3.3 \
114 ${D}${libdir}/cmake/wxWidgets/wxWidgetsTargets.cmake 114 ${D}${libdir}/cmake/wxWidgets/wxWidgetsTargets.cmake
115} 115}
116 116
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/"
3SECTION = "libs" 3SECTION = "libs"
4 4
5LICENSE = "LGPL-2.1-only & GPL-2.0-only" 5LICENSE = "LGPL-2.1-only & GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ 6LIC_FILES_CHKSUM = " \
7 file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" 7 file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \
8 file://COPYING.tools;md5=570a9b3749dd0463a1778803b12a6dce \
9"
8 10
9DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native" 11DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native"
10 12
@@ -14,7 +16,7 @@ inherit gnomebase features_check
14 16
15REQUIRED_DISTRO_FEATURES = "opengl x11" 17REQUIRED_DISTRO_FEATURES = "opengl x11"
16 18
17SRC_URI[archive.sha256sum] = "9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda" 19SRC_URI[archive.sha256sum] = "daad9bf9b70f90975f91781fc7a656c923a91374261f576c883cd3aebd59c833"
18 20
19EXTRA_OEMESON = "-Dbuild-demos=false" 21EXTRA_OEMESON = "-Dbuild-demos=false"
20 22
diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc
index a172f8c676..b0130387bb 100644
--- a/meta-python/conf/include/ptest-packagelists-meta-python.inc
+++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc
@@ -76,6 +76,7 @@ PTESTS_FAST_META_PYTHON = "\
76 python3-pyserial \ 76 python3-pyserial \
77 python3-pytest-httpx \ 77 python3-pytest-httpx \
78 python3-pytest-mock \ 78 python3-pytest-mock \
79 python3-pytest-picked \
79 python3-pytest-sugar \ 80 python3-pytest-sugar \
80 python3-pytoml \ 81 python3-pytoml \
81 python3-pyyaml-include \ 82 python3-pyyaml-include \
@@ -96,6 +97,7 @@ PTESTS_FAST_META_PYTHON = "\
96 python3-soupsieve \ 97 python3-soupsieve \
97 python3-sqlparse \ 98 python3-sqlparse \
98 python3-starlette \ 99 python3-starlette \
100 python3-tenacity \
99 python3-tomli-w \ 101 python3-tomli-w \
100 python3-tomlkit \ 102 python3-tomlkit \
101 python3-trustme \ 103 python3-trustme \
diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index ad68d74205..d3abc0761f 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -351,6 +351,7 @@ RDEPENDS:packagegroup-meta-python3 = "\
351 python3-pytest-httpx \ 351 python3-pytest-httpx \
352 python3-pytest-lazy-fixtures \ 352 python3-pytest-lazy-fixtures \
353 python3-pytest-metadata \ 353 python3-pytest-metadata \
354 python3-pytest-picked\
354 python3-pytest-tempdir \ 355 python3-pytest-tempdir \
355 python3-pytest-timeout \ 356 python3-pytest-timeout \
356 python3-pytest-xdist \ 357 python3-pytest-xdist \
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 = " \
5 file://LICENSE;md5=cbc4e25353c748c817db2daffe605e43 \ 5 file://LICENSE;md5=cbc4e25353c748c817db2daffe605e43 \
6" 6"
7 7
8SRC_URI[sha256sum] = "25cc6cc0a5358204b8108ecedc51a9b57b34cc6b8c967cc2c01a4e00d8a67da2" 8SRC_URI[sha256sum] = "33c97eda2e049a0c5298e91f519302a1334c26ac65c1a483d6206fd458361af1"
9 9
10inherit pypi setuptools3 10inherit pypi python_setuptools_build_meta python_hatchling
11 11
12DEPENDS += "python3-setuptools-scm-native" 12DEPENDS += "python3-setuptools-scm-native python3-hatch-fancy-pypi-readme-native"
13RDEPENDS:${PN} += "python3-coverage python3-pytest python3-pluggy" 13RDEPENDS:${PN} += "python3-coverage python3-pytest python3-pluggy"
14 14
15PYPI_PACKAGE = "pytest_cov" 15PYPI_PACKAGE = "pytest_cov"
diff --git a/meta-python/recipes-devtools/python/python3-pytest-picked/0001-adjust-failing-tests-to-capture-only-ptest-output.patch b/meta-python/recipes-devtools/python/python3-pytest-picked/0001-adjust-failing-tests-to-capture-only-ptest-output.patch
new file mode 100644
index 0000000000..dfb50ace75
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-picked/0001-adjust-failing-tests-to-capture-only-ptest-output.patch
@@ -0,0 +1,50 @@
1From b9341394314e5dcaca0aa1d91fc3af28c64db387 Mon Sep 17 00:00:00 2001
2From: Tom Geelen <t.f.g.geelen@gmail.com>
3Date: Tue, 25 Nov 2025 20:42:15 +0100
4Subject: [PATCH] adjust failing tests to capture only ptest output
5
6The tests should only check for warnings emitted by the plugin itself,
7not for any other warnings that may be emitted by other plugins or pytest
8itself.
9
10Signed-off-by: Tom Geelen <t.f.g.geelen@gmail.com>
11Upstream-Status: Inappropriate [OE specific]
12---
13 tests/test_pytest_picked.py | 17 ++++++++++++++---
14 1 file changed, 14 insertions(+), 3 deletions(-)
15
16diff --git a/tests/test_pytest_picked.py b/tests/test_pytest_picked.py
17index fb2bedb..947b43a 100644
18--- a/tests/test_pytest_picked.py
19+++ b/tests/test_pytest_picked.py
20@@ -182,8 +182,13 @@ def test_should_accept_branch_as_mode(testdir, tmpdir, recwarn):
21 "Changed test folders... 0. []",
22 ]
23 )
24- assert len(recwarn) == 1
25- assert str(recwarn[0].message) == "Now `main` is the default parent branch"
26+ # Only count the plugin's own UserWarning about default parent branch
27+ plugin_warnings = [
28+ w
29+ for w in recwarn
30+ if w.category is UserWarning and "default parent branch" in str(w.message)
31+ ]
32+ assert len(plugin_warnings) == 1
33
34
35 def test_should_accept_unstaged_as_mode(testdir, tmpdir, recwarn):
36@@ -211,7 +216,13 @@ def test_should_accept_unstaged_as_mode(testdir, tmpdir, recwarn):
37 "Changed test folders... 0. []",
38 ]
39 )
40- assert len(recwarn) == 0
41+ # Ignore unrelated deprecation warnings from other plugins
42+ plugin_warnings = [
43+ w
44+ for w in recwarn
45+ if w.category is UserWarning and "default parent branch" in str(w.message)
46+ ]
47+ assert len(plugin_warnings) == 0
48
49
50 def test_should_not_run_the_tests_if_mode_is_invalid(testdir, tmpdir):
diff --git a/meta-python/recipes-devtools/python/python3-pytest-picked/run-ptest b/meta-python/recipes-devtools/python/python3-pytest-picked/run-ptest
new file mode 100644
index 0000000000..39f369f20b
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-picked/run-ptest
@@ -0,0 +1,5 @@
1#!/bin/sh
2
3# need to explicitly call the correct fixture as of pytest 8.x
4
5pytest -p pytester --automake
diff --git a/meta-python/recipes-devtools/python/python3-pytest-picked_0.5.1.bb b/meta-python/recipes-devtools/python/python3-pytest-picked_0.5.1.bb
new file mode 100644
index 0000000000..c7c2183337
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-picked_0.5.1.bb
@@ -0,0 +1,20 @@
1SUMMARY = "Run the tests related to the changed files"
2HOMEPAGE = "https://github.com/anapaulagomes/pytest-picked"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=6d374a27c85c3fcc979009952ec16f1b"
5RECIPE_MAINTAINER = "Tom Geelen <t.f.g.geelen@gmail.com>"
6
7SRC_URI += "file://run-ptest \
8 file://0001-adjust-failing-tests-to-capture-only-ptest-output.patch \
9 "
10SRC_URI[sha256sum] = "6634c4356a560a5dc3dba35471865e6eb06bbd356b56b69c540593e9d5620ded"
11
12inherit pypi python_setuptools_build_meta ptest-python-pytest
13
14RDEPENDS:${PN} += "\
15 git \
16 python3-pytest (>=3.7.0) \
17"
18
19PYPI_PACKAGE = "pytest_picked"
20UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
diff --git a/meta-python/recipes-devtools/python/python3-tenacity/0001-ptest-skip-a-test-that-does-not-pass-on-qemu.patch b/meta-python/recipes-devtools/python/python3-tenacity/0001-ptest-skip-a-test-that-does-not-pass-on-qemu.patch
new file mode 100644
index 0000000000..7fb9458a32
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-tenacity/0001-ptest-skip-a-test-that-does-not-pass-on-qemu.patch
@@ -0,0 +1,27 @@
1From 8895af81a672bb8aad2aa8e32b93cb9ca96cac63 Mon Sep 17 00:00:00 2001
2From: Jan Vermaete <jan.vermaete@oip.be>
3Date: Tue, 25 Nov 2025 10:52:15 +0100
4Subject: [PATCH 1/1] ptest: skip a test that does not pass on qemu
5
6Upstream-Status: Inappropriate [oe specific]
7
8Signed-off-by: Jan Vermaete <jan.vermaete@oip.be>
9---
10 tests/test_asyncio.py | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/tests/test_asyncio.py b/tests/test_asyncio.py
14index 0b74476..2da0784 100644
15--- a/tests/test_asyncio.py
16+++ b/tests/test_asyncio.py
17@@ -192,6 +192,7 @@ class TestContextManager(unittest.TestCase):
18 else:
19 raise Exception
20
21+ @unittest.skip("Failing in ptest with qemu")
22 @asynctest
23 async def test_sleeps(self):
24 start = current_time_ms()
25--
262.43.0
27
diff --git a/meta-python/recipes-devtools/python/python3-tenacity_9.1.2.bb b/meta-python/recipes-devtools/python/python3-tenacity_9.1.2.bb
new file mode 100644
index 0000000000..76d23aee40
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-tenacity_9.1.2.bb
@@ -0,0 +1,19 @@
1SUMMARY = "Retry code until it succeeds"
2HOMEPAGE = "https://github.com/jd/tenacity"
3LICENSE = "Apache-2.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
5
6SRC_URI[sha256sum] = "1169d376c297e7de388d18b4481760d478b0e99a777cad3a9c86e556f4b697cb"
7
8SRC_URI:append = "file://0001-ptest-skip-a-test-that-does-not-pass-on-qemu.patch"
9
10DEPENDS += "python3-setuptools-scm-native"
11
12inherit pypi python_setuptools_build_meta ptest-python-pytest
13
14PYPI_PACKAGE = "tenacity"
15
16RDEPENDS:${PN}-ptest += "\
17 python3-tornado \
18 python3-typeguard \
19"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-26 12:32:04 +0000