760 files changed, 10006 insertions, 12225 deletions
diff --git a/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc b/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc
index f57bbab93..875a2f139 100644
--- a/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc
+++ b/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc
@@ -8,11 +8,10 @@
 PTESTS_FAST_META_FILESYSTEMS = "\
    e2tools \
-    fuse3 \
 "
 PTESTS_SLOW_META_FILESYSTEMS = "\
+    sshfs-fuse \
 "
 PTESTS_PROBLEMS_META_FILESYSTEMS = "\
-    sshfs-fuse \
 "
diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf
index 52ca5a4c0..8a0c831e2 100644
--- a/meta-filesystems/conf/layer.conf
+++ b/meta-filesystems/conf/layer.conf
@@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1"
 LAYERDEPENDS_filesystems-layer = "core openembedded-layer networking-layer"
-LAYERSERIES_COMPAT_filesystems-layer = "styhead"
+LAYERSERIES_COMPAT_filesystems-layer = "styhead walnascar"
diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest
index b63c4de0d..5aab54d5b 100644
--- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest
+++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest
@@ -1,3 +1,11 @@
 #!/bin/sh
+mkdir -p ~/.ssh
+cat > ~/.ssh/config << EOF
+Host *
+  CheckHostIP no
+  StrictHostKeyChecking no
+  UserKnownHostsFile=/dev/null
+EOF
+pytest --automake
-pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
+rm -rf ~/.ssh/config
diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb
index 5a926dac0..569c7f690 100644
--- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb
+++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb
@@ -17,9 +17,11 @@ inherit meson pkgconfig ptest
 SRC_URI += " \
        file://run-ptest \
 "
+#python3-compile for filecmp module
 RDEPENDS:${PN}-ptest += " \
+        python3-compile \
        python3-pytest \
+        python3-unittest-automake-output \
        bash \
        fuse \
 "
@@ -27,4 +29,5 @@ RDEPENDS:${PN}-ptest += " \
 do_install_ptest() {
        install -d ${D}${PTEST_PATH}/test
        cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/
+        ln -sf ${bindir}/sshfs ${D}${PTEST_PATH}/sshfs
 }
diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb
index 504fe2892..1b41deb09 100644
--- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb
+++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb
@@ -38,6 +38,12 @@ EXTRA_OECONF:append = " \
    --without-dracutdir --enable-linux-builtin \
 "
+# Reproducibility: Force target distribution ("vendor") to Debian to match
+# default values for things like: NFS server service name, bash completion
+# path, configuration files, ...
+# The Debian values do match the OpenEmbedded ones.
+EXTRA_OECONF:append = " --with-vendor=debian"
 EXTRA_OEMAKE:append = " \
    INSTALL_MOD_PATH=${D}${root_prefix} \
 "
diff --git a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
index 6f613e9cd..fca7d42b3 100644
--- a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
+++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
@@ -23,7 +23,7 @@ SRC_URI[sha256sum] = "d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7
 UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases"
 UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>2(\.\d+)+).tar.gz"
-CVE_PRODUCT = "fuse_project:fuse"
+CVE_PRODUCT = "fuse_project:fuse fuse:fuse"
 inherit autotools pkgconfig update-rc.d systemd
diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
index 459c7058e..d7e654bab 100644
--- a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb
+++ b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
@@ -11,15 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS += "coreutils e2fsprogs"
-PV = "0.1.0+git"
 SRC_URI = " \
           git://github.com/e2tools/e2tools;protocol=https;branch=master \
-           file://0001-Disable-portability-warning-as-error.patch \
           file://run-ptest \
 "
-SRCREV = "fd092754a6b65c3a769f74f888668c066f09c36d"
+SRCREV = "46da6c398e70635a296245851fcedbc56c35e824"
 S = "${WORKDIR}/git"
diff --git a/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch b/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch
deleted file mode 100644
index dec793f37..000000000
--- a/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e0aaedea30483bf5b9bb085e12fff79144fa1174 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 29 Aug 2024 11:12:57 -0700
-Subject: [PATCH] Disable portability warning as error
-With latest automake 1.17 its warning about escape hash
-mark [1] and since configure.ac uses -werror to call automake
-this becomes an error and reconfigure fails.
-escape hash mark is non-portable as discussed here [2]
-Fow now let it be a warning, it should be fixed in a portable way
-[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=7610
-[2] https://lists.gnu.org/archive/html/automake/2011-08/msg00023.html
-Upstream-Status: Submitted [https://github.com/e2tools/e2tools/pull/31]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/configure.ac b/configure.ac
-index dd32c4d..9f37591 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -14,6 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE([
- -Wall
- -Werror
-+-Wno-portability
- 1.9.6
- foreign
- subdir-objects
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index f831de78c..6adf7a405 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -17,7 +17,7 @@ LAYERVERSION_gnome-layer = "1"
 LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python"
-LAYERSERIES_COMPAT_gnome-layer = "styhead"
+LAYERSERIES_COMPAT_gnome-layer = "styhead walnascar"
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\
  faenza-icon-theme->gdk-pixbuf \
diff --git a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_47.0.bb
index a16a02aa7..38a8cc01a 100644
--- a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb
+++ b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_47.0.bb
@@ -8,7 +8,7 @@ inherit gnomebase gettext gsettings features_check
 REQUIRED_DISTRO_FEATURES = "opengl polkit"
-SRC_URI[archive.sha256sum] = "97443eaffe4b1a69626886a41d25cbeb2c148d3fed43d92115c1b7d20d5238ab"
+SRC_URI[archive.sha256sum] = "8aa55775757b299debe417e169e6e28fecbf18ce611ed176fa0d650ab5344776"
 DEPENDS = " \
    asciidoc-native \
diff --git a/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.1.bb b/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_47.0.bb
index 6272065de..fca055d39 100644
--- a/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.1.bb
+++ b/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_47.0.bb
@@ -20,7 +20,7 @@ DEPENDS = " \
  libvirt-glib \
  mtools \
  spice-gtk \
-  tracker \
+  tinysparql \
  webkitgtk3 \
  appstream-glib-native \
  spice-protocol \
@@ -31,7 +31,7 @@ RDEPENDS:${PN} = "glib-2.0-dev libvirt-virsh qemu-common qemu-system-x86-64 geni
 inherit gnomebase gsettings pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check
-SRC_URI[archive.sha256sum] = "900c177f6762640370a6634cf9e7d3cd8207e498367a8a667a6b731b04116036"
+SRC_URI[archive.sha256sum] = "65bf6c2de1bf4d51695c9192c5b1e6285cb32c98a18aa948a376ea32038bc78f"
 GIR_MESON_OPTION = ""
 VALA_MESON_OPTION = ""
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-gimptool-allow-default-CC-override.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-gimptool-allow-default-CC-override.patch
new file mode 100644
index 000000000..b04a16cec
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-gimptool-allow-default-CC-override.patch
@@ -0,0 +1,85 @@
+From 7e5b986cb7797a6535fe2471b9a5fb7c00821f51 Mon Sep 17 00:00:00 2001
+From: Yoann Congal <yoann.congal@smile.fr>
+Date: Sun, 13 Oct 2024 01:00:10 +0200
+Subject: [PATCH] gimptool: allow default CC override
+From: Yoann Congal <yoann.congal@smile.fr>
+In OE, CC contains sysroot path. Storing CC in binary then leads to
+non-reproducibility.
+This commit add a new configure option "--with-default-cc='cmd'" for
+force the CC stored in gimptool to a reproducible value.
+Upstream-Status: Inappropriate [does not apply on master (upstream has moved to meson)]
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ app-tools/Makefile.am |  2 +-
+ configure.ac          | 13 +++++++++++++
+ tools/Makefile.am     |  2 +-
+ tools/gimptool.c      |  2 +-
+ 4 files changed, 16 insertions(+), 3 deletions(-)
+diff --git a/app-tools/Makefile.am b/app-tools/Makefile.am
+index a7cd4ce..81a3a00 100644
+--- a/app-tools/Makefile.am
+++ b/app-tools/Makefile.am
+@@ -67,7 +67,7 @@ AM_CPPFLAGS = \
+        -DMANDIR=\""$(mandir)"\"                                \
+        -DGIMPPLUGINDIR=\""$(gimpplugindir)"\"                  \
+        -DGIMPDATADIR=\""$(gimpdatadir)"\"                      \
+-       -DCC=\""$(CC)"\"                                        \
+       -DDEFAULT_CC=\""@DEFAULT_CC@"\"                         \
+        -DGIMPDIR=\""$(gimpdir)"\"                              \
+        -DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\"      \
+        -I$(top_srcdir)                                         \
+diff --git a/configure.ac b/configure.ac
+index a88b7cc..d90b6db 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -2457,6 +2457,19 @@ fi
+ AM_CONDITIONAL(DESKTOP_DATADIR, test "x$with_desktop_dir" != xno)
+ AC_SUBST(DESKTOP_DATADIR)
+ 
+######################
+# Determine default CC
+######################
+
+AC_ARG_WITH(default-cc, [ --with-default-cc="cmd" default CC to print in gimptool (default=CC)])
+
+if test "x$with_default_cc" != x; then
+  DEFAULT_CC=$with_default_cc
+else
+  DEFAULT_CC=CC
+fi
+
+AC_SUBST(DEFAULT_CC)
+ 
+ #####################
+ # Check for XML tools
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 420b9b1..ccabde8 100644
+--- a/tools/Makefile.am
+++ b/tools/Makefile.am
+@@ -87,7 +87,7 @@ AM_CPPFLAGS = \
+        -DMANDIR=\""$(mandir)"\"                                \
+        -DGIMPPLUGINDIR=\""$(gimpplugindir)"\"                  \
+        -DGIMPDATADIR=\""$(gimpdatadir)"\"                      \
+-       -DCC=\""$(CC)"\"                                        \
+       -DDEFAULT_CC=\""@DEFAULT_CC@"\"                         \
+        -DGIMPDIR=\""$(gimpdir)"\"                              \
+        -DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\"      \
+        -I$(top_srcdir)                                         \
+diff --git a/tools/gimptool.c b/tools/gimptool.c
+index 21fc043..bbf3fa5 100644
+--- a/tools/gimptool.c
+++ b/tools/gimptool.c
+@@ -280,7 +280,7 @@ find_out_env_flags (void)
+   else if (msvc_syntax)
+     env_cc = "cl -MD";
+   else
+-    env_cc = CC;
+    env_cc = DEFAULT_CC;
+ 
+   if (g_ascii_strncasecmp (env_cc, "cl", 2)    == 0 &&
+       g_ascii_strncasecmp (env_cc, "clang", 5) != 0)
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb
index a17e03b10..0272e05e9 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb
+++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb
@@ -49,6 +49,7 @@ SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \
           file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch \
           file://0001-file-tiff-load-fix-mismatching-variable-type.patch \
           file://0001-metadata-shut-up-a-weird-warning.patch \
+           file://0001-gimptool-allow-default-CC-override.patch \
           "
 SRC_URI[sha256sum] = "50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e"
@@ -74,6 +75,26 @@ FILES:${PN}  += "${datadir}/metainfo"
 RDEPENDS:${PN} += "mypaint-brushes-1.0"
+# gimptool
+# gimptool needs a CC definition, use current CC without sysroot
+python __anonymous() {
+    import shlex
+    CC_WITHOUT_SYSROOT = shlex.join(filter(lambda x: not x.startswith("--sysroot="), shlex.split(d.getVar("CC"))))
+    d.setVar("CC_WITHOUT_SYSROOT", CC_WITHOUT_SYSROOT)
+}
+EXTRA_OECONF += "--with-default-cc='${CC_WITHOUT_SYSROOT}'"
+# Split gimptool in its own package
+PACKAGE_BEFORE_PN += "${PN}-gimptool"
+FILES:${PN}-gimptool += "${bindir}/gimptool-2.0"
+# gimptool depends on gimp .pc file being installed and tools to build the plugin.
+RDEPENDS:${PN}-gimptool += "${PN}-dev packagegroup-core-buildessential"
+INSANE_SKIP:${PN}-gimptool += "dev-deps"
 CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux"
 CVE_STATUS[CVE-2009-0581] = "cpe-incorrect: The current version (2.10.38) is not affected."
 CVE_STATUS[CVE-2009-0723] = "cpe-incorrect: The current version (2.10.38) is not affected."
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index fc1925314..384484e0d 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -1,12 +1,12 @@
 require ${BPN}.inc
 DEPENDS = " \
-    ${BPN}-native gperf-native \
+    ${BPN}-native cairo gperf-native \
-    glib-2.0 json-glib gtk4 libxml2 icu \
+    glib-2.0 json-glib gtk+3 gtk4 libxml2 icu \
-    dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \
+    dbus db virtual/libiconv zlib libsoup nspr libical nss libsecret \
 "
-inherit pkgconfig gsettings gobject-introspection features_check gtk-doc gettext perlnative vala
+inherit pkgconfig gsettings gobject-introspection mime-xdg features_check gtk-doc gettext perlnative vala
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "opengl"
@@ -17,6 +17,7 @@ SRC_URI += " \
    file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
    file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
    file://0004-call-native-helpers.patch \
+    file://0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch \
    file://iconv-detect.h \
 "
@@ -42,7 +43,7 @@ EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scan
 PACKAGECONFIG ?= "goa oauth"
 PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-PACKAGECONFIG[oauth]    = "-DENABLE_OAUTH2_WEBKITGTK4=ON -DENABLE_OAUTH2_WEBKITGTK=OFF,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib"
+PACKAGECONFIG[oauth]    = "-DENABLE_OAUTH2_WEBKITGTK4=ON -DENABLE_OAUTH2_WEBKITGTK=ON,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib"
 PACKAGECONFIG[goa]    = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts"
 PACKAGECONFIG[kerberos]    = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5"
 # BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
index 33190c461..340c63998 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
@@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
 GNOMEBASEBUILDCLASS = "cmake"
 inherit gnomebase upstream-version-is-even
-SRC_URI[archive.sha256sum] = "91f4ffc38a1b8d2fe8939834449ac541c0bff4a39b444edc2a9529344a28e98a"
+SRC_URI[archive.sha256sum] = "a54b47b977a97030f738a412f4f5d5b2efbef5e0ebe8929b7cce00ac54681084"
-PV = "3.50.1"
+PV = "3.54.0"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch
new file mode 100644
index 000000000..d23eb8b6e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch
@@ -0,0 +1,39 @@
+From 9b949bd47ed9e5596a9d37c60aa947def9c41db9 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Sun, 15 Sep 2024 22:31:49 +0200
+Subject: [PATCH] data/CMakeLists.txt: dont create automatic google login
+Inappropriate for cross-compiling
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ data/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 8fa642909..bb1b0c4da 100644
+--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_icon_cache_files("${SHARE_INSTALL_PREFIX}" alarm_notify_icon)
+ # ********************************
+ 
+ set(OAUTH2_SCHEMES "x-scheme-handler/eds-oauth2;")
+-if(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "")
+if(0)
+        set(CMAKE_REQUIRED_DEFINITIONS ${DATA_SERVER_CFLAGS})
+        set(CMAKE_REQUIRED_INCLUDES ${CMAKE_BINARY_DIR} ${DATA_SERVER_INCLUDE_DIRS})
+        set(CMAKE_REQUIRED_LIBRARIES ${DATA_SERVER_LDFLAGS})
+@@ -50,7 +50,7 @@ if(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "")
+                set(OAUTH2_SCHEMES "x-scheme-handler/${_google_oauth2_scheme};${OAUTH2_SCHEMES}")
+        endif(NOT _google_oauth2_scheme STREQUAL "")
+        unset(_google_oauth2_scheme)
+-endif(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "")
+endif(0)
+ 
+ configure_file(org.gnome.evolution-data-server.OAuth2-handler.desktop.in
+        org.gnome.evolution-data-server.OAuth2-handler.desktop.in
+-- 
+2.46.0
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_47.0.bb
index ec1d6ad39..94836cdbc 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_47.0.bb
@@ -21,7 +21,7 @@ GIR_MESON_OPTION = ""
 inherit gnomebase gsettings pkgconfig gobject-introspection gettext systemd useradd itstool gnome-help features_check
-SRC_URI[archive.sha256sum] = "8d6cb52176eca48b6bbf1cfe2fdae08d9677b5a0f2bca600dee4604de0dd1efc"
+SRC_URI[archive.sha256sum] = "c5858326bfbcc8ace581352e2be44622dc0e9e5c2801c8690fd2eed502607f84"
 EXTRA_OEMESON = " \
    -Dplymouth=disabled \
diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_47.0.bb
index d938ae94c..8774750e9 100644
--- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_47.0.bb
@@ -6,7 +6,7 @@ SECTION = "x11/gnome"
 inherit gnomebase gettext allarch
-SRC_URI[archive.sha256sum] = "4ddd3ac439a4a067876805921bb75f4d3c8b85a218d47c276dddde8928443c2e"
+SRC_URI[archive.sha256sum] = "874a4a39c4261736f6a854722833400b612441c4681aa5982d90b15abc9c91fd"
 FILES:${PN} += " \
    ${datadir}/backgrounds \
diff --git a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.1.bb b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_47.0.bb
index f1a93ea83..c24e45df3 100644
--- a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_47.0.bb
@@ -29,7 +29,7 @@ def gnome_verdir(v):
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
-SRC_URI[archive.sha256sum] = "2d36750a73890086122cf3f0c83e68517891585615165306fa1596a918668247"
+SRC_URI[archive.sha256sum] = "decdb23283b5dbeef40951b69eaf7d4b80c0c3880ddb01863f9f0f1554f8998b"
 FILES:${PN} += " \
    ${datadir}/dbus-1 \
diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.1.bb b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_47.0.bb
index eac768c8f..fa9df54fb 100644
--- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_47.0.bb
@@ -22,7 +22,7 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
-SRC_URI[archive.sha256sum] = "9861ff7b8abd5b7b20690ba55eb7542c7ec534b566269e29b5b1e858c1610897"
+SRC_URI[archive.sha256sum] = "3b03313f1c4d12dc821e07e209d1596d53eafa255d492d2ce5abf92ed1b51e76"
 do_install:prepend() {
    sed -i -e 's|${S}/src|${TARGET_DBGSRC_DIR}/src|g' ${B}/src/gcal-enum-types.h
diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_47.0.bb
index bb53b58df..e3365f618 100644
--- a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_47.0.bb
@@ -22,13 +22,13 @@ DEPENDS = " \
 RRECOMMENDS:${PN}  = "gnuchess"
-SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=main"
 inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check mime-xdg gsettings
 GIR_MESON_OPTION = ""
 S = "${WORKDIR}/git"
-SRCREV = "c3625ee59ab3acfd7566ef04300b15ddbadaaac3"
+SRCREV = "91476257c2404945bfa30238c38391343bf4737b"
 FILES:${PN} += "${datadir}"
diff --git a/meta-gnome/recipes-gnome/gnome-console/gnome-console/0001-include-locale.h-for-setlocale.patch b/meta-gnome/recipes-gnome/gnome-console/gnome-console/0001-include-locale.h-for-setlocale.patch
new file mode 100644
index 000000000..28f26476c
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-console/gnome-console/0001-include-locale.h-for-setlocale.patch
@@ -0,0 +1,34 @@
+From e72f6da3d509561b75e223667a0380772e7bd48a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 23 Sep 2024 20:38:09 -0700
+Subject: [PATCH] include locale.h for setlocale()
+This issue is surfaced on systems+clang
+Fixes
+../gnome-console-47.0/src/main.c:29:3: error: call to undeclared function 'setlocale'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+   29 |   setlocale (LC_ALL, "");
+      |   ^
+../gnome-console-47.0/src/main.c:29:14: error: use of undeclared identifier 'LC_ALL'
+   29 |   setlocale (LC_ALL, "");
+      |              ^
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/console/-/merge_requests/171]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/main.c b/src/main.c
+index af9c5a5..5d16160 100644
+--- a/src/main.c
+++ b/src/main.c
+@@ -17,7 +17,7 @@
+  */
+ 
+ #include <glib/gi18n.h>
+-
+#include <locale.h>
+ #include <kgx.h>
+ 
+ int
diff --git a/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb b/meta-gnome/recipes-gnome/gnome-console/gnome-console_47.1.bb
index d03b5fe04..fd1e98a99 100644
--- a/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-console/gnome-console_47.1.bb
@@ -17,8 +17,8 @@ DEPENDS = " \
    pcre2 \
    vte \
 "
+SRC_URI += "file://0001-include-locale.h-for-setlocale.patch"
-SRC_URI[archive.sha256sum] = "e7462128d2df2324a1d748062c40429cd0504af09e407067b33f3a9d0c59c8e1"
+SRC_URI[archive.sha256sum] = "d3f600b45b51716691aee92870332e9c9a8ca89d553565f3131d9e28074725d0"
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
index c1bd34d14..851537563 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
@@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [OE specific]
 3 files changed, 3 insertions(+), 2 deletions(-)
 diff --git a/meson_options.txt b/meson_options.txt
-index b2302bf..5b9baf5 100644
+index 9aeeed313..6097263a6 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -1,3 +1,4 @@
@@ -22,28 +22,29 @@ index b2302bf..5b9baf5 100644
 option('documentation', type: 'boolean', value: false, description: 'build documentation')
 option('location-services', type: 'feature', value: 'enabled', description: 'build with location services')
 diff --git a/panels/background/meson.build b/panels/background/meson.build
-index 6ced050..df1f808 100644
+index 8f9cbecdf..17f17d395 100644
 --- a/panels/background/meson.build
 +++ b/panels/background/meson.build
-@@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple(
+@@ -23,7 +23,7 @@ common_sources += gnome.mkenums_simple(
+ )
 
- enums = 'gdesktop-enums-types'
+ gdesktop_enums_header = files(
- enums_header = files(
 -  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
-+  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
+  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
 )
 
- common_sources += gnome.mkenums(
+ common_sources += gnome.mkenums_simple(
 diff --git a/panels/system/meson.build b/panels/system/meson.build
-index 4fee822..979332a 100644
+index bbe004837..92e809fbe 100644
 --- a/panels/system/meson.build
 +++ b/panels/system/meson.build
-@@ -73,7 +73,7 @@ sources += gnome.compile_resources(
+@@ -68,7 +68,7 @@ sources += gnome.compile_resources(
 )
 
- enums_header = files(
+ gdesktop_enums_header = files(
-  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
+-  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
 +  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
-   'datetime/cc-datetime-page.h'
 )
 
+ sources += gnome.mkenums_simple(
+ 
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_47.1.1.bb
index ae96caf94..dce7711b8 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_47.1.1.bb
@@ -31,14 +31,17 @@ DEPENDS = " \
    tecla \
    udisks2 \
    upower \
+    ${@' libxslt-native docbook-xsl-stylesheets-native' if d.getVar('GIDOCGEN_ENABLED') == 'True' else ''} \
 "
-inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check
+inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext gi-docgen upstream-version-is-even bash-completion features_check
 REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
+SRC_URI = "gitsm://gitlab.gnome.org/GNOME/gnome-control-center.git;protocol=https;nobranch=1"
+S = "${WORKDIR}/git"
 SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
-SRC_URI[archive.sha256sum] = "6335c6cb8164e574db521fff61cfa3dfaa55f1db66ae3bca02750a193e1c4f3d"
+SRCREV = "7985fc671ad43f5925b9012e6c51231ad73a628d"
 PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
 PACKAGECONFIG[cups] = ",,cups,cups system-config-printer cups-pk-helper"
@@ -49,11 +52,10 @@ PACKAGECONFIG[media-share] = ",,,rygel-meta tumbler"
 PACKAGECONFIG[malcontent] = "-Dmalcontent=true,-Dmalcontent=false,malcontent,malcontent-ui"
 EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}"
+GIDOCGEN_MESON_OPTION = 'documentation'
 export XDG_DATA_DIRS = "${STAGING_DATADIR}"
-PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 FILES:${PN} += " \
    ${datadir}/dbus-1 \
    ${datadir}/gnome-shell \
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.1.bb
index 19bae74ce..63847fe3e 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.1.bb
@@ -15,7 +15,7 @@ GIR_MESON_OPTION = ""
 SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
            file://0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch"
-SRC_URI[archive.sha256sum] = "42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42"
+SRC_URI[archive.sha256sum] = "ae7ca55dc9e08914999741523a17d29ce223915626bd2462a120bf96f47a79ab"
 DEPENDS += " \
    fontconfig \
diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
deleted file mode 100644
index be4c002fc..000000000
--- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ac4a07e7ef3d9d046a4ca2a803c5b649b6f7ddf4 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sat, 8 Jul 2023 00:01:07 -0400
-Subject: [PATCH] window: Fix function callback definition
-Without this, the build fails with clang with
-CFLAGS=-Werror=incompatible-function-pointer-types
-```
-../src/font-view-window.c:864:77: error: incompatible function pointer types passing 'void (FontViewWindow *)' (aka 'void (struct _FontViewWindow *)') to parameter of type 'GtkWidgetActionActivateFunc' (aka 'void (*)(struct _GtkWidget *, const char *, struct _GVariant *)') [-Wincompatible-function-pointer-types]
-  gtk_widget_class_install_action (widget_class, "win.toggle-search", NULL, action_toggle_search_cb);
-                                                                            ^~~~~~~~~~~~~~~~~~~~~~~
-/usr/include/gtk-4.0/gtk/gtkwidget.h:956:87: note: passing argument to parameter 'activate' here
-                                                         GtkWidgetActionActivateFunc  activate);
-                                                                                      ^
-```
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/font-view-window.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-diff --git a/src/font-view-window.c b/src/font-view-window.c
-index 639ac33..24461f7 100644
--- a/src/font-view-window.c
-+++ b/src/font-view-window.c
-@@ -758,8 +758,11 @@ font_view_window_show_overview (FontViewWindow *self)
- }
- 
- static void
-action_toggle_search_cb (FontViewWindow *self)
-+action_toggle_search_cb (GtkWidget  *widget,
-+                         const char *action_name,
-+                         GVariant   *parameter)
- {
-+  FontViewWindow *self = FONT_VIEW_WINDOW (widget);
- 
-  gtk_toggle_button_set_active (self->search_button,
-                                !gtk_toggle_button_get_active (self->search_button));
-- 
-2.45.1
diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_47.0.bb
index ccf8262dc..4763d1717 100644
--- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_47.0.bb
@@ -15,8 +15,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
-SRC_URI += "file://0001-window-Fix-function-callback-definition.patch"
+SRC_URI[archive.sha256sum] = "b8e5a042e0b241b0c7cae43f74da0d5f88e6423017a91feb86e7617edb4080ed"
-SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c"
 FILES:${PN} += " \
    ${datadir}/dbus-1 \
diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.2.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.52.1.bb
index adce70770..9c01095f2 100644
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.52.1.bb
@@ -3,12 +3,12 @@ LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36"
 GTKIC_VERSION = "4"
-inherit gnomebase gsettings gobject-introspection gtk-icon-cache mime-xdg vala features_check
+inherit gnomebase gsettings gobject-introspection gi-docgen gtk-icon-cache mime-xdg vala features_check
 REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goabackend', 'opengl', '', d)}"
-DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr"
+DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr keyutils"
-SRC_URI[archive.sha256sum] = "df16ad975d139c6bfc4ebb2ec8bb8327297a791ef2bf0b977c78076af5faa98e"
+SRC_URI[archive.sha256sum] = "37c7522ff9454f8371b5a8725bba76ed7430c95b1f9efc7feba6268f052d1eb7"
 PACKAGECONFIG ?= "goabackend kerberos owncloud google windows_live"
@@ -18,11 +18,14 @@ PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false"
 PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false"
 PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false"
 PACKAGECONFIG[windows_live] = "-Dwindows_live=true, -Dwindows_live=false"
+PACKAGECONFIG[man] = "-Dman=true, -Dman=false,libxslt-native docbook-xsl-stylesheets-native"
 FILES:${PN} += " \
    ${datadir}/dbus-1 \
    ${libdir}/goa-1.0/web-extensions/*.so \
 "
+GIDOCGEN_MESON_OPTION = 'documentation'
 # looked into pkg-config file: it is not a bug - they mean it
 FILES:${PN}-dev += "${libdir}/goa-1.0/include"
diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb
index 4b05e52ca..883f192db 100644
--- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb
@@ -17,12 +17,12 @@ DEPENDS = " \
    gnome-online-accounts \
    gsettings-desktop-schemas \
    libdazzle \
-    tracker \
+    tinysparql \
    libhandy \
    libportal \
 "
-RDEPENDS:${PN} = "tracker-miners"
+RDEPENDS:${PN} = "localsearch"
 inherit gnomebase gettext gnome-help features_check
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_46.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_47.1.bb
index d409e77ea..bc279dff4 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_47.1.bb
@@ -24,7 +24,7 @@ DEPENDS = " \
 REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data"
 GIR_MESON_OPTION = ""
-SRC_URI[archive.sha256sum] = "0b9a0f64fa18a8e7e09b4c95a3f754fa033c2cdbd2dc35701f0618572c1cb3d7"
+SRC_URI[archive.sha256sum] = "f2aacbe55fa38e8708583eec0a6651049e537eb505a3ed2ce0baa4e9b64246d1"
 PACKAGECONFIG ??= " \
    cups nm \
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.2.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_47.1.bb
index 5c2ae0593..a47548fbb 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_47.1.bb
@@ -6,7 +6,7 @@ inherit gnomebase gettext gsettings features_check
 REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data"
-SRC_URI[archive.sha256sum] = "d442e9d26925125ff215a5c134290495655380741daafbb37a3a99d6f0c7d86f"
+SRC_URI[archive.sha256sum] = "e9438cc5d39f9875dfd04ea0abb51e5962eaad5c20274123243b1612098b3a85"
 EXTRA_OEMESON += " \
    -Dextension_set=all \
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_47.1.bb
index 0a52de7a3..042b3935a 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_47.1.bb
@@ -13,6 +13,7 @@ DEPENDS = " \
    gjs \
    gnome-autoar \
    gnome-desktop \
+    gnome-control-center \
    polkit \
    pipewire \
    libsoup-3.0 \
@@ -32,7 +33,7 @@ GIR_MESON_OPTION = ""
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
-SRC_URI[archive.sha256sum] = "6b587101c04bfb364ab09cd38b5d93ebeeb4254754c807cf712fbc8ee3fde238"
+SRC_URI[archive.sha256sum] = "b467575f8c159d20557258517f0dd68dfd0147d11b48d97ab8e1f709bc522a63"
 SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch"
 PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.2.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_47.1.bb
index 244941786..a18d6db66 100644
--- a/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software_47.1.bb
@@ -28,7 +28,7 @@ RDEPENDS:${PN} = "iso-codes"
 EXTRA_OEMESON += "-Dtests=false -Dsoup2=false"
-SRC_URI[archive.sha256sum] = "e700cba287764f5e2255514e312e160550fdbf7a5d3fe16358bb6f7b6732b974"
+SRC_URI[archive.sha256sum] = "93ca500366316745594ef05fcad1c05cf43f02ef8f66080c17f7ebb8ca3f34bf"
 PACKAGECONFIG ?= "flatpak"
 PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree"
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_46.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_47.0.bb
index eaeaa2cb0..721ae5a94 100644
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_47.0.bb
@@ -22,10 +22,7 @@ inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check get
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "polkit"
-def gnome_verdir(v):
+SRC_URI[archive.sha256sum] = "ede7b925eb714d8b3c2bfbf7405a1b714494fe47e02f0af08f5837b3e256547f"
-    return oe.utils.trim_version(v, 1)
-SRC_URI[archive.sha256sum] = "5376248158c686c308255472e8c2a9e4c17255642c149fc7198c6d034e547599"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch
deleted file mode 100644
index 9f8475bdd..000000000
--- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 61668e1eb86a316d4ad9a6b9cacf8c8cc74a0c33 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Sun, 7 Jan 2024 10:40:31 +0100
-Subject: [PATCH] meson: add an option to set dbus_interface_dir
-Add an option that allows to set the dbus_interface_dir path manually.
-This will help to cross-compile gnome-terminal on host systems that
-don't have gnome-shell installed.
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/8046]
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
- meson_options.txt | 7 +++++++
- src/meson.build   | 7 ++++++-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-diff --git a/meson_options.txt b/meson_options.txt
-index b555ab66..8fece058 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,6 +13,13 @@
- # You should have received a copy of the GNU General Public License
- # along with this programme.  If not, see <https://www.gnu.org/licenses/>.
- 
-+option(
-+  'dbus_interface_dir',
-+  type: 'string',
-+  value: '',
-+  description: 'directory for D-Bus session interface files [$datadir/dbus-1/interfaces]',
-+)
-+
- option(
-   'dbg',
-   type: 'boolean',
-diff --git a/src/meson.build b/src/meson.build
-index 27ecd893..420ad45c 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -185,6 +185,11 @@ server_sources = app_sources + client_util_sources + debug_sources + dbus_source
- 
- if get_option('search_provider')
- 
-+  dbus_interface_dir = get_option('dbus_interface_dir')
-+  if dbus_interface_dir == ''
-+    dbus_interface_dir = gt_prefix / gt_dbusinterfacedir
-+  endif
-+
-   server_sources += files(
-     'terminal-search-provider.cc',
-     'terminal-search-provider.hh',
-@@ -192,7 +197,7 @@ if get_option('search_provider')
- 
-   server_sources += gnome.gdbus_codegen(
-     'terminal-search-provider-gdbus-generated',
-    gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml',
-+    dbus_interface_dir / 'org.gnome.ShellSearchProvider2.xml',
-     autocleanup: 'none',
-     install_header: false,
-     interface_prefix: 'org.gnome.Shell',
-- 
-2.43.0
diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb
index 3bbfe9ece..cfbde967f 100644
--- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb
@@ -22,14 +22,13 @@ DEPENDS = " \
 SRC_URI = " \
        git://gitlab.gnome.org/GNOME/gnome-terminal.git;protocol=https;nobranch=1 \
        file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
-        file://0001-meson-add-option-to-set-dbus_interfacedir.patch \
 "
-SRCREV = "5ac3b8e4bd6fa02651b3c23cedb0a7e1cd769655"
+SRCREV = "965cb9307713c618253918633416fcad86bcc5d2"
 S = "${WORKDIR}/git"
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[nautilus] = "-Dnautilus_extension=true,-Dnautilus_extension=false,nautilus,nautilus"
-PACKAGECONFIG[search_provider] = "-Dsearch_provider=true -Ddbus_interface_dir=${STAGING_DATADIR}/dbus-1/interfaces,-Dsearch_provider=false,gnome-shell"
+PACKAGECONFIG[search_provider] = "-Dsearch_provider=true,-Dsearch_provider=false,gnome-shell"
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
diff --git a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.3.bb b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_47.0.bb
index 1e3268238..71d0f2c12 100644
--- a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.3.bb
+++ b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_47.0.bb
@@ -9,7 +9,7 @@ DEPENDS = " \
    gtk4 \
    gtksourceview5 \
    editorconfig-core-c \
-    enchant2 \
+    libspelling \
 "
 GTKIC_VERSION = "4"
@@ -18,7 +18,7 @@ inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check
 REQUIRED_DISTRO_FEATURES = "opengl"
-SRC_URI[archive.sha256sum] = "005b48104a909be66ae07448d2bc5706c7d113781057a24ff6da55bdf324c73d"
+SRC_URI[archive.sha256sum] = "0304961974bdacc7e6e8d146dadc949527df99b2823582c8d1ba8b33d25d4217"
 FILES:${PN} += " \
    ${datadir}/metainfo \
diff --git a/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share/0001-build-Define-list-of-libc-feature-test-macros.patch b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share/0001-build-Define-list-of-libc-feature-test-macros.patch
new file mode 100644
index 000000000..fbbda824e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share/0001-build-Define-list-of-libc-feature-test-macros.patch
@@ -0,0 +1,41 @@
+From 5f2e3fb82055ee1346eaa20fcca640fc802ae1c5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 24 Sep 2024 03:19:24 +0000
+Subject: [PATCH] build: Define list of libc feature test macros
+_POSIX_C_SOURCE is needed since it uses kill() API
+and as per [1] it need it, without this the build fails
+particularly on musl systems with clang compiler
+./git/src/http.c:394:3: error: call to undeclared function 'kill'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+[1] https://man7.org/linux/man-pages/man2/kill.2.html
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-user-share/-/merge_requests/27]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ meson.build | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+diff --git a/meson.build b/meson.build
+index ea2892e..72f3851 100644
+--- a/meson.build
+++ b/meson.build
+@@ -39,6 +39,17 @@ config_h.set_quoted('GNOMELOCALEDIR', user_share_prefix / user_share_localedir)
+ 
+ config_h.set_quoted('HTTPD_CONFIG_TEMPLATE', user_share_prefix / user_share_pkgdatadir / 'dav_user_%s.conf')
+ 
+#
+# OS/Compiler feature detection
+#
+feature_defines = [
+  ['_XOPEN_SOURCE', '700'], # POSIX.1–2001 (IEEE Std 1003.1-2001)
+]
+
+foreach f: feature_defines
+  config_h.set(f[0], f[1])
+endforeach
+
+ # compiler flags
+ common_flags = []
+ if get_option('buildtype').contains('debug')
diff --git a/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_47.0.bb
index 6fc78dd29..8e4b238b8 100644
--- a/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_47.0.bb
@@ -14,7 +14,8 @@ inherit gnomebase gsettings features_check
 REQUIRED_DISTRO_FEATURES = "systemd"
 SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-user-share.git;protocol=https;branch=master"
-SRCREV = "a0e790aa9494db9d1b1f48b4fc0d2f78e112044d"
+SRC_URI += "file://0001-build-Define-list-of-libc-feature-test-macros.patch"
+SRCREV = "77ecbaddab0ed2121859926acbfccc9cecdee0db"
 S = "${WORKDIR}/git"
 PACKAGECONFIG ??= "modules"
diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
index 40603993f..b0516be3d 100644
--- a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
+++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
@@ -7,17 +7,16 @@ DEPENDS = " \
    gperf-native \
    itstool-native \
    grilo \
-    lua \
    liboauth \
 "
 inherit gnomebase gnome-help vala
 SRC_URI += "file://0001-Avoid-running-trackertestutils.patch"
 SRC_URI[archive.sha256sum] = "fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'tracker', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'tracker', '', d)} lua-factory"
-PACKAGECONFIG[tracker] = "-Denable-tracker3=yes,-Denable-tracker3=no,tracker"
+PACKAGECONFIG[tracker] = "-Denable-tracker3=yes,-Denable-tracker3=no,tinysparql,localsearch"
+PACKAGECONFIG[lua-factory] = "-Denable-lua-factory=yes,-Denable-lua-factory=no,lua libarchive json-glib gnome-online-accounts"
 FILES:${PN} += "${libdir}/grilo-0.3"
diff --git a/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb
index b6ac75dd8..f6ea21eb5 100644
--- a/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb
+++ b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb
@@ -7,7 +7,6 @@ DEPENDS = " \
    glib-2.0 \
 "
 inherit gnomebase gobject-introspection gtk-doc gettext vala
 SRC_URI[archive.sha256sum] = "884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96"
@@ -37,3 +36,5 @@ do_compile:append() {
            ${B}/src/grl-type-builtins.c
    done
 }
+FILES:${PN} += "${libdir}/girepository-1.0"
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.56.0.bb
index 6549b1900..a7a869eb5 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.56.0.bb
@@ -19,7 +19,7 @@ RDEPENDS:${PN} += "gsettings-desktop-schemas"
 SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
-SRC_URI[archive.sha256sum] = "f53d81df86c2e86cdd25182c2d8a669a22371e83623ded1b9d5416dcfc6de366"
+SRC_URI[archive.sha256sum] = "441d2356c72616364cdb420af96199113a13ed9e146f2175fe373989adada39e"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch b/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch
deleted file mode 100644
index 08ff51205..000000000
--- a/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 4a84e9857d83f684bf53d616942a393ce558a328 Mon Sep 17 00:00:00 2001
-From: Morten Welinder <terra@gnome.org>
-Date: Wed, 3 Jul 2024 19:18:15 -0400
-Subject: [PATCH] Compilation: attempt fixes for libxml 2.13
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libgsf/-/commit/5d4bb55095d3d6ef793c1908a88504183e28644c]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- configure.ac         |  1 +
- gsf/gsf-input-http.c | 19 +++++++++++++++++++
- 2 files changed, 20 insertions(+)
-diff --git a/configure.ac b/configure.ac
-index fceb776..7c2f946 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -238,6 +238,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gstdio.h>]], [[(void)g_chown("/
-                AC_MSG_RESULT(yes)],
-               [AC_MSG_RESULT(no)])
- AC_CHECK_FUNCS(g_date_time_new_from_iso8601 g_date_time_format_iso8601)
-+AC_CHECK_FUNCS(xmlNanoHTTPOpen xmlNanoHTTPClose)
- CFLAGS=$SAVE_CFLAGS
- LIBS=$SAVE_LIBS
- 
-diff --git a/gsf/gsf-input-http.c b/gsf/gsf-input-http.c
-index bdde3c8..03f4045 100644
--- a/gsf/gsf-input-http.c
-+++ b/gsf/gsf-input-http.c
-@@ -23,7 +23,10 @@
- #include <gsf/gsf-input-http.h>
- #include <gsf/gsf.h>
- 
-+#ifdef HAVE_XMLNANOHTTPOPEN
-+// It's going away, so make it conditional
- #include <libxml/nanohttp.h>
-+#endif
- 
- struct _GsfInputHTTP {
-         GsfInput input;
-@@ -74,7 +77,9 @@ gsf_input_http_finalize (GObject *obj_input)
-        input->content_type = NULL;
- 
-         if (input->ctx) {
-+#ifdef HAVE_XMLNANOHTTPCLOSE
-                 xmlNanoHTTPClose ((gpointer) input->ctx);
-+#endif
-                 input->ctx = NULL;
-         }
- 
-@@ -215,6 +220,7 @@ gsf_input_http_get_content_type (GsfInputHTTP *input)
-         return content_type;
- }
- 
-+#ifdef HAVE_XMLNANOHTTPOPEN
- static GsfInput *
- make_local_copy (gpointer *ctx)
- {
-@@ -254,6 +260,7 @@ make_local_copy (gpointer *ctx)
- 
-        return copy;
- }
-+#endif
- 
- /**
-  * gsf_input_http_new:
-@@ -265,6 +272,7 @@ make_local_copy (gpointer *ctx)
- GsfInput *
- gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED)
- {
-+#ifdef HAVE_XMLNANOHTTPOPEN
-         GObject *obj;
-        GsfInput *input;
-         gpointer ctx;
-@@ -293,6 +301,10 @@ gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED)
-         GSF_INPUT_HTTP (obj)->ctx = ctx;
- 
-         return GSF_INPUT (obj);
-+#else
-+        g_return_val_if_fail(url != NULL, NULL);
-+       return NULL;
-+#endif
- }
- 
- static GsfInput *
-@@ -304,6 +316,7 @@ gsf_input_http_dup (GsfInput *src, GError **err)
- static guint8 const *
- gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer)
- {
-+#ifdef HAVE_XMLNANOHTTPOPEN
-         int nread;
-         size_t total_read;
-         gpointer ctx = GSF_INPUT_HTTP (input)->ctx;
-@@ -324,6 +337,12 @@ gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer)
-                         return NULL;
-         }
-         return buffer;
-+#else
-+       (void)input;
-+       (void)num_bytes;
-+       (void)buffer;
-+       return NULL;
-+#endif
- }
- 
- static gboolean
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb
index 97cbbe450..ffa24e812 100644
--- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb
+++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb
@@ -9,9 +9,8 @@ DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
 GNOMEBASEBUILDCLASS = "autotools"
 inherit gnomebase gobject-introspection gettext gtk-doc
-SRC_URI[archive.sha256sum] = "9181c914b9fac0e05d6bcaa34c7b552fe5fc0961d3c9f8c01ccc381fb084bcf0"
+SRC_URI[archive.sha256sum] = "0eb59a86e0c50f97ac9cfe4d8cc1969f623f2ae8c5296f2414571ff0a9e8bcba"
-SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch \
+SRC_URI += " file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch"
-            file://0001-Compilation-attempt-fixes-for-libxml-2.13.patch"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf"
diff --git a/meta-gnome/recipes-gnome/libspelling/libspelling_0.2.1.bb b/meta-gnome/recipes-gnome/libspelling/libspelling_0.4.2.bb
index f5f8a3321..833fe65c3 100644
--- a/meta-gnome/recipes-gnome/libspelling/libspelling_0.2.1.bb
+++ b/meta-gnome/recipes-gnome/libspelling/libspelling_0.4.2.bb
@@ -10,4 +10,7 @@ inherit gnomebase pkgconfig gettext gi-docgen vala gobject-introspection
 GIR_MESON_OPTION = ''
 GIDOCGEN_MESON_OPTION = 'docs'
-SRC_URI[archive.sha256sum] = "7a787b467bd493f6baffb44138dbc4bef78aaab60efb76a7db88b243bf0f6343"
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[sysprof] = "-Dsysprof=true,-Dsysprof=false,sysprof"
+SRC_URI[archive.sha256sum] = "b3e609b1a247e71bc097e262564f33f51fd7db566eeb0cd74ae5021536b878b5"
diff --git a/meta-gnome/recipes-gnome/mutter/mutter_46.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_47.1.bb
index c91744cf6..1b49fa619 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_46.4.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_47.1.bb
@@ -24,7 +24,7 @@ DEPENDS = " \
 inherit gnomebase gsettings gobject-introspection gettext features_check
-SRC_URI[archive.sha256sum] = "611bd9cf982adb56597ce2b34224272fda619bb3bb912a684d75c6f2c37502e4"
+SRC_URI[archive.sha256sum] = "905474a32cd99b34342cd69e74bb01971b387e2fa22361b6d99add109409ddc9"
 # x11 is still manadatory - see meson.build
 REQUIRED_DISTRO_FEATURES = "wayland x11 polkit"
@@ -44,16 +44,15 @@ PACKAGECONFIG ??= " \
 "
 EXTRA_OEMESON += " \
-    -Dtests=false \
+    -Dtests=disabled \
-    -Dnative_tests=false \
    -Dxwayland_path=${bindir}/Xwayland \
 "
 # combi-config - see meson_options.txt for more details
 PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_backend=false -Dudev=false, libdrm virtual/libgbm libinput ${LOGIND} virtual/egl virtual/libgles2 udev"
-PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl"
+PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false, virtual/libgl"
 PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false"
-PACKAGECONFIG[libdisplay-info] = "-Dlibdisplay_info=true, -Dlibdisplay_info=false, libdisplay-info"
+PACKAGECONFIG[libdisplay-info] = "-Dlibdisplay_info=enabled, -Dlibdisplay_info=disabled, libdisplay-info"
 PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom"
 # Remove depending on pipewire-0.2 when mutter is upgraded to 3.36+
 PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire"
@@ -63,7 +62,7 @@ PACKAGECONFIG[sound-player] = "-Dsound_player=true, -Dsound_player=false, libcan
 PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof"
 PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification"
-MUTTER_API_NAME = "mutter-14"
+MUTTER_API_NAME = "mutter-15"
 do_install:prepend() {
    sed -i -e 's|${B}/||g' ${B}/cogl/cogl/cogl-enum-types.c
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_46.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_47.0.bb
index 30e0681ae..b8df8419b 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_46.2.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_47.0.bb
@@ -17,12 +17,14 @@ DEPENDS = " \
    libhandy \
    libportal \
    libxml2 \
-    tracker \
+    tinysparql \
+    wayland \
+    wayland-native \
 "
 inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache
-SRC_URI[archive.sha256sum] = "6ee8c99019b9e3447f6918d68232a20deca89e5525c05805432b7d8840ca71fa"
+SRC_URI[archive.sha256sum] = "334264cdd9edbfd95ee7bcaafe442ebed31acca3f2d9b90f3eda30eacfd0387a"
 REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data"
@@ -46,9 +48,9 @@ FILES:${PN} += " \
    ${datadir}/dbus-1 \
    ${datadir}/metainfo \
    ${datadir}/gnome-shell \
-    ${datadir}/tracker3 \
+    ${datadir}/localsearch3 \
 "
 # mandatory - not checked during configuration:
 # | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed
-RDEPENDS:${PN} += "tracker-miners bubblewrap"
+RDEPENDS:${PN} += "localsearch bubblewrap"
diff --git a/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb b/meta-gnome/recipes-gnome/tecla/tecla_47.0.bb
index 62b3aa3e3..e430b167d 100644
--- a/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb
+++ b/meta-gnome/recipes-gnome/tecla/tecla_47.0.bb
@@ -13,4 +13,4 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 inherit gnomebase pkgconfig  features_check
-SRC_URI[archive.sha256sum] = "4a081eab867a5a8b09758991cad7645920f323aabca954408290fb6f44591b0f"
+SRC_URI[archive.sha256sum] = "0790b99ec29137a54b546c510661a99aa6f039c8d75f10c08e928682c0804fe5"
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch b/meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
index 36dd4a588..606a3e9aa 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
+++ b/meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
@@ -1,4 +1,4 @@
-From 6f6d7e3995c370b8121206a7f9cc0d234553bbfe Mon Sep 17 00:00:00 2001
+From bad93f7aec96b1819f4027dbc06b337d2e2227f2 Mon Sep 17 00:00:00 2001
 From: Lei Maohui <leimaohui@fujitsu.com>
 Date: Thu, 15 Sep 2022 16:35:39 +0900
 Subject: [PATCH] Set header file to a fixed path instead of a host path.
@@ -23,6 +23,3 @@ index 4db7ef1..7c44c13 100644
 /*** END file-production ***/
 
 
-- 
-2.34.1
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch
index 0812e88a9..8f9dcdc3e 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch
+++ b/meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch
@@ -1,4 +1,4 @@
-From 1b7a34b7de9eb2ae776f7cf4dc6221f49b2395ee Mon Sep 17 00:00:00 2001
+From db5149a0c9297d1053c2d0c01ed116cdcf5d14f0 Mon Sep 17 00:00:00 2001
 From: Markus Volk <f_l_k@t-online.de>
 Date: Tue, 12 Sep 2023 17:00:41 +0200
 Subject: [PATCH] meson: fix reproducibility
@@ -20,10 +20,10 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
 5 files changed, 10 insertions(+), 10 deletions(-)
 diff --git a/meson.build b/meson.build
-index 37f5148..18f4bfa 100644
+index 4a2994a..31b1798 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -393,7 +393,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version()))
+@@ -371,7 +371,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version()))
 conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version()))
 
 # Config that goes in some other generated files (.desktop, .pc, etc)
@@ -32,7 +32,7 @@ index 37f5148..18f4bfa 100644
 conf.set('exec_prefix', get_option('prefix'))
 conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
 conf.set('datadir', datadir)
-@@ -422,7 +422,7 @@ tracker_c_args = [
+@@ -400,7 +400,7 @@ tracker_c_args = [
 configinc = include_directories('./')
 srcinc = include_directories('src/')
 
@@ -41,7 +41,7 @@ index 37f5148..18f4bfa 100644
 
 # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64
 # directory, following the existing convention in that directory.
-@@ -451,8 +451,8 @@ subdir('data')
+@@ -430,8 +430,8 @@ subdir('data')
 subdir('docs')
 
 test_c_args = tracker_c_args + [
@@ -53,7 +53,7 @@ index 37f5148..18f4bfa 100644
 
 if get_option('tests_tap_protocol')
 diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c
-index 6d4510b..189d2fb 100644
+index 0aca8ed..e6c28b6 100644
 --- a/src/libtracker-miners-common/tracker-landlock.c
 +++ b/src/libtracker-miners-common/tracker-landlock.c
 @@ -282,7 +282,7 @@ tracker_landlock_init (const gchar * const *indexed_folders)
@@ -75,10 +75,10 @@ index 6d4510b..189d2fb 100644
 #ifdef MINER_FS_CACHE_LOCATION
        add_rule (landlock_fd, MINER_FS_CACHE_LOCATION,
 diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
-index 6e58832..04750f8 100644
+index 42c4573..73577c3 100644
 --- a/src/miners/fs/meson.build
 +++ b/src/miners/fs/meson.build
-@@ -67,8 +67,8 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major),
+@@ -68,8 +68,8 @@ executable('localsearch-@0@'.format(tracker_api_major),
     dependencies: tracker_miner_fs_deps,
     c_args: [
         tracker_c_args,
@@ -90,11 +90,11 @@ index 6e58832..04750f8 100644
     ],
     install: true,
 diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
-index 2e4f61d..b47581c 100644
+index 2584881..31411f2 100644
 --- a/src/tracker-extract/meson.build
 +++ b/src/tracker-extract/meson.build
 @@ -158,7 +158,7 @@ endif
- executable('tracker-extract-@0@'.format(tracker_api_major),
+ executable('localsearch-extractor-@0@'.format(tracker_api_major),
   tracker_extract_sources,
   # Manually add the root dir to work around https://github.com/mesonbuild/meson/issues/1387
 -  c_args: tracker_c_args + ['-I' + meson.build_root()],
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb b/meta-gnome/recipes-gnome/tracker/localsearch_3.8.0.bb
index 2b2dc7c4b..916e48961 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb
+++ b/meta-gnome/recipes-gnome/tracker/localsearch_3.8.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 DEPENDS = " \
    intltool-native \
-    tracker \
+    tinysparql \
    zlib \
 "
@@ -18,7 +18,7 @@ SRC_URI:append = " \
        file://0001-fix-reproducibility.patch \
        file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \
 "
-SRC_URI[archive.sha256sum] = "e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe"
+SRC_URI[archive.sha256sum] = "e4e83a1daebb5263915b45b719731e3f7041d959cbd637ea29afbe910c92bbf9"
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
@@ -81,6 +81,6 @@ EXTRA_OEMESON += " \
 FILES:${PN} += " \
    ${datadir} \
-    ${libdir}/tracker-miners-3.0 \
+    ${libdir}/localsearch-3.0 \
    ${systemd_user_unitdir} \
 "
diff --git a/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tinysparql/0001-fix-reproducibility.patch
index 4527f9efa..23da5bb97 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch
+++ b/meta-gnome/recipes-gnome/tracker/tinysparql/0001-fix-reproducibility.patch
@@ -1,4 +1,4 @@
-From ae34fb111e1f2498f37b21c0c32ace6c9928ad66 Mon Sep 17 00:00:00 2001
+From 1eec06fc1ef26e4954507001c1c2f981eab8d77d Mon Sep 17 00:00:00 2001
 From: Markus Volk <f_l_k@t-online.de>
 Date: Mon, 18 Sep 2023 02:47:55 +0200
 Subject: [PATCH] tracker: fix reproducibility issue
@@ -12,16 +12,18 @@ Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Markus Volk <f_l_k@t-online.de>
 ---
- meson.build                       | 6 +++---
+ meson.build                        | 6 +++---
- src/libtracker-common/meson.build | 4 ++--
+ src/libtracker-common/meson.build  | 4 ++--
- src/libtracker-sparql/meson.build | 4 ++--
+ src/libtracker-http/meson.build    | 8 ++++----
- 3 files changed, 7 insertions(+), 7 deletions(-)
+ src/libtracker-http/tracker-http.c | 4 ++--
+ src/libtracker-sparql/meson.build  | 4 ++--
+ 5 files changed, 13 insertions(+), 13 deletions(-)
 diff --git a/meson.build b/meson.build
-index bc9f93a..6c86e5a 100644
+index 41c00fafc..6e7282cb7 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -357,7 +357,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD')
+@@ -333,7 +333,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD')
 conf.set('HAVE_RTLD_NOLOAD', have_rtld_noload)
 
 # Config that goes in some other generated files (.desktop, .service, etc)
@@ -30,7 +32,7 @@ index bc9f93a..6c86e5a 100644
 conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir')))
 
 configure_file(input: 'config.h.meson.in',
-@@ -396,8 +396,8 @@ subdir('docs')
+@@ -372,8 +372,8 @@ subdir('docs')
 subdir('utils')
 
 test_c_args = tracker_c_args + [
@@ -42,7 +44,7 @@ index bc9f93a..6c86e5a 100644
 
 tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'tracker')
 diff --git a/src/libtracker-common/meson.build b/src/libtracker-common/meson.build
-index 9355d1c..cdbc05f 100644
+index 72c2ae073..12218c870 100644
 --- a/src/libtracker-common/meson.build
 +++ b/src/libtracker-common/meson.build
 @@ -51,10 +51,10 @@ libtracker_common = static_library('tracker-common',
@@ -58,11 +60,31 @@ index 9355d1c..cdbc05f 100644
   ] + tracker_c_args,
   include_directories: [configinc, srcinc],
   gnu_symbol_visibility: 'hidden',
+diff --git a/src/libtracker-http/tracker-http.c b/src/libtracker-http/tracker-http.c
+index dd82e9928..3cc68b240 100644
+--- a/src/libtracker-http/tracker-http.c
+++ b/src/libtracker-http/tracker-http.c
+@@ -53,13 +53,13 @@ ensure_types (void)
+ 
+                current_dir = g_get_current_dir ();
+ 
+-               if (g_strcmp0 (current_dir, BUILDROOT) == 0) {
+               if (0) {
+                        /* Detect in-build runtime of this code, this may happen
+                         * building introspection information or running tests.
+                         * We want the in-tree modules to be loaded then.
+                         */
+                        module_path = g_strdup_printf (BUILD_LIBDIR "/%s", modules[i]);
+-               } else {
+               } else {
+                        module_path = g_strdup_printf (PRIVATE_LIBDIR "/%s", modules[i]);
+                }
+ 
 diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
-index 4143eac..b73f1c9 100644
+index 5eccb92fc..161f6ea21 100644
 --- a/src/libtracker-sparql/meson.build
 +++ b/src/libtracker-sparql/meson.build
-@@ -98,10 +98,10 @@ libtracker_sparql_private = static_library('tracker-sparql-private',
+@@ -102,10 +102,10 @@ libtracker_sparql_private = static_library('tracker-sparql-private',
     c_args: [
        '-include', 'libtracker-sparql/tracker-private.h',
         '-DPRIVATE_LIBDIR="@0@"'.format(tracker_internal_libs_dir),
@@ -74,4 +96,7 @@ index 4143eac..b73f1c9 100644
 +        '-DBUILDROOT="@0@"'.format('/usr/src/debug/tracker'),
     ] + tracker_c_args,
 
-     dependencies: [libtracker_sparql_dependencies, gvdb_dep],
+     dependencies: [libtracker_sparql_dependencies],
+-- 
+2.46.0
diff --git a/meta-gnome/recipes-gnome/tracker/tinysparql/0001-src-libtracker-sparql-meson.build-dont-create-compat.patch b/meta-gnome/recipes-gnome/tracker/tinysparql/0001-src-libtracker-sparql-meson.build-dont-create-compat.patch
new file mode 100644
index 000000000..d6cc4f45d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/tracker/tinysparql/0001-src-libtracker-sparql-meson.build-dont-create-compat.patch
@@ -0,0 +1,32 @@
+From 0dfdbeef174c18e846b98af816a9675c12a42845 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Fri, 20 Sep 2024 16:43:44 +0200
+Subject: [PATCH] src/libtracker-sparql/meson.build: dont create compatibility
+ symlinks
+Using the sh script will cause package_qa error:
+Exception: Exception: KeyError: 'getpwuid(): uid not found: 1000'
+Path /home/flk/poky/build-hypr/tmp/work/corei7-64-poky-linux/tinysparql/3.8.0/sstate-build-package/package/usr/lib/libtracker-sparql-3.0.so is owned by uid 1000, gid 100, which doesn't match any user/group on target. This may be due to host contamination.
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ src/libtracker-sparql/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
+index 5eccb92fc..6ed7c2b1f 100644
+--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
+@@ -247,6 +247,6 @@ endif
+ 
+ tracker_sparql_uninstalled_dir = meson.current_build_dir()
+ 
+-meson.add_install_script('symlink-libtracker-sparql.sh', get_option('libdir'), meson.current_build_dir())
+#meson.add_install_script('symlink-libtracker-sparql.sh', get_option('libdir'), meson.current_build_dir())
+ 
+ meson.override_dependency('tinysparql-3.0', tracker_sparql_dep)
+-- 
+2.46.0
diff --git a/meta-gnome/recipes-gnome/tracker/tracker_3.7.3.bb b/meta-gnome/recipes-gnome/tracker/tinysparql_3.8.0.bb
index 885f3515d..628384464 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker_3.7.3.bb
+++ b/meta-gnome/recipes-gnome/tracker/tinysparql_3.8.0.bb
@@ -7,22 +7,20 @@ LIC_FILES_CHKSUM = " \
 DEPENDS = " \
    dbus-native \
-    python3-pygobject-native \
    glib-2.0 \
    sqlite3 \
-    libarchive \
    dbus \
    icu \
    json-glib \
-    libsoup-3.0 \
+    libsoup \
    libstemmer \
 "
+inherit gettext gnomebase gobject-introspection vala gtk-doc bash-completion
-inherit gettext gnomebase gobject-introspection vala gtk-doc bash-completion python3native
 SRC_URI += "file://0001-fix-reproducibility.patch"
-SRC_URI[archive.sha256sum] = "ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9"
+SRC_URI += "file://0001-src-libtracker-sparql-meson.build-dont-create-compat.patch"
+SRC_URI[archive.sha256sum] = "c0fcda77520f531548b2395137dcd193ee9cde5e222d3c9d273f030d1762a504"
 # text search is not an option anymore and requires sqlite3 build with
 # PACKAGECONFIG[fts5] set (default)
@@ -39,21 +37,23 @@ EXTRA_OEMESON = " \
    -Dman=false \
    -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \
    -Dsystemd_user_services_dir=${systemd_user_unitdir} \
-    -Dsoup=soup3 \
+    -Dtests=false \
    ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=enabled', '-Dvapi=disabled', d)} \
 "
-do_install:prepend() {
-    sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/tracker-sparql-enum-types.c
-    sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/core/tracker-data-enum-types.c
-}
 GIR_MESON_ENABLE_FLAG = 'enabled'
 GIR_MESON_DISABLE_FLAG = 'disabled'
+PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "zeroconf", "avahi", "", d)}"
+PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi,"
+do_install:prepend() {
+    sed -i -e 's|${B}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/tracker-sparql-enum-types.c
+    sed -i -e 's|${B}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/core/tracker-data-enum-types.c
+}
 FILES:${PN} += " \
    ${datadir}/dbus-1 \
-    ${datadir}/tracker3 \
+    ${libdir}/tinysparql-3.0 \
-    ${libdir}/tracker-3.0 \
    ${systemd_user_unitdir} \
 "
diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.2.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_47.1.bb
index e1dd8afae..3e1213d7c 100644
--- a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.2.bb
+++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_47.1.bb
@@ -21,7 +21,7 @@ inherit gnomebase pkgconfig gsettings features_check
 REQUIRED_DISTRO_FEATURES = "polkit"
-SRC_URI[archive.sha256sum] = "b5c65ea25e8483502d033a613be6dc6b71883ac07f1a3e474ad18049c47d16d6"
+SRC_URI[archive.sha256sum] = "d420ff72173b04dc9491d3d7dd8cc96204f7f3f27c4cbea6024361ea9839f769"
 PACKAGECONFIG ?= "screenshot screencast ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
 PACKAGECONFIG[wayland] = ",,wayland-native"
diff --git a/meta-initramfs/conf/include/non-repro-meta-initramfs.inc b/meta-initramfs/conf/include/non-repro-meta-initramfs.inc
index 8f01f5624..c05f59d1a 100755
--- a/meta-initramfs/conf/include/non-repro-meta-initramfs.inc
+++ b/meta-initramfs/conf/include/non-repro-meta-initramfs.inc
@@ -1,23 +1,3 @@
 # List of known non-reproducible package of the meta-initramfs layer
 # Please keep this list sorted
-KNOWN_NON_REPRO_META_INITRAMFS = " \
+KNOWN_NON_REPRO_META_INITRAMFS = ""
-    kexecboot-klibc \
-    kexecboot-klibc-dbg \
-    kexec-klibc \
-    kexec-tools-klibc-dbg \
-    mtdinfo-klibc \
-    ubiattach-klibc \
-    ubiblock-klibc \
-    ubicrc32-klibc \
-    ubidetach-klibc \
-    ubiformat-klibc \
-    ubimkvol-klibc \
-    ubinfo-klibc \
-    ubinize-klibc \
-    ubirename-klibc \
-    ubirmvol-klibc \
-    ubirsvol-klibc \
-    ubiupdatevol-klibc \
-    ubi-utils-klibc-dbg \
-    vmcore-dmesg-klibc \
-"
diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf
index c844085b0..e8527495a 100644
--- a/meta-initramfs/conf/layer.conf
+++ b/meta-initramfs/conf/layer.conf
@@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-initramfs = "5"
 LAYERDEPENDS_meta-initramfs = "core"
-LAYERSERIES_COMPAT_meta-initramfs = "styhead"
+LAYERSERIES_COMPAT_meta-initramfs = "styhead walnascar"
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
  dracut->virtual/kernel \
diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf
index 0442a57a9..25e8b044a 100644
--- a/meta-multimedia/conf/layer.conf
+++ b/meta-multimedia/conf/layer.conf
@@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1"
 LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python"
-LAYERSERIES_COMPAT_multimedia-layer = "styhead"
+LAYERSERIES_COMPAT_multimedia-layer = "styhead walnascar"
diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.0.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.1.bb
index 8a506af44..b5329a9a3 100644
--- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.0.bb
+++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.1.bb
@@ -20,7 +20,7 @@ inherit gnomebase features_check vala gobject-introspection gettext systemd
 # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11"
-SRC_URI[archive.sha256sum] = "5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72"
+SRC_URI[archive.sha256sum] = "7b2c631b842408da27a54242f8082aba49bd1ca02041e79e1eefba0c7009a87b"
 GIR_MESON_ENABLE_FLAG = 'enabled'
 GIR_MESON_DISABLE_FLAG = 'disabled'
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-Remove-redundant-rpaths.patch b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-Remove-redundant-rpaths.patch
new file mode 100644
index 000000000..b1e1e897b
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-Remove-redundant-rpaths.patch
@@ -0,0 +1,26 @@
+From c183aae97728e25e0822b14f5093f60cb4331207 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 12 Oct 2024 10:48:01 -0700
+Subject: [PATCH] gstd: Remove redundant rpaths
+This emits /usr/lib into binaries which are redundant
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gstd/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/gstd/meson.build b/gstd/meson.build
+index b6aa588..8cdf810 100644
+--- a/gstd/meson.build
+++ b/gstd/meson.build
+@@ -18,7 +18,7 @@ executable(exe_name,
+   include_directories : [configinc, libgstd_inc_dir],
+   dependencies : [gstd_deps, lib_gstd_dep],
+   c_args: gst_c_args,
+-  install_rpath: get_option('prefix') + '/' + get_option('libdir'),
+  #install_rpath: get_option('prefix') + '/' + get_option('libdir'),
+ )
+ lib_gstd_dir = meson.current_build_dir()
+ 
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
index 87792491a..3b0d3ded1 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
@@ -8,12 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c71b653a0f608a58cdc5693ae57126bc"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon libsoup-2.4 jansson"
 SRCBRANCH ?= "master"
-SRCREV = "a011affa67f240cbc7aaff5b00fdfd6124bdaece"
+SRCREV = "dac03d5e4102080a8f3ef274a6a6583455962095"
-SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \
+           file://0001-gstd-Remove-redundant-rpaths.patch"
 S = "${WORKDIR}/git"
 # Remove the +really when upstream version is > 1.0
-PV = "1.0+really0.15.0"
+PV = "1.0+really0.15.2"
 GTKDOC_MESON_OPTION = "enable-gtk-doc"
diff --git a/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.3.bb b/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.10.bb
index 8bb49b2f1..fea15f04e 100644
--- a/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.3.bb
+++ b/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.10.bb
@@ -7,15 +7,14 @@ HOMEPAGE = "https://lib.openmpt.org/libopenmpt/"
 SECTION = "libs"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=59f6e21f42e49919617267ff13a0b232"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=829270a66f67187a1d08640df673249a"
 DEPENDS = "virtual/libiconv"
 SRC_URI = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${PV}+release.autotools.tar.gz \
           file://run-ptest \
          "
+SRC_URI[sha256sum] = "093713c1c1024f4f10c4779a66ceb2af51fb7c908a9e99feb892d04019220ba1"
-SRC_URI[sha256sum] = "2cf8369b7916b09264f3f14b9fb6cef35a6e9bee0328dec4f49d98211ccfd722"
 S = "${WORKDIR}/libopenmpt-${PV}+release.autotools"
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
index 8c9ead148..170e676b2 100644
--- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
+++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc
@@ -21,6 +21,10 @@ S = "${WORKDIR}/git"
 # configure.ac:30: error: required file './ABOUT-NLS' not found
 EXTRA_AUTORECONF = ""
+# Reproducibility: force os-name and os-version to constants to avoid host
+# related build differences
+EXTRA_OECONF = "--with-os-name='${DISTRO_NAME}' --with-os-version=''"
 do_install:append(){
    install -d ${D}${sysconfdir}
    install -m 0755 minidlna.conf ${D}${sysconfdir}
diff --git a/meta-multimedia/recipes-multimedia/pipewire/files/0ca64277b317b4836beccaa3248ab9055526811c.patch b/meta-multimedia/recipes-multimedia/pipewire/files/0ca64277b317b4836beccaa3248ab9055526811c.patch
new file mode 100644
index 000000000..9b05e9e4c
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/pipewire/files/0ca64277b317b4836beccaa3248ab9055526811c.patch
@@ -0,0 +1,46 @@
+From 0ca64277b317b4836beccaa3248ab9055526811c Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Mon, 30 Sep 2024 10:06:30 +0200
+Subject: [PATCH] spa: initialize all fields explicitly
+Patch by Petar Popovic
+Fixes #4325
+Upstream-Status: Backport [https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/0ca64277b317b4836beccaa3248ab9055526811c]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ spa/include/spa/pod/builder.h | 2 +-
+ spa/include/spa/pod/parser.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/spa/include/spa/pod/builder.h b/spa/include/spa/pod/builder.h
+index 0564d94ea2..6d3e9d54af 100644
+--- a/spa/include/spa/pod/builder.h
+++ b/spa/include/spa/pod/builder.h
+@@ -49,7 +49,7 @@ struct spa_pod_builder {
+        struct spa_callbacks callbacks;
+ };
+ 
+-#define SPA_POD_BUILDER_INIT(buffer,size)  ((struct spa_pod_builder){ (buffer), (size), 0, {0}, {0} })
+#define SPA_POD_BUILDER_INIT(buffer,size)  ((struct spa_pod_builder){ (buffer), (size), 0, {0,0,NULL},{NULL,NULL}})
+ 
+ static inline void
+ spa_pod_builder_get_state(struct spa_pod_builder *builder, struct spa_pod_builder_state *state)
+diff --git a/spa/include/spa/pod/parser.h b/spa/include/spa/pod/parser.h
+index 083f911713..4c1e72acce 100644
+--- a/spa/include/spa/pod/parser.h
+++ b/spa/include/spa/pod/parser.h
+@@ -33,7 +33,7 @@ struct spa_pod_parser {
+        struct spa_pod_parser_state state;
+ };
+ 
+-#define SPA_POD_PARSER_INIT(buffer,size)  ((struct spa_pod_parser){ (buffer), (size), 0, {0} })
+#define SPA_POD_PARSER_INIT(buffer,size)  ((struct spa_pod_parser){ (buffer), (size), 0, {0,0,NULL}})
+ 
+ static inline void spa_pod_parser_init(struct spa_pod_parser *parser,
+                                       const void *data, uint32_t size)
+-- 
+GitLab
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.3.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.6.bb
index 0a2088a3c..4ce047a2a 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.3.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.6.bb
@@ -12,8 +12,9 @@ LIC_FILES_CHKSUM = " \
 DEPENDS = "dbus ncurses"
-SRCREV = "e2a76824e2b112b15ae4a1a3d444696d5526f8d8"
+SRCREV = "79eebcb72490484e25208971ca15b9e0ea25bd95"
 SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.2;protocol=https"
+SRC_URI += "file://0ca64277b317b4836beccaa3248ab9055526811c.patch"
 S = "${WORKDIR}/git"
diff --git a/meta-networking/conf/include/non-repro-meta-networking.inc b/meta-networking/conf/include/non-repro-meta-networking.inc
index 0564e1ced..7497ed4b0 100755
--- a/meta-networking/conf/include/non-repro-meta-networking.inc
+++ b/meta-networking/conf/include/non-repro-meta-networking.inc
@@ -1,34 +1,21 @@
 # List of known non-reproducible package of the meta-networking layer
 # Please keep this list sorted
 KNOWN_NON_REPRO_META_NETWORKING = " \
-    blueman \
+    babeld \
-    blueman-dbg \
+    babeld-dbg \
-    blueman-src \
-    civetweb-dev \
    dhcp-relay-staticdev \
    ettercap-src \
-    fetchmail \
-    fetchmail-dbg \
    freediameter \
-    freediameter-src \
    freeradius \
    htpdate-doc \
-    keepalived \
-    keepalived-dbg \
    libbearssl-staticdev \
-    libfko3 \
-    libfko-client \
-    libfko-daemon \
-    libfko-dbg \
    libmosquitto1 \
    libowfat-staticdev \
    libruli-staticdev \
-    libsamba-util0 \
    mosquitto \
-    mosquitto-dbg \
    ncftp \
-    ncftp-dbg \
+    ncp \
-    ncftp-src \
+    ncp-dbg \
    ndisc6-dbg \
    ndisc6-misc \
    ndisc6-ndisc6 \
@@ -36,25 +23,14 @@ KNOWN_NON_REPRO_META_NETWORKING = " \
    ndisc6-rdnssd \
    ndisc6-rltraceroute6 \
    netsniff-ng-doc \
+    ntopng \
+    ntopng-dbg \
    ntpsec-src \
    openl2tp \
-    openl2tp-dbg \
+    opensaf \
-    ot-br-posix \
-    ot-br-posix-dbg \
    postfix-cfg \
-    proftpd \
-    proftpd-dbg \
-    proftpd-dev \
-    rdist \
-    rdist-dbg \
    rp-pppoe \
-    samba-dbg \
-    tayga \
-    tayga-dbg \
    udpcast-doc \
    unbound-doc \
-    wolfssl \
-    wolfssl-dbg \
    znc \
-    znc-doc \
 "
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
index a9ba4abad..19ce3fe90 100644
--- a/meta-networking/conf/layer.conf
+++ b/meta-networking/conf/layer.conf
@@ -15,7 +15,7 @@ LAYERVERSION_networking-layer = "1"
 LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer"
-LAYERSERIES_COMPAT_networking-layer = "styhead"
+LAYERSERIES_COMPAT_networking-layer = "styhead walnascar"
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_2.2.1.bb
index 12cc6645b..0c670a2ca 100644
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb
+++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_2.2.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "\
    file://firewalld.init \
    file://run-ptest \
 "
-SRC_URI[sha256sum] = "aba0d8ce9617b906ea4866bf0bdfb2c2d5312f53b8e9e8e9e4d49bf330da5b5e"
+SRC_URI[sha256sum] = "5215ba30236ee1e3df2c2292465a9ff605b9c445dcab2e37da4961cb27c7f36e"
 # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4
 DEPENDS = "intltool-native glib-2.0-native nftables"
@@ -159,10 +159,10 @@ do_install:append() {
    # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools.
    if [ ${PN} != "${BPN}-native" ]; then
        sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \
-            ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml
+            ${D}${bindir}/* ${D}${sbindir}/*
    fi
    sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \
-        ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml
+        ${D}${bindir}/* ${D}${sbindir}/*
    # This file contains Red Hat-isms. Modules get loaded without it.
    rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf
@@ -274,6 +274,7 @@ FILES:${PN} += "\
    ${datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml \
 "
 RDEPENDS:${PN} += "\
+    bash \
    python3-firewall \
    iptables \
    python3-core \
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.2.bb
index 62c3add2a..168ee1b5d 100644
--- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb
+++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.2.bb
@@ -27,7 +27,7 @@ SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-3
        git://github.com/Mbed-TLS/mbedtls-framework.git;protocol=https;branch=main;destsuffix=git/framework;name=framework \
        file://run-ptest"
-SRCREV = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3"
+SRCREV = "107ea89daaefb9867ea9121002fbbdf926780e98"
 SRCREV_framework = "94599c0e3b5036e086446a51a3f79640f70f22f6"
 SRCREV_FORMAT .= "_framework"
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
deleted file mode 100644
index 627638ec8..000000000
--- a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1571]
-From 3fe5468f1bdca1bff1d18cf43c9e338f41aa9e32 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Wed, 22 Jan 2020 12:39:49 +0100
-Subject: [PATCH] Add dynamic symbols linking with cmake too
-Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
---
- lib/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
--- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -94,6 +94,8 @@
-        OUTPUT_NAME mosquitto
-        VERSION ${VERSION}
-        SOVERSION 1
-+       LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linker.version
-+       LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.version"
- )
- 
- install(TARGETS libmosquitto
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
deleted file mode 100644
index 7374cbd26..000000000
--- a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Joachim Zobel <jz-2017@heute-morgen.de>
-Date: Wed, 13 Sep 2023 09:55:34 +0200
-Subject: [PATCH] Link correctly with shared websockets library if needed see:
- https://github.com/eclipse/mosquitto/pull/2751
-Patch contributed by Joachim Zobel <jz-2017@heute-morgen.de> and  Daniel Engberg <daniel.engberg.lists@pyret.net>
---
-Upstream-Status: Pending
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9380a04..dce8313 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS)
-                        link_directories(${mosquitto_SOURCE_DIR})
-                endif (WIN32)
-        else (STATIC_WEBSOCKETS)
-               set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
-+               set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
-        endif (STATIC_WEBSOCKETS)
- endif (WITH_WEBSOCKETS)
- 
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.19.bb
index 4ef065410..3d4c6dce9 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.19.bb
@@ -16,12 +16,10 @@ DEPENDS = "uthash cjson"
 SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
           file://mosquitto.init \
-           file://1571.patch \
-           file://2894.patch \
           file://2895.patch \
 "
-SRC_URI[sha256sum] = "d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a"
+SRC_URI[sha256sum] = "33af3637f119a61c509c01d2f8f6cc3d8be76f49e850132f2860af142abf82a9"
 inherit systemd update-rc.d useradd cmake pkgconfig
diff --git a/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb b/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb
index a6556249b..9ae3b8937 100644
--- a/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb
+++ b/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb
@@ -5,7 +5,7 @@ SECTION = "libs/networking"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41e579bb4326c21c774f8e51e41d8a3"
-SRC_URI = "git://github.com/nanomsg/nng.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/nanomsg/nng.git;branch=main;protocol=https"
 SRCREV = "85fbe7f9e4642b554d0d97f2e3ff2aa12978691a"
 S = "${WORKDIR}/git"
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
index 32d714f6f..90244cf09 100644
--- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
+++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
@@ -1,4 +1,4 @@
-From 79fd22c0def26eba130db98e312bb00fec32ac0a Mon Sep 17 00:00:00 2001
+From ed60c2ad3a7ed9762fcb6a304c7f60544606baef Mon Sep 17 00:00:00 2001
 From: Tudor Florea <tudor.florea@enea.com>
 Date: Tue, 4 Aug 2015 03:07:01 +0200
 Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is
@@ -10,16 +10,15 @@ Upstream-Status: Inappropriate [config]
 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
 Signed-off-by: Tudor Florea <tudor.florea@enea.com>
 ---
 configure.ac | 2 --
 1 file changed, 2 deletions(-)
 diff --git a/configure.ac b/configure.ac
-index 695ce68..0f28b55 100644
+index e578b2b..3874124 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -414,8 +414,6 @@ AC_ARG_WITH(minimal,
+@@ -415,8 +415,6 @@ AC_ARG_WITH(minimal,
     AC_DEFINE(NO_FTP_USERS)
     AC_DEFINE(WITHOUT_ASCII)    
     AC_DEFINE(BORING_MODE)
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.52.bb
index 6f03f73db..1ce3c468b 100644
--- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb
+++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.52.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and
 HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd"
 SECTION = "net"
 LICENSE = "0BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=194bc994ad6bbd4ff5a021082fe52156"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5138d4a8a877b32de6a78cf7e9e99c25"
 DEPENDS = "libcap virtual/crypt"
@@ -11,7 +11,7 @@ SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.t
           file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \
           file://nostrip.patch \
 "
-SRC_URI[sha256sum] = "4160f66b76615eea2397eac4ea3f0a146b7928207b79bc4cc2f99ad7b7bd9513"
+SRC_URI[sha256sum] = "1126f3a95856d08889ff89703cb1aa9ec9924d939d154e96904c920f05dc3c74"
 inherit autotools
diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.6.0.bb
index d57cb977e..ba21c4605 100644
--- a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb
+++ b/meta-networking/recipes-devtools/python/python3-scapy_2.6.0.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 # If you want ptest support, use the git repo
 # UTscapy does not exist in the pypi pkg
 #
-SRCREV = "0474c37bf1d147c969173d52ab3ac76d2404d981"
+SRCREV = "f7a64114b35fd8ee63ce07290f8a2dffd52b215f"
 SRC_URI = "git://github.com/secdev/scapy.git;branch=master;protocol=https \
           file://run-ptest"
@@ -24,7 +24,7 @@ S = "${WORKDIR}/git"
 UPSTREAM_CHECK_COMMITS = "1"
-inherit setuptools3 ptest
+inherit python_setuptools_build_meta ptest
 do_install:append() {
        mv ${D}${bindir}/scapy ${D}${bindir}/scapy3
diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch
deleted file mode 100644
index a02940af3..000000000
--- a/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001
-From: Robert Marko <robimarko@gmail.com>
-Date: Thu, 24 Feb 2022 15:01:11 +0100
-Subject: [PATCH] conntrack: fix build with kernel 5.15 and musl
-Currently, with kernel 5.15 headers and musl building is failing with
-redefinition errors due to a conflict between the kernel and musl headers.
-Musl is able to suppres the conflicting kernel header definitions if they
-are included after the standard libc ones, however since ICMP definitions
-were moved into a separate internal header to avoid duplication this has
-stopped working and is breaking the builds.
-It seems that the issue is that <netinet/in.h> which contains the UAPI
-suppression defines is included in the internal.h header and not in the
-proto.h which actually includes the kernel ICMP headers and thus UAPI
-supression defines are not present.
-Solve this by moving the <netinet/in.h> include before the ICMP kernel
-includes in the proto.h
-Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file")
-Signed-off-by: Robert Marko <robimarko@gmail.com>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Upstream-Status: Backport
-[https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824]
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
- include/internal/internal.h | 1 -
- include/internal/proto.h    | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-diff --git a/include/internal/internal.h b/include/internal/internal.h
-index 2ef8a90..7cd7c44 100644
--- a/include/internal/internal.h
-+++ b/include/internal/internal.h
-@@ -14,7 +14,6 @@
- #include <arpa/inet.h>
- #include <time.h>
- #include <errno.h>
-#include <netinet/in.h>
- 
- #include <libnfnetlink/libnfnetlink.h>
- #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-diff --git a/include/internal/proto.h b/include/internal/proto.h
-index 40e7bfe..60a5f4e 100644
--- a/include/internal/proto.h
-+++ b/include/internal/proto.h
-@@ -2,6 +2,7 @@
- #define _NFCT_PROTO_H_
- 
- #include <stdint.h>
-+#include <netinet/in.h>
- #include <linux/icmp.h>
- #include <linux/icmpv6.h>
- 
-- 
-2.25.1
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.9.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb
index abec84b25..83533832d 100644
--- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.9.bb
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb
@@ -6,12 +6,10 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 DEPENDS = "libnfnetlink libmnl"
-SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.bz2 \
+SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.xz \
-           file://0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch \
          "
-SRC_URI[md5sum] = "596c722733cdf30f24d4418f34f999d9"
+SRC_URI[sha256sum] = "67edcb4eb826c2f8dc98af08dabff68f3b3d0fe6fb7d9d0ac1ee7ecce0fe694e"
-SRC_URI[sha256sum] = "67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8"
 S = "${WORKDIR}/libnetfilter_conntrack-${PV}"
diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.7.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.8.bb
index b46520938..0af64fe03 100644
--- a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.7.bb
+++ b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.8.bb
@@ -7,7 +7,7 @@ SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \
           file://0001-configure.ac-Add-serial-tests.patch \
           file://run-ptest \
           "
-SRCREV = "116e95aa7b6358c917de8c69f6f173874030b46b"
+SRCREV = "06e2cbec41c7cd7f2b1e660ce5e5f949912e32eb"
 S = "${WORKDIR}/git"
diff --git a/meta-networking/recipes-filter/nftables/nftables_1.1.0.bb b/meta-networking/recipes-filter/nftables/nftables_1.1.1.bb
index 98e7a85a4..17709016b 100644
--- a/meta-networking/recipes-filter/nftables/nftables_1.1.0.bb
+++ b/meta-networking/recipes-filter/nftables/nftables_1.1.1.bb
@@ -14,7 +14,7 @@ DEPENDS = "libmnl libnftnl bison-native \
 SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \
           file://run-ptest \
          "
-SRC_URI[sha256sum] = "ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24"
+SRC_URI[sha256sum] = "6358830f3a64f31e39b0ad421d7dadcd240b72343ded48d8ef13b8faf204865a"
 inherit autotools manpages pkgconfig ptest
diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb
index 8def54ece..c12b8abd5 100644
--- a/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb
+++ b/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb
@@ -1,7 +1,7 @@
 require wireguard.inc
 SRCREV = "3ba6527130c502144e7388b900138bca6260f4e8"
-SRC_URI = "git://git.zx2c4.com/wireguard-tools;branch=master"
+SRC_URI = "git://github.com/WireGuard/wireguard-tools.git;branch=master;protocol=https"
 inherit bash-completion systemd pkgconfig
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch
index abf82b1e0..d74c031ab 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch
@@ -1,4 +1,4 @@
-From 2db1f5bc941e4b4cd1721e361a47cfe288b07a76 Mon Sep 17 00:00:00 2001
+From 3138d70ce8f521d03120e7789e93ebe290ece101 Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Thu, 1 Feb 2024 14:07:03 +0000
 Subject: [PATCH] Fix SIGSEGV during DumpStateLog()
@@ -13,10 +13,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/mDNSShared/mDNSDebug.c b/mDNSShared/mDNSDebug.c
-index 7a4ca19eff6d..d449dde320f6 100644
+index b531fcea2bb9..1e8d9b10afbc 100644
 --- a/mDNSShared/mDNSDebug.c
 +++ b/mDNSShared/mDNSDebug.c
-@@ -71,7 +71,7 @@ mDNSlocal void LogMsgWithLevelv(os_log_t category, os_log_type_t level, const ch
+@@ -72,7 +72,7 @@ mDNSlocal void LogMsgWithLevelv(os_log_t category, os_log_type_t level, const ch
 mDNSlocal void LogMsgWithLevelv(const char *category, mDNSLogLevel_t level, const char *format, va_list args)
 {
     // Do not print the logs if the log category is MDNS_LOG_CATEGORY_DISABLED.
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch
index 7ec599601..a531884af 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch
@@ -1,4 +1,4 @@
-From c67102307f25c5f4d238c736e90519e56a76ae79 Mon Sep 17 00:00:00 2001
+From 199b376e585d5362a1f51ea20e45dcc3bdb7d6aa Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Fri, 23 Jun 2023 10:10:00 +0200
 Subject: [PATCH] Handle interface without `ifa_addr`
@@ -15,10 +15,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
 1 file changed, 3 insertions(+), 1 deletion(-)
 diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index 0c9dd2582660..c3ead26799e6 100644
+index 4c835a8c253c..e1e27b1de3b2 100644
 --- a/mDNSPosix/mDNSPosix.c
 +++ b/mDNSPosix/mDNSPosix.c
-@@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context)
+@@ -1927,6 +1927,7 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context)
            continue;
 
         if ((ifa_loop4 == NULL) &&
@@ -26,7 +26,7 @@ index 0c9dd2582660..c3ead26799e6 100644
             ((*ifi)->ifa_addr->sa_family == AF_INET) &&
             ((*ifi)->ifa_flags & IFF_UP) &&
             ((*ifi)->ifa_flags & IFF_LOOPBACK))
-@@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context)
+@@ -1935,7 +1936,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context)
             continue;
         }
 
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-Add-definition-for-MAX.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-Add-definition-for-MAX.patch
new file mode 100644
index 000000000..82d7ceca3
--- /dev/null
+++ b/meta-networking/recipes-protocols/mdns/mdns/0004-Add-definition-for-MAX.patch
@@ -0,0 +1,24 @@
+From f0adca77472c9c1df6db14f2b03e66d78a577649 Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alex.kiernan@gmail.com>
+Date: Sat, 26 Oct 2024 13:24:45 +0000
+Subject: [PATCH] Add definition for MAX()
+Upstream-Status: Inactive-Upstream [Upstream does not take patches]
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+---
+ mDNSShared/uds_daemon.c | 2 ++
+ 1 file changed, 2 insertions(+)
+diff --git a/mDNSShared/uds_daemon.c b/mDNSShared/uds_daemon.c
+index e73bc1181b73..1d590a6a3580 100644
+--- a/mDNSShared/uds_daemon.c
+++ b/mDNSShared/uds_daemon.c
+@@ -89,6 +89,8 @@
+ 
+ #include "mdns_strict.h"
+ 
+#define MAX(A, B) (((A) > (B)) ? (A) : (B))
+
+ // User IDs 0-500 are system-wide processes, not actual users in the usual sense
+ // User IDs for real user accounts start at 501 and count up from there
+ #define SystemUID(X) ((X) <= 500)
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-Fix-missing-limit-declarations.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-Fix-missing-limit-declarations.patch
new file mode 100644
index 000000000..4d4a8cf9b
--- /dev/null
+++ b/meta-networking/recipes-protocols/mdns/mdns/0005-Fix-missing-limit-declarations.patch
@@ -0,0 +1,49 @@
+From cf216a6872139e435d5712787359b03022b51d2b Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alexk@zuma.ai>
+Date: Sat, 26 Oct 2024 13:26:09 +0000
+Subject: [PATCH] Fix missing `limit` declarations
+`put_attribute_tlvs` needs a limit setting which is missing, add it in.
+Upstream-Status: Inactive-Upstream [Upstream does not take patches]
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+---
+ mDNSShared/dnssd_clientstub.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/mDNSShared/dnssd_clientstub.c b/mDNSShared/dnssd_clientstub.c
+index fc93d162446a..a6cf45fa9856 100644
+--- a/mDNSShared/dnssd_clientstub.c
+++ b/mDNSShared/dnssd_clientstub.c
+@@ -2022,6 +2022,7 @@ DNSServiceErrorType DNSServiceRegisterInternal
+     ipc_msg_hdr *hdr;
+     DNSServiceErrorType err;
+     union { uint16_t s; u_char b[2]; } port = { portInNetworkByteOrder };
+    const uint8_t *limit;
+     (void)attr;
+ 
+     if (!sdRef || !regtype) return kDNSServiceErr_BadParam;
+@@ -2054,6 +2055,7 @@ DNSServiceErrorType DNSServiceRegisterInternal
+     if (!hdr) { DNSServiceRefDeallocate(*sdRef); *sdRef = NULL; return kDNSServiceErr_NoMemory; }
+     if (!callBack) hdr->ipc_flags |= IPC_FLAGS_NOREPLY;
+ 
+    limit = ptr + len;
+     put_flags(flags, &ptr);
+     put_uint32(interfaceIndex, &ptr);
+     put_string(name, &ptr);
+@@ -2334,6 +2336,7 @@ DNSServiceErrorType DNSServiceRegisterRecordInternal
+     ipc_msg_hdr *hdr = NULL;
+     DNSRecordRef rref = NULL;
+     DNSRecord **p;
+    const uint8_t *limit;
+     (void)attr;
+ 
+     // Verify that only one of the following flags is set.
+@@ -2389,6 +2392,7 @@ DNSServiceErrorType DNSServiceRegisterRecordInternal
+     hdr = create_hdr(reg_record_request, &len, &ptr, !(flags & kDNSServiceFlagsQueueRequest), sdRef);
+     if (!hdr) return kDNSServiceErr_NoMemory;
+ 
+    limit = ptr + len;
+     put_flags(flags, &ptr);
+     put_uint32(interfaceIndex, &ptr);
+     put_string(fullname, &ptr);
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
index 818017037..3784e3be8 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
@@ -1,4 +1,4 @@
-From 05cb409ce213f35798c02faf2032d4846a84b48e Mon Sep 17 00:00:00 2001
+From d15ee692af42163846be7517372f3ee098cdaf18 Mon Sep 17 00:00:00 2001
 From: Beniamin Sandu <beniaminsandu@gmail.com>
 Date: Thu, 15 Jun 2023 17:02:58 +0000
 Subject: [PATCH] remove unneeded headers
@@ -7,8 +7,7 @@ From a quick look, these seem to not be needed and having them
 breaks the build with mbedtls 3.x. Without them it builds fine
 on both 2.x and 3.x versions.
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [Upstream does not take patches]
 Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
 ---
 mDNSPosix/mbedtls.c | 2 --
diff --git a/meta-networking/recipes-protocols/mdns/mdns_2200.140.11.bb b/meta-networking/recipes-protocols/mdns/mdns_2559.1.1.bb
index e6ea70719..212fd0eab 100644
--- a/meta-networking/recipes-protocols/mdns/mdns_2200.140.11.bb
+++ b/meta-networking/recipes-protocols/mdns/mdns_2559.1.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=31c50371921e0fb731003bbc665f29bf"
 DEPENDS:append:libc-musl = " musl-nscd"
-SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=rel/mDNSResponder-2200 \
+SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=${BRANCH} \
           file://0001-dns-sd-Include-missing-headers.patch \
           file://0002-make-Set-libdns_sd.so-soname-correctly.patch \
           file://0004-make-Separate-TLS-targets-from-libraries.patch \
@@ -24,8 +24,11 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
           file://mdns.service \
           file://0001-Handle-interface-without-ifa_addr.patch \
           file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \
+           file://0005-Fix-missing-limit-declarations.patch \
+           file://0004-Add-definition-for-MAX.patch \
           "
-SRCREV = "12e84b9089e577e0c0a9f48c4b922d7349fcc5a4"
+BRANCH = "main"
+SRCREV = "71e6611203d57c78b26fd505d98cb57a33d00880"
 # We install a stub Makefile in the top directory so that the various checks
 # in base.bbclass pass their tests for a Makefile, this ensures (that amongst
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest b/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
index 01c9c7b44..b8fb08b75 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
@@ -30,9 +30,7 @@ else
 fi
 #read -p "Please input the network interface you use to test(such as eth0, em1 etc):" ETH_TEST
-echo "Please input the network interface you use to test(such as eth0, em1 etc):"
+ETH_TEST=`ip route get 8.8.8.8 | awk -- '{print $5}'`
-read ETH_TEST > /dev/null
 if [ x"$ETH_TEST" = x ]; then
    exit_cus "The network interface cannot be null" 1
 fi
@@ -73,7 +71,7 @@ lsmod | grep l2tp_ppp > /dev/null || exit_cus "FAIL: Load module l2tp_ppp" 2
 # start openl2tpd
 ps aux | grep openl2tpd | grep -v grep > /dev/null && killall openl2tpd > /dev/null
-ppp_path=`rpm -ql openl2tp | grep ppp_null.so`
+ppp_path=`find / -name ppp_null.so`
 echo "test it here"
 /usr/sbin/openl2tpd -d all -D -f -p ${ppp_path} &  > /dev/null
@@ -95,3 +93,4 @@ else
 fi
 restore_file
+ps aux | grep openl2tpd | grep -v grep > /dev/null && killall openl2tpd > /dev/null
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
index f64c7340d..f3b74d1e6 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
@@ -94,3 +94,4 @@ do_install_ptest () {
 }
 RDEPENDS:${PN} = "ppp ppp-l2tp bash"
+RDEPENDS:${PN}-ptest += "rpcbind kernel-module-l2tp-ppp procps-ps tcl"
diff --git a/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch b/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch
new file mode 100644
index 000000000..1712a5346
--- /dev/null
+++ b/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch
@@ -0,0 +1,36 @@
+From ebe9144fdfdc8154661b93322cec4a1c43aa75ff Mon Sep 17 00:00:00 2001
+From: alperak <alperyasinak1@gmail.com>
+Date: Tue, 1 Oct 2024 19:45:38 +0300
+Subject: [PATCH] Fix invalid conversion from int to CURLoption
+Options.hpp:281:74: error: invalid conversion from 'int' to 'CURLoption' [-fpermissive]
+  281 |         typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy;
+      |                                                                          ^
+      |                                                                          |
+      |                                                                          int
+Fix invalid conversion by adding explicit cast to CURLoption
+Upstream-Status: Pending
+Signed-off-by: alperak <alperyasinak1@gmail.com>
+---
+ include/curlpp/Options.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp
+index c705c9d..7c9a501 100644
+--- a/include/curlpp/Options.hpp
+++ b/include/curlpp/Options.hpp
+@@ -278,7 +278,7 @@ namespace options
+        typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_LIMIT> LowSpeedLimit;
+        typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_TIME> LowSpeedTime;
+        typedef curlpp::OptionTrait<long, CURLOPT_MAXCONNECTS> MaxConnects;
+-       typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy;
+       typedef curlpp::OptionTrait<curl_closepolicy, (CURLoption)CURLOPT_CLOSEPOLICY> ClosePolicy;
+        typedef curlpp::OptionTrait<bool, CURLOPT_FRESH_CONNECT> FreshConnect;
+        typedef curlpp::OptionTrait<bool, CURLOPT_FORBID_REUSE> ForbidReuse;
+        typedef curlpp::OptionTrait<long, CURLOPT_CONNECTTIMEOUT> ConnectTimeout;
+-- 
+2.25.1
diff --git a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
index 131f1873a..cacdc9773 100644
--- a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
+++ b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
@@ -8,7 +8,8 @@ DEPENDS = "curl"
 DEPENDS:class-native = "curl-native"
 SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \
-           file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch"
+           file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch \
+           file://0002-fix-invalid-conversion-from-int-to-CURLoption.patch"
 SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f"
diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.21.bb
index 0243f2a1d..1300fc658 100644
--- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
+++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.21.bb
@@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = " \
    file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
 "
-SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225"
+SRCREV = "37d5f1225573b91d706a5e547d081f79963a9deb"
-PV .= "+git"
-LK_REL = "1.0.19"
 SRC_URI = " \
    git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \
@@ -34,19 +31,14 @@ do_install_ptest () {
    done
 }
-SOLIBVERSION="${LK_REL}"
-SOLIBMAJORVERSION="1"
 PACKAGES =+ "${PN}-withsctp ${PN}-utils"
 FILES:${PN} = " \
-    ${libdir}/libsctp.so.${SOLIBVERSION} \
+    ${libdir}/libsctp.so.* \
-    ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \
 "
 FILES:${PN}-withsctp = " \
-    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \
+    ${libdir}/lksctp-tools/libwithsctp.so.* \
-    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \
 "
 FILES:${PN}-dev += " \
diff --git a/meta-networking/recipes-support/mctp/mctp_1.1.bb b/meta-networking/recipes-support/mctp/mctp_2.0.bb
index bf3961be4..24f974774 100644
--- a/meta-networking/recipes-support/mctp/mctp_1.1.bb
+++ b/meta-networking/recipes-support/mctp/mctp_2.0.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21"
-SRCREV = "a591ad885aa28f113cb45870b2fd5bce48378d6f"
+SRCREV = "089dc53fa7387cca517cd713061c323ca06fb6dd"
 SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https"
@@ -13,6 +13,10 @@ S = "${WORKDIR}/git"
 inherit meson pkgconfig systemd
+EXTRA_OEMESON = " \
+    -Dtests=false \
+"
 PACKAGECONFIG ??= " \
    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 "
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb
index 0c64889bc..457064c01 100644
--- a/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb
+++ b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb
@@ -6,4 +6,4 @@ S = "${WORKDIR}/git"
 inherit pkgconfig autotools
-RDEPENDS:${PN} = "kernel-module-mdio-netlink"
+RRECOMMENDS:${PN} = "kernel-module-mdio-netlink"
diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch
new file mode 100644
index 000000000..7bfb17bf0
--- /dev/null
+++ b/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch
@@ -0,0 +1,85 @@
+From 7b3e78cf0348ea737609a2ace07c7c55aae36bcb Mon Sep 17 00:00:00 2001
+From: Santiago Vila <sanvila@debian.org>
+Date: Wed, 9 Oct 2024 22:05:09 -0700
+Subject: [PATCH] Remove use of variables indicating buildtime information
+We should not really care about the build date or the build host
+Sourced From: https://salsa.debian.org/debian/ndisc6/-/blob/master/debian/patches/reproducible-build.patch?ref_type=heads
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ rdnss/rdnssd.c   | 2 --
+ src/addrinfo.c   | 2 --
+ src/ndisc.c      | 2 --
+ src/tcpspray.c   | 2 --
+ src/traceroute.c | 2 --
+ 5 files changed, 10 deletions(-)
+diff --git a/rdnss/rdnssd.c b/rdnss/rdnssd.c
+index b87edb2..7201525 100644
+--- a/rdnss/rdnssd.c
+++ b/rdnss/rdnssd.c
+@@ -741,8 +741,6 @@ version (void)
+ {
+        printf (_("rdnssd: IPv6 Recursive DNS Server discovery Daemon %s (%s)\n"),
+                VERSION, "$Rev$");
+-       printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
+-       printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+        puts (_("Written by Pierre Ynard and Remi Denis-Courmont\n"));
+ 
+        printf (_("Copyright (C) %u-%u Pierre Ynard, Remi Denis-Courmont\n"),
+diff --git a/src/addrinfo.c b/src/addrinfo.c
+index cd73722..6316abd 100644
+--- a/src/addrinfo.c
+++ b/src/addrinfo.c
+@@ -148,8 +148,6 @@ static int quick_usage (const char *path)
+ static int version (void)
+ {
+         printf (_("addrinfo %s (%s)\n"), VERSION, "$Rev$");
+-       printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
+-        printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+         puts (_("Written by Remi Denis-Courmont\n"));
+ 
+         printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2002, 2007);
+diff --git a/src/ndisc.c b/src/ndisc.c
+index b190b18..6e222a0 100644
+--- a/src/ndisc.c
+++ b/src/ndisc.c
+@@ -920,9 +920,7 @@ version (void)
+ {
+        printf (_(
+ "ndisc6: IPv6 Neighbor/Router Discovery userland tool %s (%s)\n"), VERSION, "$Rev$");
+-       printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
+ 
+-       printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+        puts (_("Written by Remi Denis-Courmont\n"));
+ 
+        printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2004, 2007);
+diff --git a/src/tcpspray.c b/src/tcpspray.c
+index 39d8939..6347795 100644
+--- a/src/tcpspray.c
+++ b/src/tcpspray.c
+@@ -302,8 +302,6 @@ version (void)
+ {
+        printf (_(
+ "tcpspray6: TCP/IP bandwidth tester %s (%s)\n"), VERSION, "$Rev$");
+-       printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
+-       printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+        puts (_("Written by Remi Denis-Courmont\n"));
+ 
+        printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007);
+diff --git a/src/traceroute.c b/src/traceroute.c
+index 489bc55..604b6af 100644
+--- a/src/traceroute.c
+++ b/src/traceroute.c
+@@ -1251,8 +1251,6 @@ version (void)
+ {
+        printf (_(
+ "traceroute6: TCP & UDP IPv6 traceroute tool %s (%s)\n"), VERSION, "$Rev$");
+-       printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
+-       printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+        puts (_("Written by Remi Denis-Courmont\n"));
+ 
+        printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007);
diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
index fb00b8351..21579d64c 100644
--- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
+++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5"
 SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \
           file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \
+           file://0001-Remove-use-of-variables-indicating-buildtime-informa.patch \
           "
 S = "${WORKDIR}/git"
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb
index 217829193..d44709a64 100644
--- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb
+++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb
@@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only"
 LICENSE:modules/linux = "GPL-2.0-only"
 LICENSE:modules/solaris = "CDDL-1.0"
-SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.4.x \
+SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.5.x \
           file://tools.conf \
           file://vmtoolsd.service \
           file://vmtoolsd.init \
@@ -50,7 +50,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
 SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \
 "
-SRCREV = "9b94132f54fbed0b86dce04ff4402d1d8fd059c3"
+SRCREV = "f2ca37ef3510543172657b82493d1eceefa9a134"
 S = "${WORKDIR}/git/open-vm-tools"
diff --git a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
index 82d355101..8c4ca55fb 100644
--- a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
+++ b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
@@ -1,4 +1,4 @@
-From 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce Mon Sep 17 00:00:00 2001
+From c815368a3e41dd3f639eb8fd82d21bc0bab55d1e Mon Sep 17 00:00:00 2001
 From: Kai Kang <kai.kang@windriver.com>
 Date: Wed, 1 Nov 2017 09:23:41 -0400
 Subject: [PATCH] stunnel: fix compile error when openssl disable des support
@@ -17,10 +17,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
 2 files changed, 5 insertions(+), 3 deletions(-)
 diff --git a/src/common.h b/src/common.h
-index 2b4869f..180d31a 100644
+index f112cf9..8d4be01 100644
 --- a/src/common.h
 +++ b/src/common.h
-@@ -492,7 +492,9 @@ extern char *sys_errlist[];
+@@ -496,7 +496,9 @@ extern char *sys_errlist[];
 #ifndef OPENSSL_NO_MD4
 #include <openssl/md4.h>
 #endif /* !defined(OPENSSL_NO_MD4) */
@@ -31,19 +31,19 @@ index 2b4869f..180d31a 100644
 #include <openssl/dh.h>
 #if OPENSSL_VERSION_NUMBER<0x10100000L
 diff --git a/src/protocol.c b/src/protocol.c
-index cfe6d3b..3936aea 100644
+index c8c65ea..b071b06 100644
 --- a/src/protocol.c
 +++ b/src/protocol.c
-@@ -81,7 +81,7 @@ NOEXPORT void ldap_client_middle(CLI *);
+@@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *);
- 
 NOEXPORT void connect_server_early(CLI *);
+ NOEXPORT const char *connect_client_init(SERVICE_OPTIONS *);
 NOEXPORT void connect_client_middle(CLI *);
 -#ifndef OPENSSL_NO_MD4
 +#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
 NOEXPORT void ntlm(CLI *);
 NOEXPORT char *ntlm1(void);
 NOEXPORT char *ntlm3(char *, char *, char *, char *);
-@@ -1331,7 +1331,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
+@@ -1334,7 +1334,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
     fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host);
     if(c->opt->protocol_username && c->opt->protocol_password) {
         if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) {
@@ -52,7 +52,7 @@ index cfe6d3b..3936aea 100644
             ntlm(c);
 #else
             s_log(LOG_ERR, "NTLM authentication is not available");
-@@ -1374,7 +1374,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
+@@ -1377,7 +1377,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
     str_free(line);
 }
 
@@ -61,6 +61,3 @@ index cfe6d3b..3936aea 100644
 
 /*
  * NTLM code is based on the following documentation:
-- 
-2.34.1
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.72.bb b/meta-networking/recipes-support/stunnel/stunnel_5.73.bb
index 6d21027a1..e13b7871c 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.72.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.73.bb
@@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \
           file://fix-openssl-no-des.patch \
 "
-SRC_URI[sha256sum] = "3d532941281ae353319735144e4adb9ae489a10b7e309c58a48157f08f42e949"
+SRC_URI[sha256sum] = "bc917c3bcd943a4d632360c067977a31e85e385f5f4845f69749bce88183cb38"
 inherit autotools bash-completion pkgconfig
diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb
index 93197dc3b..3d61160bb 100644
--- a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb
+++ b/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa6
 SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \
           "
-SRC_URI[sha256sum] = "e513f0710c4ab45ec627e5df6f7b80d12e488146e1bd500c92247e20ca608903"
+SRC_URI[sha256sum] = "082967d6bf793499d3d655cea2149e07c0da97287f1877a6eab88d17cb703d0d"
 UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb b/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb
index 862cba91e..b72c37540 100644
--- a/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb
+++ b/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb
@@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/tracerou
 SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \
 "
-SRC_URI[sha256sum] = "9c6c260d96eaab51e3ce461b0a84fe87123ebc6dd6c9a59fab803f95b35a859e"
+SRC_URI[sha256sum] = "9ccef9cdb9d7a98ff7fbf93f79ebd0e48881664b525c4b232a0fcec7dcb9db5e"
 EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}"
 LTOEXTRA += "-flto-partition=none"
diff --git a/meta-networking/recipes-support/unbound/unbound_1.21.0.bb b/meta-networking/recipes-support/unbound/unbound_1.22.0.bb
index 8c042dc5f..2f0c92dd9 100644
--- a/meta-networking/recipes-support/unbound/unbound_1.21.0.bb
+++ b/meta-networking/recipes-support/unbound/unbound_1.22.0.bb
@@ -12,7 +12,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06"
 SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \
           file://run-ptest \
           "
-SRCREV = "79e4c578518886a32475cfbb0de383ff3a905033"
+# 17 commits after 1.22.0 tag:
+# https://github.com/NLnetLabs/unbound/compare/release-1.22.0...7985d17b57d25be262de56c29a43ae4b61c1b896
+# to include fix for occasional build failure:
+# https://github.com/NLnetLabs/unbound/commit/46cfbf313d812a6e50614a691e162b171dc91d7b
+PV .= "+git"
+SRCREV = "7985d17b57d25be262de56c29a43ae4b61c1b896"
 inherit autotools pkgconfig systemd update-rc.d ptest
@@ -22,7 +28,7 @@ RDEPENDS:${PN} = "bash openssl-bin daemonize"
 S = "${WORKDIR}/git"
 EXTRA_OECONF = "--with-libexpat=${STAGING_EXECPREFIXDIR} \
-                --with-ssl=${STAGING_EXECPREFIXDIR} \
+                --disable-rpath --with-ssl=${STAGING_EXECPREFIXDIR} \
                --enable-largefile"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb
index b80710683..3fa293d0c 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb
@@ -42,7 +42,7 @@ PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF"
 PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc"
 PACKAGECONFIG[libssh] = "-DENABLE_LIBSSH=ON,-DENABLE_LIBSSH=OFF, libssh2"
 PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4"
-PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd"
+PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF, zstd"
 PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2"
 # these next two options require addional layers
diff --git a/meta-oe/classes/fitimage.bbclass b/meta-oe/classes/fitimage.bbclass
new file mode 100644
index 000000000..ebd034883
--- /dev/null
+++ b/meta-oe/classes/fitimage.bbclass
@@ -0,0 +1,530 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright PHYTEC Messtechnik GmbH
+# Copyright (C) 2024 Pengutronix, <yocto@pengutronix.de>
+#
+# Class for creating (signed) FIT images
+# Description:
+#
+# You have to define the 'images' to put in the FIT image in your recipe file
+# following this example:
+#
+#    FITIMAGE_IMAGES ?= "kernel fdt fdto setup ramdisk bootscript"
+#
+#    FITIMAGE_IMAGE_kernel ?= "virtual/kernel"
+#    FITIMAGE_IMAGE_kernel[type] ?= "kernel"
+#
+#    FITIMAGE_IMAGE_fdt ?= "virtual/dtb" # or "virtual/kernel"
+#    FITIMAGE_IMAGE_fdt[type] ?= "fdt"
+#    #FITIMAGE_IMAGE_fdt[file] ?= "hw-name.dtb"
+#
+#    FITIMAGE_IMAGE_fdto ?= "virtual/kernel"
+#    FITIMAGE_IMAGE_fdto[type] ?= "fdto"
+#    FITIMAGE_IMAGE_fdto[file] ?= <list of all dtbo files from KERNEL_DEVICETREE>
+#
+#    Add a devicetree created on-thy-fly of a base dtb and serveral dtbo's
+#    FITIMAGE_IMAGE_fdtapply ?= "virtual/kernel"
+#    FITIMAGE_IMAGE_fdtapply[type] ?= "fdtapply"
+#    FITIMAGE_IMAGE_fdtapply[file] ?= "base.dtb overlay-1.dtbo overlay-2.dtbo"
+#    FITIMAGE_IMAGE_fdtapply[name] ?= "<name for new generated fdt>"
+#
+#    FITIMAGE_IMAGE_ramdisk ?= "core-image-minimal"
+#    FITIMAGE_IMAGE_ramdisk[type] ?= "ramdisk"
+#    FITIMAGE_IMAGE_ramdisk[fstype] ?= "cpio.gz"
+#
+#    FITIMAGE_IMAGE_bootscript ?= "bootscript"
+#    FITIMAGE_IMAGE_bootscript[type] ?= "bootscript"
+#    FITIMAGE_IMAGE_bootscript[file] ?= "boot.scr"
+#
+# Valid options for the [type] varflag are: "kernel", "fdt", "fdto", "fdtapply", "ramdisk", "bootscript".
+#
+# To enable signing, set
+#
+#    FITIMAGE_SIGN = "1"
+#
+# and configure FITIMAGE_SIGN_KEYDIR (and FITIMAGE_SIGN_KEYNAME) according to
+# your needs.
+#
+# For signing via PKCS#11 URIs provided by the meta-oe signing.bbclass, add:
+#
+#    inherit signing
+#
+#    FITIMAGE_SIGNING_KEY_ROLE = "fit"
+#
+#    do_fitimage:prepend() {
+#        signing_prepare
+#        signing_use_role "${FITIMAGE_SIGNING_KEY_ROLE}"
+#    }
+#
+#    FITIMAGE_SIGN = "1"
+#    FITIMAGE_MKIMAGE_EXTRA_ARGS = "--engine pkcs11"
+#    FITIMAGE_SIGN_KEYDIR = "${PKCS11_URI}"
+LICENSE ?= "MIT"
+inherit deploy kernel-artifact-names image-artifact-names kernel-arch nopackages
+do_patch[noexec] = "1"
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+deltask do_populate_sysroot
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "u-boot-mkimage-native dtc-native"
+FITIMAGE_SIGN ?= "0"
+FITIMAGE_SIGN[doc] = "Enable FIT image signing"
+FITIMAGE_SIGN_KEYDIR ?= ""
+FITIMAGE_SIGN_KEYDIR[doc] = "Key directory or pkcs#11 URI to use for signing configuration"
+FITIMAGE_MKIMAGE_EXTRA_ARGS[doc] = "Extra arguemnts to pass to uboot-mkimage call"
+FITIMAGE_HASH_ALGO ?= "sha256"
+FITIMAGE_HASH_ALGO[doc] = "Hash algorithm to use"
+FITIMAGE_ENCRYPT_ALGO ?= "rsa2048"
+FITIMAGE_ENCRYPT_ALGO[doc] = "Signature algorithm to use"
+FITIMAGE_CONFIG_PREFIX ?= "conf-"
+FITIMAGE_CONFIG_PREFIX[doc] = "Prefix to use for FIT configuration node name"
+FITIMAGE_LOADADDRESS ??= ""
+FITIMAGE_ENTRYPOINT  ??= ""
+FITIMAGE_DTB_LOADADDRESS ??= ""
+FITIMAGE_DTB_OVERLAY_LOADADDRESS ??= ""
+FITIMAGE_RD_LOADADDRESS ??= ""
+FITIMAGE_RD_ENTRYPOINT ??= ""
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+# Create dependency list from images
+python __anonymous() {
+    for image in (d.getVar('FITIMAGE_IMAGES') or "").split():
+        imageflags = d.getVarFlags('FITIMAGE_IMAGE_%s' % image, expand=['type', 'depends']) or {}
+        imgtype = imageflags.get('type')
+        if not imgtype:
+            bb.debug(1, "No [type] given for image '%s', defaulting to 'kernel'" % image)
+            imgtype = 'kernel'
+        recipe = d.getVar('FITIMAGE_IMAGE_%s' % image)
+        if not recipe:
+            bb.error("No recipe set for image '%s'. Specify via 'FITIMAGE_IMAGE_%s = \"<recipe-name>\"'" % (recipe, image))
+            return
+        d.appendVarFlag('do_unpack', 'vardeps', ' FITIMAGE_IMAGE_%s' % image)
+        depends = imageflags.get('depends')
+        if depends:
+            d.appendVarFlag('do_unpack', 'depends', ' ' + depends)
+            continue
+        if imgtype == 'ramdisk':
+            d.appendVarFlag('do_unpack', 'depends', ' ' + recipe + ':do_image_complete')
+        elif 'fdt' in imgtype:
+            d.appendVarFlag('do_unpack', 'depends', ' ' + recipe + ':do_populate_sysroot')
+            d.appendVarFlag('do_unpack', 'depends', ' ' + recipe + ':do_deploy')
+        else:
+            d.appendVarFlag('do_unpack', 'depends', ' ' + recipe + ':do_deploy')
+        if 'fdt' in imgtype and d.getVar('PREFERRED_PROVIDER_virtual/dtb'):
+            d.setVar('EXTERNAL_KERNEL_DEVICETREE', '${RECIPE_SYSROOT}/boot/devicetree')
+}
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+B = "${WORKDIR}/build"
+#
+# Emit the fitImage ITS header
+#
+def fitimage_emit_fit_header(d, fd):
+    fd.write('/dts-v1/;\n\n/ {\n')
+    fd.write(d.expand('\tdescription = "fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}";\n'))
+    fd.write('\t#address-cells = <1>;\n')
+#
+# Emit the fitImage ITS footer
+#
+def fitimage_emit_fit_footer(d, fd):
+    fd.write('};\n')
+#
+# Emit the fitImage section
+#
+def fitimage_emit_section_start(d, fd, section):
+    fd.write(f'\t{section} {{\n')
+#
+# Emit the fitImage section end
+#
+def fitimage_emit_section_end(d, fd):
+    fd.write('\t};\n')
+def fitimage_emit_section_kernel(d, fd, imgpath, imgsource, imgcomp):
+    kernelcount = 1
+    kernel_csum = d.getVar("FITIMAGE_HASH_ALGO")
+    arch = d.getVar("ARCH")
+    loadaddr = d.getVar("FITIMAGE_LOADADDRESS")
+    entryaddr = d.getVar("FITIMAGE_ENTRYPOINT")
+    bb.note(f"Adding kernel-{kernelcount} section to ITS file")
+    fd.write(f'\t\tkernel-{kernelcount} {{\n')
+    fd.write('\t\t\tdescription = "Linux kernel";\n')
+    fd.write(f'\t\t\tdata = /incbin/("{imgpath}/{imgsource}");\n')
+    fd.write('\t\t\ttype = "kernel";\n')
+    fd.write(f'\t\t\tarch = "{arch}";\n')
+    fd.write('\t\t\tos = "linux";\n')
+    fd.write(f'\t\t\tcompression = "{imgcomp}";\n')
+    if (loadaddr):
+        fd.write(f'\t\t\tload = <{loadaddr}>;\n')
+    if (entryaddr):
+        fd.write(f'\t\t\tentry = <{entryaddr}>;\n')
+    fd.write('\t\t\thash-1 {\n')
+    fd.write(f'\t\t\t\talgo = "{kernel_csum}";\n')
+    fd.write('\t\t\t};\n')
+    fd.write('\t\t};\n')
+#
+# Emit the fitImage ITS DTB section
+#
+def _fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path, loadaddr, desc):
+    dtb_csum = d.getVar("FITIMAGE_HASH_ALGO")
+    arch = d.getVar("ARCH")
+    bb.note(f"Adding fdt-{dtb_file} section to ITS file")
+    fd.write(f'\t\tfdt-{dtb_file} {{\n')
+    fd.write(f'\t\t\tdescription = "{desc}";\n')
+    fd.write(f'\t\t\tdata = /incbin/("{dtb_path}/{dtb_file}");\n')
+    fd.write('\t\t\ttype = "flat_dt";\n')
+    fd.write(f'\t\t\tarch = "{arch}";\n')
+    fd.write('\t\t\tcompression = "none";\n')
+    if loadaddr:
+        fd.write(f'\t\t\tload = <{loadaddr}>;\n')
+    fd.write('\t\t\thash-1 {\n')
+    fd.write(f'\t\t\t\talgo = "{dtb_csum}";\n')
+    fd.write('\t\t\t};\n')
+    fd.write('\t\t};\n')
+def fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path):
+    loadaddr = d.getVar("FITIMAGE_DTB_LOADADDRESS")
+    _fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path, loadaddr, "Flattened Device Tree blob")
+#
+# Emit the fitImage ITS DTB overlay section
+#
+def fitimage_emit_section_dtb_overlay(d, fd, dtb_file, dtb_path):
+    loadaddr = d.getVar("FITIMAGE_DTB_OVERLAY_LOADADDRESS")
+    _fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path, loadaddr, "Flattened Device Tree Overlay blob")
+#
+# Emit the fitImage ITS ramdisk section
+#
+def fitimage_emit_section_ramdisk(d, fd, img_file, img_path):
+    ramdisk_count = "1"
+    ramdisk_csum = d.getVar("FITIMAGE_HASH_ALGO")
+    arch = d.getVar("ARCH")
+    loadaddr = d.getVar("FITIMAGE_RD_LOADADDRESS")
+    entryaddr = d.getVar("FITIMAGE_RD_ENTRYPOINT")
+    bb.note(f"Adding ramdisk-{ramdisk_count} section to ITS file")
+    fd.write(f'\t\tramdisk-{ramdisk_count} {{\n')
+    fd.write(f'\t\t\tdescription = "{img_file}";\n')
+    fd.write(f'\t\t\tdata = /incbin/("{img_path}/{img_file}");\n')
+    fd.write('\t\t\ttype = "ramdisk";\n')
+    fd.write(f'\t\t\tarch = "{arch}";\n')
+    fd.write('\t\t\tos = "linux";\n')
+    fd.write('\t\t\tcompression = "none";\n')
+    if (loadaddr):
+        fd.write(f'\t\t\tload = <{loadaddr}>;\n')
+    if (entryaddr):
+        fd.write(f'\t\t\tentry = <{entryaddr}>;\n')
+    fd.write('\t\t\thash-1 {\n')
+    fd.write(f'\t\t\t\talgo = "{ramdisk_csum}";\n')
+    fd.write('\t\t\t};\n')
+    fd.write('\t\t};\n')
+def fitimage_emit_section_bootscript(d, fd, imgpath, imgsource):
+    hash_algo = d.getVar("FITIMAGE_HASH_ALGO")
+    arch = d.getVar("ARCH")
+    bb.note(f"Adding bootscr-{imgsource} section to ITS file")
+    fd.write(f'\t\tbootscr-{imgsource} {{\n')
+    fd.write('\t\t\tdescription = "U-boot script";\n')
+    fd.write(f'\t\t\tdata = /incbin/("{imgpath}/{imgsource}");\n')
+    fd.write('\t\t\ttype = "script";\n')
+    fd.write(f'\t\t\tarch = "{arch}";\n')
+    fd.write('\t\t\tos = "linux";\n')
+    fd.write('\t\t\tcompression = "none";\n')
+    fd.write('\t\t\thash-1 {\n')
+    fd.write(f'\t\t\t\talgo = "{hash_algo}";\n')
+    fd.write('\t\t\t};\n')
+    fd.write('\t\t};\n')
+def fitimage_emit_subsection_signature(d, fd, sign_images_list):
+    hash_algo = d.getVar("FITIMAGE_HASH_ALGO")
+    encrypt_algo = d.getVar("FITIMAGE_ENCRYPT_ALGO") or ""
+    conf_sign_keyname = d.getVar("FITIMAGE_SIGN_KEYNAME")
+    signer_name = d.getVar("FITIMAGE_SIGNER")
+    signer_version = d.getVar("FITIMAGE_SIGNER_VERSION")
+    sign_images = ", ".join(f'"{s}"' for s in sign_images_list)
+    fd.write('\t\t\tsignature-1 {\n')
+    fd.write(f'\t\t\t\talgo = "{hash_algo},{encrypt_algo}";\n')
+    if conf_sign_keyname:
+        fd.write(f'\t\t\t\tkey-name-hint = {conf_sign_keyname}";\n')
+    fd.write(f'\t\t\t\tsign-images = {sign_images};\n')
+    fd.write(f'\t\t\t\tsigner-name = "{signer_name}";\n')
+    fd.write(f'\t\t\t\tsigner-version = "{signer_version}";\n')
+    fd.write('\t\t\t};\n')
+#
+# Emit the fitImage ITS configuration section
+#
+def fitimage_emit_section_config(d, fd, dtb, kernelcount, ramdiskcount, setupcount, bootscriptid, compatible, dtbcount):
+    sign = d.getVar("FITIMAGE_SIGN")
+    conf_default = None
+    conf_prefix = d.getVar('FITIMAGE_CONFIG_PREFIX', True) or ""
+    bb.note(f"Adding {dtb} section to ITS file")
+    conf_desc="Linux kernel"
+    if dtb:
+        conf_desc += ", FDT blob"
+    if ramdiskcount:
+         conf_desc += ", ramdisk"
+    if setupcount:
+         conf_desc += ", setup"
+    if bootscriptid:
+         conf_desc += ", u-boot script"
+    if dtbcount == 1:
+        conf_default = d.getVar('FITIMAGE_DEFAULT_CONFIG', True) or f'{conf_prefix}{dtb}'
+    if conf_default:
+        fd.write(f'\t\tdefault = "{conf_default}";\n')
+    fd.write(f'\t\t{conf_prefix}{dtb} {{\n')
+    fd.write(f'\t\t\tdescription = "{dtbcount} {conf_desc}";\n')
+    if kernelcount:
+        fd.write('\t\t\tkernel = "kernel-1";\n')
+    fd.write(f'\t\t\tfdt = "fdt-{dtb}";\n')
+    if ramdiskcount:
+        fd.write(f'\t\t\tramdisk = "ramdisk-{ramdiskcount}";\n')
+    if bootscriptid:
+        fd.write(f'\t\t\tbootscr = "bootscr-{bootscriptid}";\n')
+    if compatible:
+        fd.write(f'\t\t\tcompatible = "{compatible}";\n')
+    if sign == "1":
+        sign_images = ["kernel"]
+        if dtb:
+            sign_images.append("fdt")
+        if ramdiskcount:
+            sign_images.append("ramdisk")
+        if setupcount:
+            sign_images.append("setup")
+        if bootscriptid:
+            sign_images.append("bootscr")
+        fitimage_emit_subsection_signature(d, fd, sign_images)
+    fd.write('\t\t'  + '};\n')
+#
+# Emits a device tree overlay config section
+#
+def fitimage_emit_section_config_fdto(d, fd, dtb, compatible):
+    sign = d.getVar("FITIMAGE_SIGN")
+    bb.note("Adding overlay config section to ITS file")
+    fd.write(f'\t\t{dtb} {{\n')
+    fd.write(f'\t\t\tdescription = "Device Tree Overlay";\n')
+    fd.write(f'\t\t\tfdt = "fdt-{dtb}";')
+    if compatible:
+       fd.write(f'\t\t\tcompatible = "{compatible}";')
+    if sign == "1":
+        sign_images = ["fdt"]
+        fitimage_emit_subsection_signature(d, fd, sign_images)
+    fd.write('\t\t'  + '};\n')
+python write_manifest() {
+    machine = d.getVar('MACHINE')
+    kernelcount=1
+    DTBS = ""
+    DTBOS = ""
+    ramdiskcount = ""
+    setupcount = ""
+    bootscriptid = ""
+    compatible = ""
+    def get_dtbs(d, dtb_suffix):
+        sysroot = d.getVar('RECIPE_SYSROOT')
+        deploydir = d.getVar('DEPLOY_DIR_IMAGE')
+        dtbs = (d.getVar('KERNEL_DEVICETREE') or '').split()
+        dtbs = [os.path.basename(x) for x in dtbs if x.endswith(dtb_suffix)]
+        ext_dtbs = os.listdir(d.getVar('EXTERNAL_KERNEL_DEVICETREE')) if d.getVar('EXTERNAL_KERNEL_DEVICETREE') else []
+        ext_dtbs = [x for x in ext_dtbs if x.endswith(dtb_suffix)]
+        result = []
+        # Prefer BSP dts if BSP and kernel provide the same dts
+        for d in sorted(set(dtbs + ext_dtbs)):
+            dtbpath = f'{sysroot}/boot/devicetree/{d}' if d in ext_dtbs else f'{deploydir}/{d}'
+            result.append(dtbpath)
+        return " ".join(result)
+    with open('%s/manifest.its' % d.getVar('B'), 'w') as fd:
+        images = d.getVar('FITIMAGE_IMAGES')
+        if not images:
+            bb.warn("No images specified in FITIMAGE_IMAGES. Generated FIT image will be empty")
+        fitimage_emit_fit_header(d, fd)
+        fitimage_emit_section_start(d, fd, 'images')
+        for image in (images or "").split():
+            imageflags = d.getVarFlags('FITIMAGE_IMAGE_%s' % image, expand=['file', 'fstype', 'type', 'comp']) or {}
+            imgtype = imageflags.get('type', '')
+            if imgtype == 'kernel':
+                default = "%s-%s%s" % (d.getVar('KERNEL_IMAGETYPE'), machine, d.getVar('KERNEL_IMAGE_BIN_EXT'))
+                imgsource = imageflags.get('file', default)
+                imgcomp = imageflags.get('comp', 'none')
+                imgpath = d.getVar("DEPLOY_DIR_IMAGE")
+                fitimage_emit_section_kernel(d, fd, imgpath, imgsource, imgcomp)
+            elif imgtype == 'fdt':
+                default = get_dtbs(d, "dtb")
+                dtbfiles = imageflags.get('file', default)
+                if not dtbfiles:
+                    bb.fatal(f"No dtb file found for image '{image}'. Set KERNEL_DEVICETREE, [file] varflag, or reference devicetree.bbclass-based recipe.")
+                for dtb in dtbfiles.split():
+                    dtb_path, dtb_file = os.path.split(dtb)
+                    DTBS += f" {dtb}"
+                    fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path)
+            elif imgtype == 'fdto':
+                default = get_dtbs(d, "dtbo")
+                dtbofiles = imageflags.get('file', default)
+                if not dtbofiles:
+                    bb.fatal(f"No dtbo file found for image '{image}'. Set KERNEL_DEVICETREE, [file] varflag, or reference devicetree.bbclass-based recipe.")
+                for dtb in dtbofiles.split():
+                    dtb_path, dtb_file = os.path.split(dtb)
+                    DTBOS = DTBOS + " " + dtb
+                    fitimage_emit_section_dtb_overlay(d, fd, dtb_file, dtb_path)
+            elif imgtype == 'fdtapply':
+                import subprocess
+                dtbofiles = imageflags.get('file', None)
+                if not dtbofiles:
+                    bb.fatal(f"No dtbo file found for image '{image}'. Set via [file] varflag.")
+                dtboutname = imageflags.get('name', None)
+                if not dtboutname:
+                    bb.fatal(f"No dtb output name found for image '{image}'. Set via [name] varflag.")
+                dtbresult = "%s/%s" % (d.getVar('B'), dtboutname)
+                dtbcommand = ""
+                for dtb in dtbofiles.split():
+                    dtb_path, dtb_file = os.path.split(dtb)
+                    if not dtb_path:
+                        dtb_path = d.getVar("DEPLOY_DIR_IMAGE")
+                    if not dtbcommand:
+                        if not dtb_file.endswith('.dtb'):
+                            bb.fatal(f"fdtapply failed: Expected (non-overlay) .dtb file as first element, but got {dtb_file}")
+                        dtbcommand = f"fdtoverlay -i {dtb_path}/{dtb_file} -o {dtbresult}"
+                    else:
+                        if not dtb_file.endswith('.dtbo'):
+                            bb.fatal(f"fdtapply failed: Expected .dtbo file, but got {dtb_file}")
+                        dtbcommand += f" {dtb_path}/{dtb_file}"
+                result = subprocess.run(dtbcommand, stderr=subprocess.PIPE, shell=True, text=True)
+                if result.returncode != 0:
+                    bb.fatal(f"Running {dtbcommand} failed: {result.stderr}")
+                dtb_path, dtb_file = os.path.split(dtbresult)
+                DTBS += f" {dtbresult}"
+                fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path)
+            elif imgtype == 'ramdisk':
+                ramdiskcount = "1"
+                default_imgfstype = d.getVar('INITRAMFS_FSTYPES' or "").split()[0]
+                img_fstype = imageflags.get('fstype', default_imgfstype)
+                img_file = "%s%s.%s" % (d.getVar('FITIMAGE_IMAGE_%s' % image), d.getVar('IMAGE_MACHINE_SUFFIX'), img_fstype)
+                img_path = d.getVar("DEPLOY_DIR_IMAGE")
+                fitimage_emit_section_ramdisk(d, fd, img_file, img_path)
+            elif imgtype == 'bootscript':
+                if bootscriptid:
+                    bb.fatal("Only a single boot script is supported (already set to: %s)" % bootscriptid)
+                imgsource = imageflags.get('file', None)
+                imgpath = d.getVar("DEPLOY_DIR_IMAGE")
+                bootscriptid = imgsource
+                fitimage_emit_section_bootscript(d, fd, imgpath, imgsource)
+        fitimage_emit_section_end(d, fd)
+        #
+        # Step 5: Prepare a configurations section
+        #
+        fitimage_emit_section_start(d, fd, 'configurations')
+        dtbcount = 1
+        for dtb in (DTBS or "").split():
+            import subprocess
+            try:
+                cmd = "fdtget -t s {} / compatible".format(dtb)
+                compatible = subprocess.check_output(cmd, shell=True, text=True).split()[0]
+            except subprocess.CalledProcessError:
+                bb.fatal("Failed to find root-node compatible string in (%s)" % dtb)
+            dtb_path, dtb_file = os.path.split(dtb)
+            fitimage_emit_section_config(d, fd, dtb_file, kernelcount, ramdiskcount, setupcount, bootscriptid, compatible, dtbcount)
+            dtbcount += 1
+        for dtb in (DTBOS or "").split():
+            import subprocess
+            try:
+                cmd = "fdtget -t s {} / compatible".format(dtb)
+                compatible = subprocess.check_output(cmd, shell=True, text=True).split()[0]
+            except subprocess.CalledProcessError:
+                bb.note("Failed to find root-node compatible string in (%s)" % dtb)
+                compatible = None
+            dtb_path, dtb_file = os.path.split(dtb)
+            fitimage_emit_section_config_fdto(d, fd, dtb_file, compatible)
+        fitimage_emit_section_end(d, fd)
+        fitimage_emit_fit_footer(d, fd)
+}
+do_configure[postfuncs] += "write_manifest"
+do_fitimage () {
+    if [ "${FITIMAGE_SIGN}" = "1" ]; then
+        uboot-mkimage ${FITIMAGE_MKIMAGE_EXTRA_ARGS} \
+            -k ${FITIMAGE_SIGN_KEYDIR} -r \
+            -f "${B}/manifest.its" \
+            "${B}/fitImage"
+    else
+        uboot-mkimage ${FITIMAGE_MKIMAGE_EXTRA_ARGS} \
+            -f "${B}/manifest.its" \
+            "${B}/fitImage"
+    fi
+}
+addtask fitimage after do_configure
+ITS_NAME ?= "${PN}-${KERNEL_ARTIFACT_NAME}"
+ITS_LINK_NAME ?= "${PN}-${KERNEL_ARTIFACT_LINK_NAME}"
+FITIMAGE_IMAGE_NAME ?= "fitImage-${PN}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}"
+FITIMAGE_IMAGE_LINK_NAME ?= "fitImage-${PN}-${KERNEL_FIT_LINK_NAME}"
+SSTATE_SKIP_CREATION:task-deploy = '1'
+do_deploy() {
+    bbnote 'Copying fit-image.its source file...'
+    install -m 0644 ${B}/manifest.its ${DEPLOYDIR}/${ITS_NAME}.its
+    bbnote 'Copying all created fdt from type fdtapply'
+    for DTB_FILE in `find ${B} -maxdepth 1 -name *.dtb`; do
+        install -m 0644 ${DTB_FILE} ${DEPLOYDIR}/
+    done
+    bbnote 'Copying fitImage file...'
+    install -m 0644 ${B}/fitImage ${DEPLOYDIR}/${FITIMAGE_IMAGE_NAME}
+    cd ${DEPLOYDIR}
+    ln -sf ${ITS_NAME}.its ${ITS_LINK_NAME}.its
+    ln -sf ${FITIMAGE_IMAGE_NAME} ${FITIMAGE_IMAGE_LINK_NAME}
+}
+addtask deploy after do_fitimage before do_build
diff --git a/meta-oe/classes/panel-mipi-dbi.bbclass b/meta-oe/classes/panel-mipi-dbi.bbclass
new file mode 100644
index 000000000..7ceebc72e
--- /dev/null
+++ b/meta-oe/classes/panel-mipi-dbi.bbclass
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright Pengutronix <yocto@pengutronix.de>
+#
+# Class to generate firmware files for use with the `panel-mipi-dbi` Linux
+# driver.
+#
+# The firmware source file contains a list of commands to send to the display
+# controller in order to initialize it:
+#
+#   $ cat shineworld,lh133k.txt
+#   command 0x11 # exit sleep mode
+#   delay 120
+#
+#   # Enable color inversion
+#   command 0x21 # INVON
+#   ...
+#
+# A recipe to compile such a command list into a firmware blob for use with
+# the `panel-mipi-dbi` driver looks something like this:
+#
+#   $ cat panel-shineworld-lh133k.bb
+#   inherit panel-mipi-dbi
+#
+#   SRC_URI = "file://${PANEL_FIRMWARE}"
+#
+#   PANEL_FIRMWARE = "shineworld,lh133k.txt"
+#   ...
+DEPENDS = "panel-mipi-dbi-native"
+PANEL_FIRMWARE_BIN ?= "${@d.getVar('PANEL_FIRMWARE').removesuffix('.txt')}.bin"
+do_configure[noexec] = "1"
+do_compile () {
+    mipi-dbi-cmd \
+        "${B}/${PANEL_FIRMWARE_BIN}" \
+        "${UNPACKDIR}/${PANEL_FIRMWARE}"
+}
+do_install () {
+    install -m 0644 -D \
+        "${B}/${PANEL_FIRMWARE_BIN}" \
+        "${D}${nonarch_base_libdir}/firmware/${PANEL_FIRMWARE_BIN}"
+}
+FILES:${PN} = "${nonarch_base_libdir}/firmware/"
diff --git a/meta-oe/classes/signing.bbclass b/meta-oe/classes/signing.bbclass
index f52d861b7..8af7bbf8e 100644
--- a/meta-oe/classes/signing.bbclass
+++ b/meta-oe/classes/signing.bbclass
@@ -92,6 +92,11 @@ signing_pkcs11_tool() {
 }
 signing_import_prepare() {
+    # the $PN is used as 'label' in the softhsm, which is a "CK_UTF8CHAR
+    # paddedLabel[32]" in softhsm2-util.cpp, so it must not be longer.
+    LEN=$(echo -n ${PN} | wc -c)
+    test $LEN -le 32 || bbfatal "PN must not have a length greater than 32 chars."
    export _SIGNING_ENV_FILE_="${B}/meta-signing.env"
    rm -f "$_SIGNING_ENV_FILE_"
@@ -129,6 +134,36 @@ signing_import_cert_from_der() {
    signing_pkcs11_tool --type cert --write-object "${der}" --label "${role}"
 }
+# signing_import_cert_chain_from_pem <role> <pem>
+#
+# Import a certificate *chain* from a PEM file to a role.
+# (e.g. multiple ones concatenated in one file)
+#
+# Due to limitations in the toolchain:
+#   signing class -> softhsm -> 'extract-cert'
+# the input certificate is split into a sequentially numbered list of roles,
+# starting at <role>_1
+#
+# (The limitations are the conversion step from x509 to a plain .der, and
+# extract-cert expecting a x509 and then producing only plain .der again)
+signing_import_cert_chain_from_pem() {
+    local role="${1}"
+    local pem="${2}"
+    local i=1
+    cat "${pem}" | \
+        while openssl x509 -inform pem -outform der -out ${B}/temp_${i}.der; do
+            signing_import_define_role "${role}_${i}"
+            signing_pkcs11_tool --type cert \
+                                --write-object  ${B}/temp_${i}.der \
+                                --label "${role}_${i}"
+            rm ${B}/temp_${i}.der
+            echo "imported ${pem} under role: ${role}_${i}"
+            i=$(awk "BEGIN {print $i+1}")
+        done
+}
 # signing_import_cert_from_pem <role> <pem>
 #
 # Import a certificate from PEM file to a role. To be used
diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
index 0ea43f597..7cb15b49c 100644
--- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
+++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
@@ -7,9 +7,11 @@
 #
 # ptests which take less than ~30s each
 PTESTS_FAST_META_OE = "\
+    asio \
    cmocka \
    cunit \
    duktape \
+    fuse3 \
    function2 \
    fwupd \
    gcab \
@@ -23,6 +25,7 @@ PTESTS_FAST_META_OE = "\
    librelp \
    libssh \
    libtinyxml2 \
+    libtoml11 \
    libxml++-5.0 \
    libyang \
    lmdb \
@@ -36,8 +39,8 @@ PTESTS_FAST_META_OE = "\
    pegtl \
    protobuf \
    pv \
-    python3-pefile \
    sdbus-c++ \
+    tomlplusplus \
    uthash \
    xmlsec1 \
    zeromq \
@@ -55,6 +58,7 @@ PTESTS_SLOW_META_OE = "\
    fftw \
    libusb-compat \
    rsyslog \
+    rocksdb \
    mariadb \
    poco \
    re2 \
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index a254990ec..d05f26588 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -44,7 +44,7 @@ LAYERVERSION_openembedded-layer = "1"
 LAYERDEPENDS_openembedded-layer = "core"
-LAYERSERIES_COMPAT_openembedded-layer = "styhead"
+LAYERSERIES_COMPAT_openembedded-layer = "styhead walnascar"
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.1.bb
index 40d72caa0..96a3cdbfd 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.1.bb
@@ -14,13 +14,13 @@ inherit meson pkgconfig systemd python3targetconfig features_check
 REQUIRED_DISTRO_FEATURES = "systemd"
-SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \
+SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=stable/1.1;protocol=https \
           file://0001-meson.build-do-not-use-Werror.patch \
          "
 SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch"
-SRCREV = "d27f32305f7f06de449b32239a89969e6ff2be31"
+SRCREV = "731d3c9e7e88d3f27ed6cf77edba7a2f5890a778"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.bb
index c86750f8b..c86750f8b 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.bb
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.bb
index e43931a4e..e43931a4e 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.bb
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc
index 87dbc73e6..7c2e553c7 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc
+++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc
@@ -3,7 +3,7 @@ LICENSE="Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f"
 SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https"
-SRCREV = "6cfe48d6f1593f8fa5c0f90437f5e6522587745e"
+SRCREV = "98bf4db69897b53434f3d0ba72e0a3ab1a902824"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.36.bb b/meta-oe/recipes-benchmark/fio/fio_3.38.bb
index a871ed8fe..1d1db92f4 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.36.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.38.bb
@@ -22,10 +22,11 @@ PACKAGECONFIG_NUMA:armeb = ""
 PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
 PACKAGECONFIG[numa] = ",--disable-numa,numactl"
-PV .= "+git"
+SRCREV = "5af800ca20ea18193d2262a8191ae32e14d623f8"
-SRCREV = "b2403d413ee734e8835539319d8bc3429a0777ac"
 SRC_URI = "git://git.kernel.dk/fio.git;branch=master"
+UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)"
 S = "${WORKDIR}/git"
 # avoids build breaks when using no-static-libs.inc
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
deleted file mode 100644
index 0787ef27d..000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 0a163f60b4a316c4b6f1726a71c84755f3bd85e7 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@lge.com>
-Date: Wed, 16 Sep 2020 04:36:04 -0700
-Subject: [PATCH] Revert "ld.hugetlbfs: fix -Ttext-segment argument on AArch64"
-This reverts commit 852dcc963ce44861ed7c4e225aa92ff2b5b43579.
-* works around
-  ERROR: libhugetlbfs-1_2.23-r0 do_populate_sysroot: Fatal errors occurred in subprocesses:
-  Command '['arm-oe-linux-gnueabi-strip', '--remove-section=.comment', '--remove-section=.note', 'libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw']' returned non-zero exit status 1.
-  Subprocess output:arm-oe-linux-gnueabi-strip:
-  libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58: error: PHDR segment not covered by LOAD segment
-  arm-oe-linux-gnueabi-strip: libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58[.interp]: file format not recognized
-I don't see anything suspicious in the build (the same cmdline as in 2.22
-version), but it uses
-libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security -Werror=return-type
--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot
-I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c
-libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security -Werror=return-type
--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot
-B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl
-lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o
-obj32/testutils.o
-libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security -Werror=return-type
--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot
-I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c
-libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
-Werror=format-security -Werror=return-type
--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot
-B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
-ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl
-lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o
-obj32/testutils.o
-And the git log between 2.22 and 2.23 is also very short and looks
-reasonable.
-https://github.com/libhugetlbfs/libhugetlbfs/compare/2.22...2.23
-When checking with readelf -l it also shows the error about PHDR segment:
-arm-oe-linux-gnueabi-readelf -l
-./1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw
-Elf file type is DYN (Shared object file)
-Entry point 0x201105
-There are 10 program headers, starting at offset 52
-Program Headers:
-  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  PHDR           0x000034 0x00200034 0x00200034 0x00140 0x00140 R   0x4
-  INTERP         0x000174 0x00200174 0x00200174 0x0001d 0x0001d R   0x1
-      [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
-  LOAD           0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000
-  LOAD           0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW  0x200000
-  DYNAMIC        0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW  0x4
-  NOTE           0x000194 0x00200194 0x00200194 0x00044 0x00044 R   0x4
-  GNU_EH_FRAME   0x012224 0x00212224 0x00212224 0x00008 0x00008 R   0x4
-  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
-  EXIDX          0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R   0x4
-  GNU_RELRO      0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW  0x4
- Section to Segment mapping:
-  Segment Sections...
-   00
-   01     .interp
-   02     .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr
-.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text
-.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr
-   03     .fini_array .init_array .dynamic .got .data .bss
-   04     .dynamic
-   05     .note.ABI-tag .note.gnu.build-id
-   06     .eh_frame_hdr
-   07
-   08     .ARM.extab .ARM.exidx
-   09     .fini_array .init_array .dynamic .got
-arm-oe-linux-gnueabi-readelf -l
-./1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw
-Elf file type is DYN (Shared object file)
-Entry point 0x31cd1
-There are 10 program headers, starting at offset 52
-Program Headers:
-  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  PHDR           0x000000 0x00000000 0x00000000 0x00000 0x00000 R   0
-readelf: Error: the PHDR segment is not covered by a LOAD segment
-  INTERP         0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R   0x1
-      [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
-  LOAD           0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000
-  LOAD           0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW  0x200000
-  DYNAMIC        0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW  0x4
-  NOTE           0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R   0x4
-  GNU_EH_FRAME   0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R   0x4
-  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
-  EXIDX          0x032828 0x00032828 0x00032828 0x00008 0x00008 R   0x4
-  GNU_RELRO      0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW  0x4
- Section to Segment mapping:
-  Segment Sections...
-   00
-   01     .interp
-   02     .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr
-.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text
-.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr
-   03     .fini_array .init_array .dynamic .got .data .bss
-   04     .dynamic
-   05     .note.ABI-tag .note.gnu.build-id
-   06     .eh_frame_hdr
-   07
-   08     .ARM.extab .ARM.exidx
-   09     .fini_array .init_array .dynamic .got
-And the diff between these 2:
-1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf
-1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf
- Elf file type is DYN (Shared object file)
-Entry point 0x201105
-+Entry point 0x31cd1
- There are 10 program headers, starting at offset 52
- Program Headers:
-   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  PHDR           0x000034 0x00200034 0x00200034 0x00140 0x00140 R   0x4
-  INTERP         0x000174 0x00200174 0x00200174 0x0001d 0x0001d R   0x1
-+  PHDR           0x000000 0x00000000 0x00000000 0x00000 0x00000 R   0
-+readelf: Error: the PHDR segment is not covered by a LOAD segment
-+  INTERP         0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R   0x1
-       [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
-  LOAD           0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000
-  LOAD           0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW  0x200000
-  DYNAMIC        0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW  0x4
-  NOTE           0x000194 0x00200194 0x00200194 0x00044 0x00044 R   0x4
-  GNU_EH_FRAME   0x012224 0x00212224 0x00212224 0x00008 0x00008 R   0x4
-+  LOAD           0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000
-+  LOAD           0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW  0x200000
-+  DYNAMIC        0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW  0x4
-+  NOTE           0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R   0x4
-+  GNU_EH_FRAME   0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R   0x4
-   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
-  EXIDX          0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R   0x4
-  GNU_RELRO      0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW  0x4
-+  EXIDX          0x032828 0x00032828 0x00032828 0x00008 0x00008 R   0x4
-+  GNU_RELRO      0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW  0x4
-  Section to Segment mapping:
-Revert fixes this build issue, but I still don't see why it fails this way.
-Upstream-Status: Pending
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# Date:      Wed Sep 16 13:43:09 2020 +0200
-#
-# On branch jansa/master
-# Changes to be committed:
-#       new file:   meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
-#       modified:   meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
-#
-# Untracked files:
-#       counts.txt
-#       diff
-#       log.svn
-#       log.svn2
-#       wip/
-#
---
- ld.hugetlbfs | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/ld.hugetlbfs b/ld.hugetlbfs
-index 5e4e497..6ee8238 100755
--- a/ld.hugetlbfs
-+++ b/ld.hugetlbfs
-@@ -130,9 +130,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then
-        # targeting the ARM platform one needs to explicitly set the text segment offset
-        # otherwise it will be NULL.
-        case "$EMU" in
-       armelf*_linux_eabi|aarch64elf*|aarch64linux*)
-               printf -v TEXTADDR "%x" "$SLICE_SIZE"
-               HTLBOPTS="$HTLBOPTS -Ttext-segment=$TEXTADDR" ;;
-+       armelf*_linux_eabi|aarch64elf*|aarch64linux*)   HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;;
-        elf_i386)               HTLBOPTS="$HTLBOPTS -Ttext-segment=0x08000000" ;;
-        elf64ppc|elf64lppc)
-                if [ "$MMU_TYPE" == "Hash" ] ; then
-- 
-2.17.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
index a13c5389f..3dbc34d08 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
@@ -1,20 +1,20 @@
-From 183a4dafe141197de5840f2e48c266ef209307aa Mon Sep 17 00:00:00 2001
+From b448672f1bc08dcef2ae07727ae6f124a3032a35 Mon Sep 17 00:00:00 2001
 From: Ting Liu <b28495@freescale.com>
 Date: Mon, 18 Jun 2012 16:37:05 +0800
 Subject: [PATCH] skip checking LIB32 and LIB64 if they point to the same place
 Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Ting Liu <b28495@freescale.com>
+Signed-off-by: Ting Liu <b28495@freescale.com>
 ---
- Makefile | 1 -
+ Makefile.in | 1 -
 1 file changed, 1 deletion(-)
-diff --git a/Makefile b/Makefile
+diff --git a/Makefile.in b/Makefile.in
-index 51e41f0..373df3c 100644
+index 65ae5a4..25be577 100644
--- a/Makefile
+--- a/Makefile.in
-+++ b/Makefile
+++ b/Makefile.in
-@@ -177,7 +177,6 @@ REALLIB32 = $(realpath $(PREFIX)/$(LIB32))
+@@ -196,7 +196,6 @@ REALLIB32 = $(realpath $(PREFIX)/$(LIB32))
 REALLIB64 = $(realpath $(PREFIX)/$(LIB64))
 ifneq ($(realpath $(PREFIX)),)
 ifeq ($(REALLIB32),$(REALLIB64))
@@ -22,3 +22,6 @@ index 51e41f0..373df3c 100644
 endif
 endif
 
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch
deleted file mode 100644
index 78a4cb0fc..000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b6dba773491bbb7b4664dacdd87a12af860f1bd8 Mon Sep 17 00:00:00 2001
-From: Oleksiy Obitotskyy <oobitots@cisco.com>
-Date: Thu, 28 Jan 2021 05:43:33 -0800
-Subject: [PATCH] tests/makefile: Append CPPFLAGS rather then override
-CPPFLAGS overrided and we could miss some options needed.
-Upstream-Status: Submitted
-Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
---
- tests/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/tests/Makefile b/tests/Makefile
-index 0ca3716..d262932 100644
--- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -33,8 +33,8 @@ HELPERS = get_hugetlbfs_path compare_kvers
- HELPER_LIBS = libheapshrink.so
- BADTOOLCHAIN = bad-toolchain.sh
- 
-CFLAGS = -O2 -Wall -g
-CPPFLAGS = -I..
-+CFLAGS += -O2 -Wall -g
-+CPPFLAGS += -I..
- STATIC_LIBHUGE = -Wl,--whole-archive -lhugetlbfs -Wl,--no-whole-archive
- STATIC_LDLIBS = -Wl,--no-as-needed -lpthread
- LDLIBS = $(STATIC_LDLIBS) -ldl -lhugetlbfs_privutils
-- 
-2.26.2.Cisco
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch
index f95e9e85a..1b99c007f 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch
@@ -1,4 +1,4 @@
-From 82a4f60ab24dff121f5f9d3bbcd9a8a28bb7caef Mon Sep 17 00:00:00 2001
+From d3903cbe348c6ecb2f38b37f20dafa6b0ca3b114 Mon Sep 17 00:00:00 2001
 From: Chunrong Guo <B40290@freescale.com>
 Date: Sun, 8 Sep 2013 23:21:49 -0500
 Subject: [PATCH] libhugetlbfs: avoid search host library path for cross
@@ -7,7 +7,6 @@ Subject: [PATCH] libhugetlbfs: avoid search host library path for cross
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Chunrong Guo <B40290@freescale.com>
 ---
 ldscripts/elf32ppclinux.xB   | 2 +-
 ldscripts/elf32ppclinux.xBDT | 2 +-
@@ -95,3 +94,6 @@ index 1855202..c62d245 100644
 INPUT(-lhugetlbfs);
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-tests-Makefile-install-static-4G-edge-testcases.patch
index b8b2f8e6f..98cdf2f51 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-tests-Makefile-install-static-4G-edge-testcases.patch
@@ -1,22 +1,21 @@
-From f1ad8ff887f16daee8d06eca3df0f2541bfdaac0 Mon Sep 17 00:00:00 2001
+From 3e54866a0ea3c9e933e91213cbe6e55b7ff67b87 Mon Sep 17 00:00:00 2001
 From: Ting Liu <b28495@freescale.com>
 Date: Mon, 23 Sep 2013 08:00:55 +0000
-Subject: [PATCH] libhugetlbfs: add recipe
+Subject: [PATCH] tests/Makefile: install static 4G edge testcases
-Upstream-Status: Submitted
 TESTS_64 is empty, install will fail due to missing file operand
-Signed-off-by: Ting Liu <b28495@freescale.com>
+Upstream-Status: Submitted
+Signed-off-by: Ting Liu <b28495@freescale.com>
 ---
- tests/Makefile | 2 +-
+ tests/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tests/Makefile b/tests/Makefile
+diff --git a/tests/Makefile.in b/tests/Makefile.in
-index 073df96..0ca3716 100644
+index d33a228..d262932 100644
--- a/tests/Makefile
+--- a/tests/Makefile.in
-+++ b/tests/Makefile
+++ b/tests/Makefile.in
 @@ -295,7 +295,7 @@ obj64/install:
        $(INSTALL) -m 755 wrapper-utils.sh $(DESTDIR)$(INST_TESTSDIR64)/obj64
        $(INSTALL) -m 755 $(HELPERS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64
@@ -26,3 +25,6 @@ index 073df96..0ca3716 100644
        $(INSTALL) -m 755 run_tests.py $(DESTDIR)$(INST_TESTSDIR64)
 
 install: $(OBJDIRS:%=%/install)
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
index 83934abef..6b010365a 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
@@ -1,4 +1,4 @@
-From 0077532b07e268347cb8557be6d70148d5f0e840 Mon Sep 17 00:00:00 2001
+From 86d3ebfc4da5ccbc82fdee4abaf2cbf758d82403 Mon Sep 17 00:00:00 2001
 From: Ting Liu <b28495@freescale.com>
 Date: Wed, 21 Aug 2013 15:44:57 +0800
 Subject: [PATCH] run_test.py: not use hard coded path ../obj/hugeadm
@@ -20,10 +20,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 1 file changed, 11 insertions(+), 1 deletion(-)
 diff --git a/tests/run_tests.py b/tests/run_tests.py
-index 018264d..0aabcd1 100755
+index 4793262..6cd0241 100755
 --- a/tests/run_tests.py
 +++ b/tests/run_tests.py
-@@ -245,9 +245,19 @@ def get_pagesizes():
+@@ -250,9 +250,19 @@ def get_pagesizes():
     Use libhugetlbfs' hugeadm utility to get a list of page sizes that have
     active mount points and at least one huge page allocated to the pool.
     """
@@ -45,5 +45,5 @@ index 018264d..0aabcd1 100755
         return sizes
 
 -- 
-2.7.4
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
index 7cc180a4b..fc8776af6 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
@@ -1,4 +1,4 @@
-From b5887693d90c430291b644c2f5713b5fdd1777ce Mon Sep 17 00:00:00 2001
+From 8c7a379876e3c7a32bef8620f94a85d20b7b186f Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Tue, 4 Nov 2014 00:49:11 -0800
 Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for
@@ -7,7 +7,6 @@ Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for
 Upstream-Status: Inappropriate [cross compile specific]
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
 ---
 ldscripts/elf_i386.xB   | 1 -
 ldscripts/elf_i386.xBDT | 1 -
@@ -37,3 +36,6 @@ index d72aebe..3bac1b1 100644
 INPUT(-lhugetlbfs);
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-stddef.h-for-ptrdiff_t.patch
index 914b0514f..33a4efb1f 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-stddef.h-for-ptrdiff_t.patch
@@ -1,18 +1,17 @@
-From 351d1de09dd80049b7a2cb02c5750635d0389873 Mon Sep 17 00:00:00 2001
+From 5fe5dae674e259bcdd57b9c6a0004111ab0700ce Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:25:57 -0700
 Subject: [PATCH] include stddef.h for ptrdiff_t
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
 morecore.c | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/morecore.c b/morecore.c
-index 6563bbd..0eef782 100644
+index 405c566..0edccd2 100644
 --- a/morecore.c
 +++ b/morecore.c
 @@ -19,6 +19,7 @@
@@ -23,3 +22,6 @@ index 6563bbd..0eef782 100644
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0007-Mark-glibc-specific-code-so.patch
index 7ad6c43eb..5b2c91b8a 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0007-Mark-glibc-specific-code-so.patch
@@ -1,21 +1,20 @@
-From 0f548286848c70aa325c6748d80e8651389b4938 Mon Sep 17 00:00:00 2001
+From c98e64c56d0118a2d5f950eaceaed0e85eaa2543 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:32:59 -0700
 Subject: [PATCH] Mark glibc specific code so
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
 morecore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/morecore.c b/morecore.c
-index 0eef782..d48509c 100644
+index 0edccd2..db22216 100644
 --- a/morecore.c
 +++ b/morecore.c
-@@ -364,6 +364,7 @@ void hugetlbfs_setup_morecore(void)
+@@ -371,6 +371,7 @@ void hugetlbfs_setup_morecore(void)
 
        INFO("setup_morecore(): heapaddr = 0x%lx\n", heapaddr);
 
@@ -23,7 +22,7 @@ index 0eef782..d48509c 100644
        heaptop = heapbase = (void *)heapaddr;
        if (__hugetlb_opts.thp_morecore)
                __morecore = &thp_morecore;
-@@ -371,7 +372,6 @@ void hugetlbfs_setup_morecore(void)
+@@ -378,7 +379,6 @@ void hugetlbfs_setup_morecore(void)
                __morecore = &hugetlbfs_morecore;
 
        /* Set some allocator options more appropriate for hugepages */
@@ -31,9 +30,13 @@ index 0eef782..d48509c 100644
        if (__hugetlb_opts.shrink_ok)
                mallopt(M_TRIM_THRESHOLD, hpage_size + hpage_size / 2);
        else
-@@ -381,4 +381,5 @@ void hugetlbfs_setup_morecore(void)
+@@ -388,5 +388,6 @@ void hugetlbfs_setup_morecore(void)
         * This doesn't appear to prohibit malloc() from falling back
         * to mmap() if we run out of hugepages. */
        mallopt(M_MMAP_MAX, 0);
 +#endif
 }
+ #endif /* HAS_MORECORE */
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
index 858a8e511..73844b71f 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
@@ -1,20 +1,19 @@
-From 9ff04d7acc700387e3837f8ab11a41efea5ee8b0 Mon Sep 17 00:00:00 2001
+From 4f69eb130dc2c67a90f2460cedb78f6db11dd6d2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:44:26 -0700
 Subject: [PATCH] alloc.c: Avoid sysconf(_SC_LEVEL2_CACHE_LINESIZE) on linux
 musl does not have it
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
 alloc.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
 diff --git a/alloc.c b/alloc.c
-index bce9464..cf7eb40 100644
+index b8ed663..a58c43d 100644
 --- a/alloc.c
 +++ b/alloc.c
 @@ -245,6 +245,19 @@ void free_huge_pages(void *ptr)
@@ -46,3 +45,6 @@ index bce9464..cf7eb40 100644
                linemod = time(NULL);
        }
 
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0009-shm.c-Mark-glibc-specific-changes-so.patch
index c3f7b3e47..4fbf30e24 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0009-shm.c-Mark-glibc-specific-changes-so.patch
@@ -1,13 +1,12 @@
-From 9ce323432a7f4d99f617970c7e35b607b9bbf843 Mon Sep 17 00:00:00 2001
+From 37239dd5f14a34b05e77b3ca6e34f96161f1339a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:48:04 -0700
 Subject: [PATCH] shm.c: Mark glibc specific changes so
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
 shm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
@@ -28,3 +27,6 @@ index 1f82cab..9447b63 100644
 
 /* call syscall shmget through the generic syscall mechanism */
 static int syscall_shmget(key_t key, size_t size, int shmflg)
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0010-Include-dirent.h-for-ino_t.patch
index 8bd163339..a530a5267 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0010-Include-dirent.h-for-ino_t.patch
@@ -1,4 +1,4 @@
-From bb8c370aaaf25b1fe1fbf984e73177018026cb91 Mon Sep 17 00:00:00 2001
+From ec9163c0436d1c77cecc941aca2e524b26001b15 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:51:02 -0700
 Subject: [PATCH] Include dirent.h for ino_t
@@ -6,13 +6,13 @@ Subject: [PATCH] Include dirent.h for ino_t
 Fixes
 error: unknown type name 'ino_t'; did you mean 'int'?
+Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Update for 2.22.
 Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
 ---
-Upstream-Status: Pending
 tests/hugetests.h | 1 +
 1 file changed, 1 insertion(+)
@@ -29,5 +29,5 @@ index bc4e16a..fbe4dc0 100644
 
 #include "libhugetlbfs_privutils.h"
 -- 
-2.7.4
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0011-include-limits.h-for-PATH_MAX.patch
index e4f803096..08de396d9 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0011-include-limits.h-for-PATH_MAX.patch
@@ -1,4 +1,4 @@
-From 5f64aa8c47c2d3a155a97e262f89cc47394a69eb Mon Sep 17 00:00:00 2001
+From 79b76433f4b6f2f14914817b7e8ac0db1df39250 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:58:53 -0700
 Subject: [PATCH] include limits.h for PATH_MAX
@@ -7,17 +7,16 @@ Fixes
 error: 'PATH_MAX' undeclared
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
 hugeadm.c                | 1 +
 tests/gethugepagesizes.c | 1 +
 2 files changed, 2 insertions(+)
 diff --git a/hugeadm.c b/hugeadm.c
-index fe4211d..8db274c 100644
+index 79a4867..65d5136 100644
 --- a/hugeadm.c
 +++ b/hugeadm.c
 @@ -33,6 +33,7 @@
@@ -29,7 +28,7 @@ index fe4211d..8db274c 100644
 #include <sys/stat.h>
 #include <sys/types.h>
 diff --git a/tests/gethugepagesizes.c b/tests/gethugepagesizes.c
-index 9551b38..2645e3f 100644
+index 5777265..990db69 100644
 --- a/tests/gethugepagesizes.c
 +++ b/tests/gethugepagesizes.c
 @@ -29,6 +29,7 @@
@@ -40,3 +39,6 @@ index 9551b38..2645e3f 100644
 
 #include "hugetests.h"
 
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0012-huge_page_setup_helper-use-python3-interpreter.patch
index e45f283b3..0583df95a 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0012-huge_page_setup_helper-use-python3-interpreter.patch
@@ -1,4 +1,4 @@
-From b77c61de4d88d2c6e5d31f4f5a5877cc4c61272e Mon Sep 17 00:00:00 2001
+From e5580e392b8764e1e6509c5a4ed13fb2ce7566b9 Mon Sep 17 00:00:00 2001
 From: Andrey Zhizhikin <andrey.z@gmail.com>
 Date: Mon, 27 Jan 2020 17:27:55 +0000
 Subject: [PATCH] huge_page_setup_helper: use python3 interpreter
@@ -15,7 +15,7 @@ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/huge_page_setup_helper.py b/huge_page_setup_helper.py
-index a9ba2bf..7ba0c92 100755
+index 01fc8dc..79a88ca 100755
 --- a/huge_page_setup_helper.py
 +++ b/huge_page_setup_helper.py
 @@ -1,4 +1,4 @@
@@ -25,5 +25,5 @@ index a9ba2bf..7ba0c92 100755
 #
 # Tool to set up Linux large page support with minimal effort
 -- 
-2.17.1
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch
new file mode 100644
index 000000000..264a535cc
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch
@@ -0,0 +1,41 @@
+From 825444522d698991be04bbfa683a7cf785c6f72c Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Wed, 2 Oct 2024 00:06:34 +0800
+Subject: [PATCH] elflink.c: include libgen.h for basename
+Basename prototype has been removed from string.h from latest musl[1].
+Compilers e.g. clang-18 flags the absense of prototype as error.
+Therefore include libgen.h for providing it.
+elflink.c: In function 'get_shared_file_name':
+elflink.c:363:19: error: implicit declaration of function 'basename' [-Wimplicit-function-declaration]
+  363 |         binary2 = basename(binary);
+      |                   ^~~~~~~~
+elflink.c:363:17: error: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
+  363 |         binary2 = basename(binary);
+      |                 ^
+[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
+Upstream-Status: Pending
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ elflink.c | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/elflink.c b/elflink.c
+index 278d338..0e78d61 100644
+--- a/elflink.c
+++ b/elflink.c
+@@ -38,6 +38,7 @@
+ #include <limits.h>
+ #include <elf.h>
+ #include <dlfcn.h>
+#include <libgen.h>
+ 
+ #include "version.h"
+ #include "hugetlbfs.h"
+-- 
+2.25.1
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb
new file mode 100644
index 000000000..d82e03e81
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb
@@ -0,0 +1,87 @@
+SUMMARY = "A library which provides easy access to huge pages of memory"
+HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
+DEPENDS = "sysfsutils"
+RDEPENDS:${PN} += "bash python3-core"
+RDEPENDS:${PN}-tests += "bash python3-core python3-resource"
+PE = "1"
+SRCREV = "1322884fb0d55dc55f53563c1aa6328d118997e7"
+SRC_URI = " \
+    git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=master \
+    file://0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
+    file://0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
+    file://0003-tests-Makefile-install-static-4G-edge-testcases.patch \
+    file://0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
+    file://0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
+    file://0006-include-stddef.h-for-ptrdiff_t.patch \
+    file://0007-Mark-glibc-specific-code-so.patch \
+    file://0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \
+    file://0009-shm.c-Mark-glibc-specific-changes-so.patch \
+    file://0010-Include-dirent.h-for-ino_t.patch \
+    file://0011-include-limits.h-for-PATH_MAX.patch \
+    file://0012-huge_page_setup_helper-use-python3-interpreter.patch \
+    file://0013-elflink.c-include-libgen.h-for-basename.patch \
+"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
+S = "${WORKDIR}/git"
+COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*"
+LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
+LIBHUGETLBFS_ARCH = "${TARGET_ARCH}"
+LIBHUGETLBFS_ARCH:powerpc = "ppc"
+LIBHUGETLBFS_ARCH:powerpc64 = "ppc64"
+LIBHUGETLBFS_ARCH:powerpc64le = "ppc64le"
+EXTRA_OEMAKE = "'ARCH=${LIBHUGETLBFS_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS} BUILDTYPE=NATIVEONLY V=2"
+PARALLEL_MAKE = ""
+CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0"
+export HUGETLB_LDSCRIPT_PATH="${S}/ldscripts"
+TARGET_CC_ARCH += "${LDFLAGS}"
+LDFLAGS += "-B${S}"
+inherit autotools-brokensep cpan-base
+#The CUSTOM_LDSCRIPTS doesn't work with the gold linker
+do_configure:prepend() {
+    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then
+        sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/'  Makefile.in
+    fi
+    ln -sf ld.hugetlbfs ${S}/ld
+    ln -sf ld.hugetlbfs ${S}/ld.bfd
+    ln -sf ld.hugetlbfs ${S}/ld.gold
+    ln -sf ld.hugetlbfs ${S}/ld.lld
+}
+do_install() {
+    oe_runmake PREFIX=${prefix} DESTDIR=${D}  \
+        INST_TESTSDIR32=${libdir}/libhugetlbfs/tests \
+        INST_TESTSDIR64=${libdir}/libhugetlbfs/tests \
+        install-tests
+    sed -i \
+        -e 's|${RECIPE_SYSROOT_NATIVE}||g' \
+        -e 's|${RECIPE_SYSROOT}||g' \
+        -e 's|${S}||g' \
+        `find ${D}${libdir}/libhugetlbfs/tests -name dummy.ldscript`
+}
+PACKAGES =+ "${PN}-tests "
+FILES:${PN} += "${libdir}/*.so"
+FILES:${PN}-dev = "${includedir}"
+FILES:${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug"
+FILES:${PN}-tests += "${libdir}/libhugetlbfs/tests"
+INSANE_SKIP:${PN} = "dev-so"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
deleted file mode 100644
index 80af9873b..000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-SUMMARY = "A library which provides easy access to huge pages of memory"
-HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
-DEPENDS = "sysfsutils"
-RDEPENDS:${PN} += "bash python3-core"
-RDEPENDS:${PN}-tests += "bash python3-core"
-PV = "2.23"
-PE = "1"
-SRCREV = "6b126a4d7da9490fa40fe7e1b962edcb939feddc"
-SRC_URI = " \
-    git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=master \
-    file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
-    file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
-    file://tests-Makefile-install-static-4G-edge-testcases.patch \
-    file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
-    file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
-    file://0001-include-stddef.h-for-ptrdiff_t.patch \
-    file://0002-Mark-glibc-specific-code-so.patch \
-    file://0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \
-    file://0004-shm.c-Mark-glibc-specific-changes-so.patch \
-    file://0005-Include-dirent.h-for-ino_t.patch \
-    file://0006-include-limits.h-for-PATH_MAX.patch \
-    file://0001-huge_page_setup_helper-use-python3-interpreter.patch \
-    file://0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch \
-    file://0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch \
-"
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
-COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*"
-LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
-LIBHUGETLBFS_ARCH = "${TARGET_ARCH}"
-LIBHUGETLBFS_ARCH:powerpc = "ppc"
-LIBHUGETLBFS_ARCH:powerpc64 = "ppc64"
-LIBHUGETLBFS_ARCH:powerpc64le = "ppc64le"
-EXTRA_OEMAKE = "'ARCH=${LIBHUGETLBFS_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS} BUILDTYPE=NATIVEONLY V=2"
-PARALLEL_MAKE = ""
-CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0"
-export HUGETLB_LDSCRIPT_PATH="${S}/ldscripts"
-TARGET_CC_ARCH += "${LDFLAGS}"
-#The CUSTOM_LDSCRIPTS doesn't work with the gold linker
-inherit cpan-base
-do_configure() {
-    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then
-      sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/'  Makefile
-    fi
-}
-do_install() {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D}  \
-          INST_TESTSDIR32=${libdir}/libhugetlbfs/tests \
-          INST_TESTSDIR64=${libdir}/libhugetlbfs/tests \
-          install-tests
-}
-PACKAGES =+ "${PN}-tests "
-FILES:${PN} += "${libdir}/*.so"
-FILES:${PN}-dev = "${includedir}"
-FILES:${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug"
-FILES:${PN}-tests += "${libdir}/libhugetlbfs/tests"
-INSANE_SKIP:${PN} = "dev-so"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-# see https://github.com/libhugetlbfs/libhugetlbfs/issues/52
-SKIP_RECIPE[libhugetlbfs] ?= "Needs porting to glibc 2.34+"
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.24.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.25.bb
index 15cde9f10..a098bf8ee 100644
--- a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.24.bb
+++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.25.bb
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native python3-jinja2-na
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
           file://run-ptest"
-SRC_URI[sha256sum] = "12f560b35dbed981fde8cf774c6d1f2e658a157d3a63d6c439bf418dbcc44b4c"
+SRC_URI[sha256sum] = "a1d484778ae87c69b38f417659b33fe3d689373ce0831d1f95617b8aa76e8c37"
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb b/meta-oe/recipes-connectivity/ace/ace_8.0.1.bb
index a9bdbc916..c79fba323 100644
--- a/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb
+++ b/meta-oe/recipes-connectivity/ace/ace_8.0.1.bb
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77"
 DEPENDS += "openssl gperf-native"
-SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_19/ACE-${PV}.tar.bz2 \
+SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_1/ACE-${PV}.tar.bz2 \
           file://ace_config.patch \
           file://no_sysctl.patch \
          "
-SRC_URI[sha256sum] = "739be290a38229aaa5b5150e6ea55ce427e80970f0ace4c5040ac46644526f41"
+SRC_URI[sha256sum] = "8d379f37d56db33f3ae447725b632d48b1c13e887593547ac3568e3b428c28f0"
 UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
@@ -25,8 +25,8 @@ export ACE_ROOT="${WORKDIR}/ACE_wrappers"
 inherit pkgconfig
 CXXFLAGS:append = " -fpermissive -Wnodeprecated-declarations"
-CXX:append = " -std=gnu++14 -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= "
+CXX:append = " -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= "
-EXTRA_OEMAKE += "INSTALL_LIB=${baselib}"
+EXTRA_OEMAKE += "INSTALL_LIB=${baselib} install_rpath=0"
 do_install() {
    export D="${D}"
diff --git a/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_9.0.2.bb b/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_9.0.2.bb
new file mode 100644
index 000000000..dac83065c
--- /dev/null
+++ b/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_9.0.2.bb
@@ -0,0 +1,14 @@
+SUMMARY = "MQTT communication C++ library using Boost.Asio"
+HOMEPAGE = "https://github.com/redboltz/async_mqtt"
+LICENSE = "BSL-1.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c"
+SRC_URI = "git://github.com/redboltz/async_mqtt;protocol=http;branch=main;protocol=https"
+SRCREV = "51a97adfd022cf5205c3bb31f38ace1f7fbd21a1"
+DEPENDS = "openssl boost"
+S = "${WORKDIR}/git"
+inherit cmake
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_2.20.bb b/meta-oe/recipes-connectivity/iwd/iwd_3.0.bb
index ffdab0260..a1293d6dc 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd_2.20.bb
+++ b/meta-oe/recipes-connectivity/iwd/iwd_3.0.bb
@@ -3,12 +3,12 @@ HOMEPAGE = "https://iwd.wiki.kernel.org/"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
-DEPENDS = "ell"
+DEPENDS = "dbus"
 SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \
           file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \
           "
-SRC_URI[sha256sum] = "86827b97cb5b19ddecce36568c59378da2fae8cf37a0e2b9eacd1269f24c6f8e"
+SRC_URI[sha256sum] = "bd167ab368b6ba302b6c948a4f41f02d233a12e20d5094b1c0393325309f8a60"
 inherit autotools manpages pkgconfig python3native systemd
@@ -24,8 +24,6 @@ PACKAGECONFIG[wired] = "--enable-wired,--disable-wired"
 PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono"
 PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd"
-EXTRA_OECONF = "--enable-external-ell"
 SYSTEMD_SERVICE:${PN} = " \
    iwd.service \
    ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \
diff --git a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.3.0.bb b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.3.1.bb
index 8bd555d96..2f58738c3 100644
--- a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.3.0.bb
+++ b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.3.1.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/"
 DEPENDS = "libplist"
-SRCREV = "362f7848ac89b74d9dd113b38b51ecb601f76094"
+SRCREV = "a4ec1cf9cc7084cbe5571e31640ef773701e5f51"
 SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.0.bb b/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.1.bb
index 29f67d39d..818033243 100644
--- a/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.0.bb
+++ b/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.1.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/"
 DEPENDS = "libimobiledevice-glue libusb1 readline"
-SRCREV = "2254dab893ec439f9a73235ea07194afa77399db"
+SRCREV = "2fb767d784c01269a0ded5bacd5539aee3768c35"
 SRC_URI = "git://github.com/libimobiledevice/libirecovery;protocol=https;branch=master"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp/0002-util-mtp-hotplug.c-Enable-stack-memory-protection.patch b/meta-oe/recipes-connectivity/libmtp/libmtp/0002-util-mtp-hotplug.c-Enable-stack-memory-protection.patch
new file mode 100644
index 000000000..9cd4b2fbd
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libmtp/libmtp/0002-util-mtp-hotplug.c-Enable-stack-memory-protection.patch
@@ -0,0 +1,33 @@
+From 0644188a537a06bc6d04483b21e23b80987eb497 Mon Sep 17 00:00:00 2001
+From: Hieu Van Nguyen <hieu2.nguyen@lge.com>
+Date: Fri, 11 Oct 2024 04:21:21 +0000
+Subject: [PATCH] util/mtp-hotplug.c: Enable stack memory protection
+Use "return 0" instead of "exit(0)" at the end of main()
+function to enable checking for Stack Overflow at Runtime.
+Use "return 0" to let the program exit normally by returning from
+the main function. This allows the compiler to perform necessary
+cleanup operations, including stack canary checks.
+__stack_chk_fail function isn't being invoked when using exit(0) at
+the end of the main function
+$ objdump -T ./util/.libs/mtp-hotplug | grep __stack_chk_fail
+This return empty.
+---
+Upstream-Status: Backport [https://github.com/libmtp/libmtp/commit/e89dbb6ecf244936acc9a52aa4af9635bda5926a]
+ util/mtp-hotplug.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/util/mtp-hotplug.c b/util/mtp-hotplug.c
+index b5bc6da40f..db75cb38a1 100644
+--- a/util/mtp-hotplug.c
+++ b/util/mtp-hotplug.c
+@@ -301,5 +301,5 @@ int main (int argc, char **argv)
+     printf("\n");
+   }
+ 
+-  exit (0);
+  return 0;
+ }
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb
index 16f82c6ba..69dff50cd 100644
--- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb
+++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb
@@ -18,7 +18,8 @@ DEPENDS = "libusb1 gettext-native"
 DEPENDS:append:class-target = " ${BPN}-native"
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz"
-SRC_URI:append:class-target = " file://0001-Use-native-mtp-hotplug.patch"
+SRC_URI:append:class-target = " file://0001-Use-native-mtp-hotplug.patch \
+                                file://0002-util-mtp-hotplug.c-Enable-stack-memory-protection.patch"
 SRC_URI[sha256sum] = "f4c1ceb3df020a6cb851110f620c14fe399518c494ed252039cbfb4e34335135"
 UPSTREAM_CHECK_URI = "https://github.com/libmtp/libmtp/releases"
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.14.0.bb
index c7a0562db..912b00261 100644
--- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
+++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.14.0.bb
@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 DEPENDS = "zlib libsigc++-2.0 openssl cppunit"
-PV = "0.13.8+git"
 SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https"
-SRCREV = "e60f222241319aaae482789517ad00ae9344bd13"
+SRCREV = "08fb6635ba249665cb08a4de1b955288d25c21e1"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch
deleted file mode 100644
index b117dcf67..000000000
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6120cee594c543d17ae015bc601012debcf57177 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 23 Oct 2023 10:43:42 +0100
-Subject: [PATCH] include string.h for strncpy()
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport [master: 6120cee594c543d17ae015bc601012debcf57177]
---
- interface.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/interface.c b/interface.c
-index 29229ad6f53d..9a83c36933e7 100644
--- a/interface.c
-+++ b/interface.c
-@@ -5,6 +5,7 @@
-  * @note SPDX-License-Identifier: GPL-2.0+
-  */
- #include <stdlib.h>
-+#include <string.h>
- #include "interface.h"
- 
- struct interface {
-- 
-2.34.1
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch
deleted file mode 100644
index 3cf3a63b9..000000000
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From cffb4807ac0b9ff7aea2aa4f3842985b5363d184 Mon Sep 17 00:00:00 2001
-From: Luca Fancellu <luca.fancellu@arm.com>
-Date: Mon, 23 Oct 2023 10:43:43 +0100
-Subject: [PATCH] linuxptp: Use ${CC} in incdefs.sh
-The Makefile is defining CC and incdefs.sh is using
-${CROSS_COMPILE}cpp inside it, allowing both to use different
-compilers depending on what the user pass during make invocation
-as CC.
-Align them using ${CC} also inside incdefs.sh.
-Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
-Upstream-Status: Backport [master: cffb4807ac0b9ff7aea2aa4f3842985b5363d184]
---
- incdefs.sh | 2 +-
- makefile   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/incdefs.sh b/incdefs.sh
-index a9e94f777f6b..391e63c7fac6 100755
--- a/incdefs.sh
-+++ b/incdefs.sh
-@@ -27,7 +27,7 @@ user_flags()
-        printf " -D_GNU_SOURCE"
- 
-        # Get list of directories searched for header files.
-       dirs=$(echo "" | ${CROSS_COMPILE}cpp -Wp,-v 2>&1 >/dev/null | grep ^" /")
-+       dirs=$(${CC} -E -Wp,-v -xc /dev/null 2>&1 >/dev/null | grep ^" /")
- 
-        # Look for clock_adjtime().
-        for d in $dirs; do
-diff --git a/makefile b/makefile
-index 3e3b8b35fc96..7fc5f6fb8fa8 100644
--- a/makefile
-+++ b/makefile
-@@ -39,7 +39,7 @@ OBJECTS       = $(OBJ) hwstamp_ctl.o nsm.o phc2sys.o phc_ctl.o pmc.o pmc_agent.o \
- SRC    = $(OBJECTS:.o=.c)
- DEPEND = $(OBJECTS:.o=.d)
- srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
-incdefs := $(shell $(srcdir)/incdefs.sh)
-+incdefs := $(shell CC="$(CC)" $(srcdir)/incdefs.sh)
- version := $(shell $(srcdir)/version.sh $(srcdir))
- VPATH  = $(srcdir)
- 
-- 
-2.34.1
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.4.bb
index d1a73841a..84b3af8c5 100644
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.4.bb
@@ -5,23 +5,15 @@ HOMEPAGE = "http://linuxptp.sourceforge.net/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-LINUXPTP_SRC_URI = "http://sourceforge.net/projects/linuxptp"
+SRC_URI = "https://downloads.nwtime.org/linuxptp/linuxptp-${PV}.tgz \
-SRC_URI = "${LINUXPTP_SRC_URI}/files/v4.1/linuxptp-${PV}.tgz \
-           file://0001-include-string.h-for-strncpy.patch \
-           file://0002-linuxptp-Use-CC-in-incdefs.sh.patch \
           file://systemd/phc2sys@.service.in \
           file://systemd/ptp4l@.service.in \
           "
-SRC_URI[md5sum] = "1db8699fc155965341759be5e5aad938"
+SRC_URI[sha256sum] = "61757bc0a58d789b8fcbdddf56c88a0230597184a70dcb2ac05b4c6b619f7d5c"
-SRC_URI[sha256sum] = "e1743d44f8208897e30895da3579e670ff919b914feb4b5a949f3e421ddde535"
 inherit systemd
-UPSTREAM_CHECK_URI = "${LINUXPTP_SRC_URI}/files/"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
 EXTRA_OEMAKE = "CC='${CC}' EXTRA_CFLAGS='${CFLAGS}' mandir='${mandir}' \
    sbindir='${sbindir}'"
diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch b/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch
deleted file mode 100644
index dfd1f9875..000000000
--- a/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-CVE: CVE-2023-35789
-Upstream-Status: Backport [ https://github.com/alanxz/rabbitmq-c/commit/463054383fbeef889b409a7f843df5365288e2a0 ]
-Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
-From 463054383fbeef889b409a7f843df5365288e2a0 Mon Sep 17 00:00:00 2001
-From: Christian Kastner <ckk@kvr.at>
-Date: Tue, 13 Jun 2023 14:21:52 +0200
-Subject: [PATCH] Add option to read username/password from file (#781)
-* Add option to read username/password from file
---
- tools/common.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 66 insertions(+)
-diff --git a/tools/common.c b/tools/common.c
-index 73b47e25..7efe557b 100644
--- a/tools/common.c
-+++ b/tools/common.c
-@@ -18,6 +18,11 @@
- #include "compat.h"
- #endif
- 
-+/* For when reading auth data from a file */
-+#define MAXAUTHTOKENLEN 128
-+#define USERNAMEPREFIX "username:"
-+#define PASSWORDPREFIX "password:"
-+
- void die(const char *fmt, ...) {
-   va_list ap;
-   va_start(ap, fmt);
-@@ -125,6 +130,7 @@ static char *amqp_vhost;
- static char *amqp_username;
- static char *amqp_password;
- static int amqp_heartbeat = 0;
-+static char *amqp_authfile;
- #ifdef WITH_SSL
- static int amqp_ssl = 0;
- static char *amqp_cacert = "/etc/ssl/certs/cacert.pem";
-@@ -147,6 +153,8 @@ struct poptOption connect_options[] = {
-      "the password to login with", "password"},
-     {"heartbeat", 0, POPT_ARG_INT, &amqp_heartbeat, 0,
-      "heartbeat interval, set to 0 to disable", "heartbeat"},
-+    {"authfile", 0, POPT_ARG_STRING, &amqp_authfile, 0,
-+     "path to file containing username/password for authentication", "file"},
- #ifdef WITH_SSL
-     {"ssl", 0, POPT_ARG_NONE, &amqp_ssl, 0, "connect over SSL/TLS", NULL},
-     {"cacert", 0, POPT_ARG_STRING, &amqp_cacert, 0,
-@@ -158,6 +166,50 @@ struct poptOption connect_options[] = {
- #endif /* WITH_SSL */
-     {NULL, '\0', 0, NULL, 0, NULL, NULL}};
- 
-+void read_authfile(const char *path) {
-+  size_t n;
-+  FILE *fp = NULL;
-+  char token[MAXAUTHTOKENLEN];
-+
-+  if ((amqp_username = malloc(MAXAUTHTOKENLEN)) == NULL ||
-+      (amqp_password = malloc(MAXAUTHTOKENLEN)) == NULL) {
-+    die("Out of memory");
-+  } else if ((fp = fopen(path, "r")) == NULL) {
-+    die("Could not read auth data file %s", path);
-+  }
-+
-+  if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL ||
-+      strncmp(token, USERNAMEPREFIX, strlen(USERNAMEPREFIX))) {
-+    die("Malformed auth file (missing username)");
-+  }
-+  strncpy(amqp_username, &token[strlen(USERNAMEPREFIX)], MAXAUTHTOKENLEN);
-+  /* Missing newline means token was cut off */
-+  n = strlen(amqp_username);
-+  if (amqp_username[n - 1] != '\n') {
-+    die("Username too long");
-+  } else {
-+    amqp_username[n - 1] = '\0';
-+  }
-+
-+  if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL ||
-+      strncmp(token, PASSWORDPREFIX, strlen(PASSWORDPREFIX))) {
-+    die("Malformed auth file (missing password)");
-+  }
-+  strncpy(amqp_password, &token[strlen(PASSWORDPREFIX)], MAXAUTHTOKENLEN);
-+  /* Missing newline means token was cut off */
-+  n = strlen(amqp_password);
-+  if (amqp_password[n - 1] != '\n') {
-+    die("Password too long");
-+  } else {
-+    amqp_password[n - 1] = '\0';
-+  }
-+
-+  (void)fgetc(fp);
-+  if (!feof(fp)) {
-+    die("Malformed auth file (trailing data)");
-+  }
-+}
-+
- static void init_connection_info(struct amqp_connection_info *ci) {
-   ci->user = NULL;
-   ci->password = NULL;
-@@ -237,6 +289,8 @@ static void init_connection_info(struct amqp_connection_info *ci) {
-   if (amqp_username) {
-     if (amqp_url) {
-       die("--username and --url options cannot be used at the same time");
-+    } else if (amqp_authfile) {
-+      die("--username and --authfile options cannot be used at the same time");
-     }
- 
-     ci->user = amqp_username;
-@@ -245,11 +299,23 @@ static void init_connection_info(struct amqp_connection_info *ci) {
-   if (amqp_password) {
-     if (amqp_url) {
-       die("--password and --url options cannot be used at the same time");
-+    } else if (amqp_authfile) {
-+      die("--password and --authfile options cannot be used at the same time");
-     }
- 
-     ci->password = amqp_password;
-   }
- 
-+  if (amqp_authfile) {
-+    if (amqp_url) {
-+      die("--authfile and --url options cannot be used at the same time");
-+    }
-+
-+    read_authfile(amqp_authfile);
-+    ci->user = amqp_username;
-+    ci->password = amqp_password;
-+  }
-+
-   if (amqp_vhost) {
-     if (amqp_url) {
-       die("--vhost and --url options cannot be used at the same time");
diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.14.0.bb
index ea80ec334..b0556ffc0 100644
--- a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb
+++ b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.14.0.bb
@@ -4,10 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7e12f6e40e662e039e2f02b4893011ec"
 LICENSE = "MIT"
 SRC_URI = "git://github.com/alanxz/rabbitmq-c.git;branch=master;protocol=https \
-           file://CVE-2023-35789.patch \
 "
-# v0.13.0-master
+SRCREV = "124722b5045baa41a24ce2e2d7c52a47467e7ac0"
-SRCREV = "974d71adceae6d742ae20a4c880d99c131f1460a"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.10.0.bb
index d9cca404d..4c963d9cc 100644
--- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
+++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.10.0.bb
@@ -6,9 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses"
 SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https"
-SRCREV = "d067bd802e44f0e6a747aabcc311ada2175fd550"
+SRCREV = "a88cab6d2e764e22cac232ef8d5af039d41b8280"
-PV = "0.9.8+git"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch
deleted file mode 100644
index 2cd2c78c3..000000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
--- a/extensions/Makefile.am
-+++ b/extensions/Makefile.am
-@@ -37,8 +37,8 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
-                --xinclude $(tools_dir)/identity.xsl \
-                $< > $@
- 
-extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
-+extensions.html _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/doc-generator.xsl
-        $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
-                $(tools_dir)/doc-generator.xsl \
-                $< > $@
- 
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
deleted file mode 100644
index 039cfc3a8..000000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Telepathy IRC connection manager"
-DESCRIPTION = "Telepathy implementation of the Internet Relay Chat protocols."
-HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
-DEPENDS = "glib-2.0 dbus telepathy-glib openssl libxslt-native"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9"
-SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
-           file://fix-svc-gtk-doc.h-target.patch"
-SRC_URI[md5sum] = "92a2de5198284cbd3c430b0d1a971a86"
-SRC_URI[sha256sum] = "3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d76f2fab"
-inherit autotools pkgconfig ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
-FILES:${PN} += "${datadir}/telepathy \
-                ${datadir}/dbus-1"
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.21.0.bb
index 23db052b9..35e55b225 100644
--- a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb
+++ b/meta-oe/recipes-connectivity/thrift/thrift_0.21.0.bb
@@ -10,7 +10,7 @@ DEPENDS = "thrift-native boost flex-native bison-native openssl zlib"
 SRC_URI = "https://downloads.apache.org/${BPN}/${PV}/${BP}.tar.gz \
           file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch"
-SRC_URI[sha256sum] = "b5d8311a779470e1502c027f428a1db542f5c051c8e1280ccd2163fa935ff2d6"
+SRC_URI[sha256sum] = "9a24f3eba9a4ca493602226c16d8c228037db3b9291c6fc4019bfe3bd39fc67c"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb b/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb
index 199a7c6d6..f86389998 100644
--- a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb
+++ b/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb
@@ -21,7 +21,7 @@ inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg
 LDFLAGS:append:riscv32 = " -latomic"
-PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
+PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gtk', '', d)} \
                 ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
 PACKAGECONFIG[gtk] = "-DENABLE_GTK=ON,-DENABLE_GTK=OFF,gtk4 gtkmm4,"
diff --git a/meta-oe/recipes-core/dbus/dbus-broker_36.bb b/meta-oe/recipes-core/dbus/dbus-broker_36.bb
index 46cff86db..5b4915f96 100644
--- a/meta-oe/recipes-core/dbus/dbus-broker_36.bb
+++ b/meta-oe/recipes-core/dbus/dbus-broker_36.bb
@@ -1,33 +1,37 @@
 SUMMARY = "dbus broker"
 DESCRIPTION = "Drop-in replacement for dbus-daemon."
 SECTION = "base"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8"
+DEPENDS = "\
-SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz"
+    expat \
+    systemd \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)} \
+"
+SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/${BP}.tar.xz"
 SRC_URI[sha256sum] = "d333d99bd2688135b6d6961e7ad1360099d186078781c87102230910ea4e162b"
 UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+)"
-inherit meson pkgconfig systemd features_check
+SYSTEMD_SERVICE:${PN} = "${BPN}.service"
-DEPENDS = "expat systemd"
+inherit meson pkgconfig systemd features_check
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)}"
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)}"
-RDEPENDS:${PN} += "dbus-common"
+EXTRA_OEMESON += "-Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
+EXTRA_OEMESON += "-Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
 REQUIRED_DISTRO_FEATURES = "systemd"
-SYSTEMD_SERVICE:${PN} = "${BPN}.service"
+do_install:append() {
+    install -d ${D}${sysconfdir}/systemd/user
+    ln -s ${systemd_user_unitdir}/dbus-broker.service ${D}${sysconfdir}/systemd/user/dbus.service
+}
+RDEPENDS:${PN} += "dbus-common"
+FILES:${PN} += "${nonarch_libdir}/systemd/catalog"
 FILES:${PN} += "${systemd_system_unitdir}"
 FILES:${PN} += "${systemd_user_unitdir}"
-FILES:${PN} += "${nonarch_libdir}/systemd/catalog"
-EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
-EXTRA_OEMESON += " -Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb
index 465193849..7c7a3fafb 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb
@@ -24,7 +24,7 @@ EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross -Dmaintainer-mode=fa
 do_write_config:append() {
    cat >${WORKDIR}/meson-${PN}.cross <<EOF
 [binaries]
-m4 = '${bindir}/m4'
+m4 = '${bindir_native}/m4'
-perl = '${bindir}/perl'
+perl = '${bindir_native}/perl'
 EOF
 }
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 6f31283fb..178256c83 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -7,24 +7,20 @@ PROVIDES = "${PACKAGES}"
 PACKAGES = "\
    packagegroup-meta-oe \
    packagegroup-meta-oe-benchmarks \
+    packagegroup-meta-oe-bsp \
    packagegroup-meta-oe-connectivity \
-    packagegroup-meta-oe-connectivity-python2 \
    packagegroup-meta-oe-core \
    packagegroup-meta-oe-crypto \
-    packagegroup-meta-oe-bsp \
    packagegroup-meta-oe-dbs \
-    packagegroup-meta-oe-dbs-python2 \
    packagegroup-meta-oe-devtools \
    packagegroup-meta-oe-extended \
-    packagegroup-meta-oe-extended-python2 \
    packagegroup-meta-oe-kernel \
    packagegroup-meta-oe-multimedia \
    packagegroup-meta-oe-navigation \
    packagegroup-meta-oe-printing \
-    packagegroup-meta-oe-shells \
    packagegroup-meta-oe-security \
+    packagegroup-meta-oe-shells \
    packagegroup-meta-oe-support \
-    packagegroup-meta-oe-support-python2 \
    packagegroup-meta-oe-test \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \
@@ -36,14 +32,11 @@ RDEPENDS:packagegroup-meta-oe = "\
    packagegroup-meta-oe-benchmarks \
    packagegroup-meta-oe-bsp \
    packagegroup-meta-oe-connectivity \
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-connectivity-python2", "", d)} \
    packagegroup-meta-oe-core \
    packagegroup-meta-oe-crypto \
    packagegroup-meta-oe-dbs \
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-dbs-python2", "", d)} \
    packagegroup-meta-oe-devtools \
    packagegroup-meta-oe-extended \
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-extended-python2", "", d)} \
    packagegroup-meta-oe-kernel \
    packagegroup-meta-oe-multimedia \
    packagegroup-meta-oe-navigation \
@@ -51,7 +44,6 @@ RDEPENDS:packagegroup-meta-oe = "\
    packagegroup-meta-oe-security \
    packagegroup-meta-oe-shells \
    packagegroup-meta-oe-support \
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-support-python2", "", d)} \
    packagegroup-meta-oe-test \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \
@@ -94,7 +86,7 @@ RDEPENDS:packagegroup-meta-oe-benchmarks:remove:mips64el = "tinymembench"
 RDEPENDS:packagegroup-meta-oe-benchmarks:remove:riscv64 = "libhugetlbfs"
 RDEPENDS:packagegroup-meta-oe-benchmarks:remove:riscv32 = "libhugetlbfs"
-RDEPENDS:packagegroup-meta-oe-bsp ="\
+RDEPENDS:packagegroup-meta-oe-bsp = "\
    acpitool \
    cpufrequtils \
    edac-utils \
@@ -103,10 +95,10 @@ RDEPENDS:packagegroup-meta-oe-bsp ="\
    fwupd \
    fwupd-efi \
    irda-utils \
+    lmsensors \
    lmsensors-config-cgi \
    lmsensors-config-fancontrol \
    lmsensors-config-sensord \
-    lmsensors \
    lsscsi \
    nvme-cli \
    pcmciautils \
@@ -123,8 +115,9 @@ RDEPENDS:packagegroup-meta-oe-bsp:remove:powerpc64le = "efivar efibootmgr fwupd
 RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv64 = "efivar efibootmgr fwupd fwupd-efi"
 RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv32 = "efivar efibootmgr fwupd fwupd-efi"
-RDEPENDS:packagegroup-meta-oe-connectivity ="\
+RDEPENDS:packagegroup-meta-oe-connectivity = "\
    cyrus-sasl \
+    czmq \
    gammu \
    gattlib \
    gensio \
@@ -148,8 +141,8 @@ RDEPENDS:packagegroup-meta-oe-connectivity ="\
    modemmanager \
    mosh \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obex-data-server", "", d)} \
-    openobex \
    obexftp \
+    openobex \
    packagegroup-tools-bluetooth \
    paho-mqtt-c \
    paho-mqtt-cpp \
@@ -163,45 +156,40 @@ RDEPENDS:packagegroup-meta-oe-connectivity ="\
    usbmuxd \
    wifi-test-suite \
    zabbix \
-    czmq \
    zeromq \
 "
 RDEPENDS:packagegroup-meta-oe-connectivity:append:libc-glibc = " wvstreams wvdial"
-RDEPENDS:packagegroup-meta-oe-connectivity-python2 = "\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "telepathy-idle", "", d)} \
-"
 # dracut needs dracut
 RDEPENDS:packagegroup-meta-oe-core = "\
    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dbus-broker", "", d)} \
+    dbus-cxx \
    dbus-daemon-proxy \
-    libdbus-c++ \
+    distro-feed-configs \
    emlog \
-    kernel-module-emlog \
    glibmm \
+    kernel-module-emlog \
+    libdbus-c++ \
    libnfc \
    libsigc++-2.0 \
    libsigc++-3 \
    mdbus2 \
-    distro-feed-configs \
    mm-common \
    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "ndctl", "", d)} \
    pim435 \
    proxy-libintl \
    safec \
-    sdbus-c++-tools \
    sdbus-c++ \
+    sdbus-c++-tools \
    toybox \
    usleep \
-    dbus-cxx \
 "
 RDEPENDS:packagegroup-meta-oe-core:append:libc-glibc = " ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "glfw", "", d)}"
 RDEPENDS:packagegroup-meta-oe-core:remove:riscv64 = "safec"
 RDEPENDS:packagegroup-meta-oe-core:remove:riscv32 = "safec"
-RDEPENDS:packagegroup-meta-oe-crypto ="\
+RDEPENDS:packagegroup-meta-oe-crypto = "\
    botan \
    cryptsetup \
    fsverity-utils \
@@ -212,7 +200,7 @@ RDEPENDS:packagegroup-meta-oe-crypto ="\
 "
 RDEPENDS:packagegroup-meta-oe-crypto:remove:riscv32 = "botan"
-RDEPENDS:packagegroup-meta-oe-dbs ="\
+RDEPENDS:packagegroup-meta-oe-dbs = "\
    influxdb \
    leveldb \
    libdbi \
@@ -225,91 +213,86 @@ RDEPENDS:packagegroup-meta-oe-dbs ="\
 "
 RDEPENDS:packagegroup-meta-oe-dbs:remove:libc-musl:powerpc = "rocksdb"
-RDEPENDS:packagegroup-meta-oe-dbs-python2 ="\
+RDEPENDS:packagegroup-meta-oe-devtools = "\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'mysql-python', '', d), "", d)} \
-"
-RDEPENDS:packagegroup-meta-oe-devtools ="\
    abseil-cpp \
+    android-tools \
+    android-tools-conf \
    apitrace \
    breakpad \
-    android-tools-conf \
+    capnproto-compiler \
-    android-tools \
-    concurrencykit \
    cgdb \
-    ctags \
-    debootstrap \
    cjson \
    cloc \
-    icon-slicer \
+    concurrencykit \
    cscope \
+    ctags \
    dbd-mariadb \
+    debootstrap \
    dmalloc \
    ${@bb.utils.contains("PACKAGE_CLASSES", "package_rpm", "dnf-plugin-tui", "", d)} \
    doxygen \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany-plugins geany", "", d)} \
-    jemalloc \
-    lemon \
    flatbuffers \
-    heaptrack \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany-plugins geany", "", d)} \
-    libparse-yapp-perl \
-    libubox \
-    ltrace \
-    luajit \
-    mcpp \
-    memstat \
    giflib \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "glade", "", d)} \
    grpc \
    guider \
-    php \
+    heaptrack \
+    icon-slicer \
+    ipc-run \
    iptraf-ng \
+    jemalloc \
    jq \
-    json-spirit \
-    serialcheck \
-    tclap \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "tk", "", d)} \
-    uw-imap \
    jsoncpp \
    jsonrpc \
-    yajl \
+    json-schema-validator \
-    yajl \
+    json-spirit \
    kconfig-frontends \
+    lemon \
+    libdbi-perl \
+    libdev-checklib-perl \
    libgee \
+    libio-pty-perl \
+    libjson-perl \
+    libparse-yapp-perl \
+    libperlio-gzip-perl \
    libsombok3 \
+    libubox \
+    libxerces-c \
    lshw \
+    ltrace \
+    luajit \
    luaposix \
-    capnproto-compiler \
+    mcpp \
+    memstat \
+    mercurial \
+    microsoft-gsl \
    mpich \
    msgpack-c \
    msgpack-cpp \
-    mercurial \
    nodejs \
    openocd \
    pax-utils \
-    ipc-run \
+    php \
-    libdbi-perl \
-    libdev-checklib-perl \
-    libio-pty-perl \
-    libjson-perl \
-    libperlio-gzip-perl \
    ply \
-    protobuf-c \
+    poke \
    protobuf \
+    protobuf-c \
    pugixml \
    python3-distutils-extra \
    python3-pycups \
    rapidjson \
+    serialcheck \
    squashfs-tools-ng \
+    tclap \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "tk", "", d)} \
    uftrace \
+    uw-imap \
    valijson \
-    libxerces-c \
    xerces-c-samples \
    xmlrpc-c \
+    yajl \
    yasm \
-    json-schema-validator \
-    poke \
-    microsoft-gsl \
 "
 RDEPENDS:packagegroup-meta-oe-devtools:append:x86 = " cpuid msr-tools pahole pmtools"
 RDEPENDS:packagegroup-meta-oe-devtools:append:x86-64 = " cpuid msr-tools pahole pcimem pmtools"
@@ -332,110 +315,111 @@ RDEPENDS:packagegroup-meta-oe-devtools:remove:libc-musl:riscv32 = "php"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:aarch64 = "concurrencykit"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:x86 = "ply"
-RDEPENDS:packagegroup-meta-oe-extended ="\
+RDEPENDS:packagegroup-meta-oe-extended = "\
    bitwise \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \
    brotli \
    byacc \
+    can-utils \
+    canutils \
    cmatrix \
    cmpi-bindings \
    collectd \
    ddrescue \
    dialog \
-    duktape \
-    enscript \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnuplot", "", d)} \
    dlt-daemon \
    docopt.cpp \
-    iotop \
+    duktape \
    dumb-init \
-    konkretcmpi \
+    enscript \
    figlet \
-    libcec \
+    fluentbit \
-    libdivecomputer \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnuplot", "", d)} \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \
-    liblognorm \
-    libmodbus \
    haveged \
    hexedit \
    hiredis \
    hplip \
    hwloc \
-    libleak \
-    libuio \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \
-    libyang \
-    lprng \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "icewm", "", d)} \
-    md5deep \
    indent \
-    jansson \
+    iotop \
-    nana \
-    nicstat \
-    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "openwsman", "", d)} \
-    p7zip \
    isomd5sum \
+    jansson \
    jpnevulator \
-    ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-datetime polkit-group-rule-network polkit", "", d)} \
+    konkretcmpi \
-    rarpd \
-    redis \
-    libfastjson \
-    librelp \
-    sblim-cmpi-devel \
-    sblim-sfc-common \
-    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sblim-sfcb ", "", d)} \
-    sblim-sfcc \
    libblockdev \
-    sgpio \
+    libcec \
-    smartmontools \
-    can-utils \
-    canutils \
-    libsocketcan \
    libconfig \
-    linuxconsole \
+    libdivecomputer \
-    uml-utilities \
+    libfastjson \
+    libfile-fnmatch-perl \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \
    libidn \
-    libqb \
+    libleak \
-    wipe \
-    libzip \
-    zram \
-    libplist \
-    libusbmuxd \
    liblockfile \
    liblogging \
+    liblognorm \
+    libmodbus \
+    libplist \
    libpwquality \
+    libqb \
+    librelp \
    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "libreport", "", d)} \
    libserialport \
+    libsigrok \
+    libsigrokdecode \
+    libsocketcan \
    libstatgrab \
+    libuio \
+    libusbmuxd \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \
+    libyang \
+    libzip \
+    linuxconsole \
    lockfile-progs \
    logwatch \
+    lprng \
+    md5deep \
    mraa \
+    nana \
+    nicstat \
+    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "openwsman", "", d)} \
    ostree \
+    p7zip \
    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb pam-ssh-agent-auth", "", d)} \
    pegtl \
-    libfile-fnmatch-perl \
+    ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-datetime polkit-group-rule-network polkit", "", d)} \
+    rarpd \
+    redis \
+    redis-plus-plus \
    rrdtool \
    sanlock \
+    sblim-cmpi-devel \
+    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sblim-sfcb ", "", d)} \
+    sblim-sfcc \
+    sblim-sfc-common \
    scsirastools \
    sedutil \
-    libsigrok \
+    sgpio \
-    libsigrokdecode \
-    s-nail \
    sigrok-cli \
+    smartmontools \
+    s-nail \
    snappy \
    tipcutils \
    tiptop \
    tmate \
    tmux \
    triggerhappy \
+    uml-utilities \
    upm \
    vlock \
    volume-key \
+    wipe \
    wxwidgets \
    zlog \
+    zram \
    zstd \
    zsync-curl \
-    redis-plus-plus \
 "
 RDEPENDS:packagegroup-meta-oe-extended:append:libc-musl = " libexecinfo"
 RDEPENDS:packagegroup-meta-oe-extended:append:x86-64 = " pmdk libx86-1"
@@ -450,171 +434,177 @@ RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc64le = "upm mraa sysdig"
 RDEPENDS:packagegroup-meta-oe-extended:remove:riscv64 = "upm libleak mraa sysdig tiptop"
 RDEPENDS:packagegroup-meta-oe-extended:remove:riscv32 = "upm libleak mraa sysdig tiptop"
-RDEPENDS:packagegroup-meta-oe-extended-python2 ="\
+RDEPENDS:packagegroup-meta-oe-gnome = "\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'openlmi-tools', '', d), "", d)} \
-"
-RDEPENDS:packagegroup-meta-oe-gnome ="\
    atkmm \
    gcab \
-    gnome-common \
    gmime \
-    libjcat \
+    gnome-common \
+    gnome-theme-adwaita \
    gtk+ \
-    gtkmm3 \
    gtkmm \
+    gtkmm3 \
+    libjcat \
    ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libpeas", "", d)} \
    pyxdg \
-    gnome-theme-adwaita \
 "
-RDEPENDS:packagegroup-meta-oe-graphics ="\
+RDEPENDS:packagegroup-meta-oe-graphics = "\
+    bdftopcf \
    cairomm \
-    directfb-examples \
+    deqp-runner \
-    directfb \
-    fbgrab \
    dietsplash \
+    directfb \
+    directfb-examples \
    ${@bb.utils.contains("PACKAGE_CLASSES", "package_rpm", "dnfdragora", "", d)} \
-    fontforge \
+    fbgrab \
    fbida \
    feh \
+    font-adobe-100dpi \
+    font-adobe-utopia-100dpi \
+    font-bh-100dpi \
+    font-bh-lucidatypewriter-100dpi \
+    font-bitstream-100dpi \
+    font-cursor-misc \
+    fontforge \
+    font-misc-misc \
    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "freeglut", "", d)} \
    ftgl \
    fvwm \
-    gtkperf \
    gphoto2 \
-    imlib2 \
-    libgphoto2 \
    graphviz \
+    gtkperf \
    gtkwave \
+    iceauth \
+    imlib2 \
    jasper \
-    libforms \
-    lxdm \
-    numlockx \
-    nyancat \
-    obconf \
-    openbox \
-    packagegroup-fonts-truetype \
-    qrencode \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "st", "", d)} \
    leptonica \
-    libvncserver \
+    libforms \
+    libgphoto2 \
    libmng \
+    libsdl \
+    libsdl2-image \
+    libsdl2-mixer \
+    libsdl2-net \
+    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \
    libsdl-gfx \
    libsdl-image \
    libsdl-mixer \
    libsdl-net \
    libsdl-ttf \
-    libsdl2-image \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libvdpau vdpauinfo", "", d)} \
-    libsdl2-mixer \
+    libvncserver \
-    libsdl2-net \
+    libxaw6 \
-    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \
+    libxpresent \
-    libsdl \
+    libyui \
+    libyui-ncurses \
    lvgl \
-    ttf-arphic-uming \
+    lxdm \
-    ttf-droid-sans ttf-droid-sans-mono ttf-droid-sans-fallback ttf-droid-sans-japanese ttf-droid-serif \
+    numlockx \
-    ttf-abyssinica \
+    nyancat \
+    obconf \
+    openbox \
+    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \
+    openjpeg \
+    packagegroup-fonts-truetype \
+    pangomm \
+    parallel-deqp-runner \
+    qrencode \
+    sessreg \
+    setxkbmap \
+    source-code-pro-fonts \
    source-han-sans-cn-fonts \
    source-han-sans-jp-fonts \
    source-han-sans-kr-fonts \
    source-han-sans-tw-fonts \
-    source-code-pro-fonts \
+    spirv-shader-generator \
+    spirv-tools \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "st", "", d)} \
+    stalonetray \
+    surf \
+    terminus-font-consolefonts \
+    terminus-font-pcf \
+    tesseract \
+    tesseract-lang \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \
+    tslib \
+    ttf-abyssinica \
+    ttf-arphic-uming \
+    ttf-dejavu-common \
+    ttf-dejavu-mathtexgyre \
    ttf-dejavu-sans \
    ttf-dejavu-sans-condensed \
    ttf-dejavu-sans-mono \
    ttf-dejavu-serif \
    ttf-dejavu-serif-condensed \
-    ttf-dejavu-mathtexgyre \
+    ttf-droid-sans \
-    ttf-dejavu-common \
+    ttf-droid-sans-fallback \
+    ttf-droid-sans-japanese \
+    ttf-droid-sans-mono \
+    ttf-droid-serif \
    ttf-gentium \
    ttf-hunky-sans \
    ttf-hunky-serif \
-    ttf-ipag ttf-ipagp ttf-ipamp ttf-ipam \
-    ttf-lohit \
    ttf-inconsolata \
-    ttf-liberation-sans-narrow \
+    ttf-ipag \
+    ttf-ipagp \
+    ttf-ipam \
+    ttf-ipamp \
    ttf-liberation-mono \
    ttf-liberation-sans \
+    ttf-liberation-sans-narrow \
    ttf-liberation-serif \
    ttf-lklug \
+    ttf-lohit \
    ttf-noto-emoji-color \
    ttf-noto-emoji-regular \
+    ttf-pt-sans \
+    ttf-roboto \
    ttf-sazanami-gothic \
    ttf-sazanami-mincho \
-    ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho \
+    ttf-takao-gothic \
+    ttf-takao-mincho \
+    ttf-takao-pgothic \
+    ttf-takao-pmincho \
    ttf-tlwg \
-    ttf-roboto \
-    ttf-wqy-zenhei \
-    ttf-pt-sans \
-    ttf-vlgothic \
    ttf-ubuntu-mono \
    ttf-ubuntu-sans \
-    libyui-ncurses \
+    ttf-vlgothic \
-    libyui \
+    ttf-wqy-zenhei \
-    x11vnc \
-    terminus-font-consolefonts \
-    terminus-font-pcf \
-    xdotool \
-    xkbevd \
-    bdftopcf \
-    iceauth \
-    sessreg \
-    xgamma \
-    setxkbmap \
-    xkbutils \
    twm \
+    unclutter-xfixes \
+    ${@bb.utils.contains("DISTRO_FEATURES", "opengl vulkan", "vulkan-cts", "", d)} \
+    x11vnc \
+    xcb-util-cursor \
    xclock \
+    xcursorgen \
+    xdotool \
+    xf86-input-tslib \
+    xf86-input-void \
+    xf86-video-armsoc \
+    xf86-video-ati \
    xfontsel \
+    xgamma \
+    xkbevd \
    xkbprint \
+    xkbutils \
    xlsatoms \
    xlsclients \
    xlsfonts \
    xmag \
    xmessage \
+    xorg-fonts-100dpi \
+    xorg-sgml-doctools \
    xrdb \
    xrefresh \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \
+    xserver-common \
    xsetroot \
    xstdcmap \
    xterm \
    xwd \
    xwud \
-    xorg-sgml-doctools \
-    xf86-input-tslib \
-    xf86-input-void \
-    xf86-video-armsoc \
-    xf86-video-ati \
-    font-adobe-100dpi \
-    font-adobe-utopia-100dpi \
-    font-bh-100dpi \
-    font-bh-lucidatypewriter-100dpi \
-    font-bitstream-100dpi \
-    font-cursor-misc \
-    font-misc-misc \
-    xorg-fonts-100dpi \
-    libxaw6 \
-    libxpresent \
-    xcb-util-cursor \
-    xserver-common \
-    openjpeg \
-    pangomm \
-    spirv-shader-generator \
-    spirv-tools \
-    stalonetray \
-    surf \
-    tesseract-lang \
-    tesseract \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \
-    tslib \
-    unclutter-xfixes \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libvdpau vdpauinfo", "", d)} \
-    xcursorgen \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \
    yad \
    ydotool \
-    parallel-deqp-runner \
-    deqp-runner \
-    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \
-    ${@bb.utils.contains("DISTRO_FEATURES", "opengl vulkan", "vulkan-cts", "", d)} \
 "
 RDEPENDS:packagegroup-meta-oe-graphics:append:x86 = " renderdoc xf86-video-nouveau xf86-video-mga"
 RDEPENDS:packagegroup-meta-oe-graphics:append:x86-64 = " renderdoc xf86-video-nouveau xf86-video-mga"
@@ -623,12 +613,12 @@ RDEPENDS:packagegroup-meta-oe-graphics:append:aarch64 = " renderdoc"
 RDEPENDS:packagegroup-meta-oe-graphics:remove:libc-musl = "renderdoc"
-RDEPENDS:packagegroup-meta-oe-kernel ="\
+RDEPENDS:packagegroup-meta-oe-kernel = "\
    agent-proxy \
-    crash \
+    broadcom-bt-firmware \
    cpupower \
+    crash \
    ipmitool \
-    broadcom-bt-firmware \
    kernel-selftest \
    minicoredumper \
    oprofile \
@@ -645,280 +635,279 @@ RDEPENDS:packagegroup-meta-oe-kernel:append:powerpc64 = " libpfm4"
 RDEPENDS:packagegroup-meta-oe-kernel:remove = "kernel-selftest"
 RDEPENDS:packagegroup-meta-oe-kernel:remove:libc-musl = "bpftool crash intel-speed-select kernel-selftest minicoredumper turbostat"
-RDEPENDS:packagegroup-meta-oe-kernel:remove:mipsarcho32 = "makedumpfile"
 RDEPENDS:packagegroup-meta-oe-kernel:remove:mips64 = "crash"
 RDEPENDS:packagegroup-meta-oe-kernel:remove:mips64el = "crash"
 RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv64 = "crash oprofile"
-RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv32 = "crash makedumpfile oprofile"
+RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv32 = "crash oprofile"
-RDEPENDS:packagegroup-meta-oe-multimedia ="\
+RDEPENDS:packagegroup-meta-oe-multimedia = "\
-    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \
+    a2jmidid \
+    audiofile \
    dirsplit \
+    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \
    genisoimage \
    icedax \
-    wodim \
    id3lib \
-    audiofile \
-    a2jmidid \
    jack-server \
    jack-utils \
    libass \
-    libcdio-paranoia \
    libcdio \
+    libcdio-paranoia \
+    libdvdread \
    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libmad", "", d)} \
+    libmikmod \
    libmms \
-    libdvdread \
+    libmodplug \
    libopus \
+    libopusenc \
+    libvpx \
    live555-examples \
    live555-mediaserver \
-    libmikmod \
+    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "mpv", "", d)} \
-    libmodplug \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \
    sound-theme-freedesktop \
-    yavta \
    v4l-utils \
    wavpack \
-    libvpx \
+    wodim \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xsp", "", d)} \
-    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "mpv", "", d)} \
+    yavta \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \
-    libopusenc \
 "
-RDEPENDS:packagegroup-meta-oe-navigation ="\
+RDEPENDS:packagegroup-meta-oe-navigation = "\
+    geoclue \
    geos \
    ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \
-    geoclue \
    libspatialite \
    proj \
 "
-RDEPENDS:packagegroup-meta-oe-printing ="\
+RDEPENDS:packagegroup-meta-oe-printing = "\
    cups-filters \
    gutenprint \
    qpdf \
 "
-RDEPENDS:packagegroup-meta-oe-security ="\
+RDEPENDS:packagegroup-meta-oe-security = "\
+    auditd \
    keyutils \
    nmap \
    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "passwdqc", "", d)} \
    softhsm \
    tomoyo-tools \
-    auditd \
 "
-RDEPENDS:packagegroup-meta-oe-shells ="\
+RDEPENDS:packagegroup-meta-oe-shells = "\
    dash \
    mksh \
    tcsh \
    zsh \
 "
-RDEPENDS:packagegroup-meta-oe-support ="\
+RDEPENDS:packagegroup-meta-oe-support = "\
-    anthy \
-    atop \
    ace-cloud-editor \
-    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "driverctl", "", d)} \
+    anthy \
-    frame \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \
-    grail \
    asio \
+    atop \
    augeas \
    avro-c \
    bdwgc \
    c-ares \
+    ccid \
+    ckermit \
+    clinfo \
    cmark \
    ${@bb.utils.contains("DISTRO_FEATURES", "polkit gobject-introspection-data", "colord", "", d)} \
    consolation \
+    c-periphery \
    cpprest \
    ctapi-common \
+    daemonize \
+    daemontools \
+    devmem2 \
    dfu-util \
    dhex \
    digitemp \
    dool \
+    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "driverctl", "", d)} \
+    eject \
+    emacs \
+    enca \
+    epeg \
    espeak \
    evemu-tools \
    exiv2 \
-    libnice \
+    fbset \
-    c-periphery \
+    fbset-modes \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "fltk", "", d)} \
+    frame \
+    freerdp \
    function2 \
+    funyahoo-plusplus \
    gd \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \
+    gengetopt \
    gflags \
    glog \
+    googlebenchmark \
    gperftools \
    gpm \
+    gradm \
+    grail \
+    gsl \
    gsoap \
+    hddtemp \
    hdf5 \
+    hidapi \
    hstr \
    htop \
-    hunspell-dictionaries \
    hunspell \
+    hunspell-dictionaries \
    hwdata \
+    icyque \
    iksemel \
-    gengetopt \
-    googlebenchmark \
    imagemagick \
+    imapfilter \
    iniparser \
    inotify-tools \
    joe \
    lcms \
    lcov \
-    imapfilter \
+    libatasmart \
    libbytesize \
+    libcanberra \
+    libcereal \
    libcyusbserial \
+    libdevmapper \
    libestr \
    libfann \
    libftdi \
-    libjs-jquery-globalize \
-    libjs-jquery-cookie \
-    ccid \
-    zchunk \
-    libgpiod \
-    libmanette \
-    ckermit \
-    libcereal \
-    daemontools \
-    libiio \
-    devmem2 \
    libgit2 \
+    libgpiod \
+    libgusb \
    libharu \
-    eject \
+    libiio \
-    enca \
+    libinih \
-    epeg \
+    libjs-jquery-cookie \
+    libjs-jquery-globalize \
+    libjs-jquery-icheck \
+    libjs-sizzle \
+    libmanette \
+    libmicrohttpd \
+    libmimetic \
    libmxml \
-    fbset-modes \
+    libnice \
-    fbset \
+    liboauth \
    liboop \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "fltk", "", d)} \
+    libotr \
-    freerdp \
-    libgusb \
-    emacs \
    libp11 \
    libraw1394 \
-    gradm \
-    gsl \
    librsync \
-    hddtemp \
+    libsass \
-    hidapi \
+    libsmi \
    libsoc \
-    libmimetic \
+    libssh \
-    libinih \
+    libssh2 \
    libtar \
    libteam \
+    libtinyxml \
+    libtinyxml2 \
+    liburing \
    libusb-compat \
-    libatasmart \
+    libusbg \
-    libcanberra \
-    libssh \
-    libssh2 \
-    libusbgx-config \
    libusbgx \
+    libusbgx-config \
+    libutempter \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "links-x11", "links", d)} \
    lockdev \
+    log4c \
+    log4cpp \
    logwarn \
-    libjs-sizzle \
+    lvm2 \
    mailcap \
-    liboauth \
+    mbuffer \
    mg \
+    mime-support \
+    minini \
    monit \
    mscgen \
-    libsmi \
+    multipath-tools \
-    remmina \
+    nano \
    neon \
    nmon \
-    libjs-jquery-icheck \
-    libtinyxml \
-    libusbg \
-    libutempter \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "links-x11", "links", d)} \
-    log4c \
-    log4cpp \
    nspr \
-    libdevmapper \
-    lvm2 \
    nss \
-    mbuffer \
-    onig \
-    mime-support \
-    minini \
-    multipath-tools \
    numactl \
-    clinfo \
+    onig \
-    opencv \
-    opensc \
    openct \
+    opencv \
    openldap \
-    wbxml2 \
+    opensc \
    p910nd \
-    libtinyxml2 \
+    pcp \
+    pcsc-lite \
+    pcsc-tools \
    picocom \
-    funyahoo-plusplus \
-    icyque \
-    libotr \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pidgin-otr", "", d)} \
    pidgin \
-    purple-skypeweb \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pidgin-otr", "", d)} \
    pidgin-sipe \
    pngcheck \
    poco \
-    poppler-data \
    poppler \
+    poppler-data \
    portaudio-v19 \
+    pps-tools \
    procmail \
-    pxaregs \
+    purple-skypeweb \
    pv \
-    rsnapshot \
+    pxaregs \
-    pps-tools \
    raptor2 \
    rdfind \
    re2 \
+    read-edid \
+    remmina \
+    rsnapshot \
+    sassc \
+    satyr \
    sdmon \
    sdparm \
    serial-forward \
-    read-edid \
+    sg3-utils \
-    spitools \
+    sharutils \
-    libsass \
-    sassc \
    smarty \
+    spitools \
+    srecord \
+    ssiapi \
+    stm32flash \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "synergy", "", d)} \
    syslog-ng \
    system-config-keyboard \
    tbb \
-    satyr \
+    thin-provisioning-tools \
-    pcp \
+    tokyocabinet \
-    pcsc-lite \
-    pcsc-tools \
-    sharutils \
-    sg3-utils \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "uim", "", d)} \
-    uchardet \
-    srecord \
-    ssiapi \
    tree \
-    utouch-evemu \
+    uchardet \
-    utouch-frame \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "utouch-mtview", "", d)} \
    ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks2", "", d)} \
-    stm32flash \
-    tokyocabinet \
-    xmlstarlet \
-    thin-provisioning-tools \
    uhubctl \
-    zile \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "uim", "", d)} \
+    unicode-ucd \
    unixodbc \
-    daemonize \
    upower \
-    unicode-ucd \
-    xdelta3 \
    uriparser \
-    nano \
+    usb-modeswitch \
+    usb-modeswitch-data \
+    utouch-evemu \
+    utouch-frame \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "utouch-mtview", "", d)} \
+    wbxml2 \
+    xdelta3 \
    xdg-user-dirs \
    xmlsec1 \
-    usb-modeswitch-data \
+    xmlstarlet \
-    usb-modeswitch \
-    liburing \
-    zbar \
-    libmicrohttpd \
    yaml-cpp \
+    zbar \
+    zchunk \
+    zile \
 "
 RDEPENDS:packagegroup-meta-oe-support:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}"
 RDEPENDS:packagegroup-meta-oe-support:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}"
@@ -926,11 +915,7 @@ RDEPENDS:packagegroup-meta-oe-support:append:aarch64 = " ne10"
 RDEPENDS:packagegroup-meta-oe-support:append:x86 = " mcelog mce-inject mce-test vboxguestdrivers"
 RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = " mcelog mce-inject mce-test vboxguestdrivers"
-RDEPENDS:packagegroup-meta-oe-support-python2 ="\
+RDEPENDS:packagegroup-meta-oe-support:remove:arm = "numactl"
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'lio-utils', '', d), "", d)} \
-"
-RDEPENDS:packagegroup-meta-oe-support:remove:arm ="numactl"
 RDEPENDS:packagegroup-meta-oe-support:remove:mipsarch = "gperftools"
 RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim"
 RDEPENDS:packagegroup-meta-oe-support:remove:riscv32 = "gperftools uim"
@@ -939,7 +924,7 @@ RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "libcereal ssiapi"
 RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl = "pcp"
 RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl:powerpc = "gsl"
-RDEPENDS:packagegroup-meta-oe-test ="\
+RDEPENDS:packagegroup-meta-oe-test = "\
    bats \
    cmocka \
    cppunit \
@@ -962,18 +947,18 @@ RDEPENDS:packagegroup-meta-oe-test:remove:riscv64 = "fwts"
 RDEPENDS:packagegroup-meta-oe-test:remove:riscv32 = "fwts"
 RDEPENDS:packagegroup-meta-oe-ptest-packages = "\
-    zeromq-ptest \
+    cmocka-ptest \
+    hiredis-ptest \
    leveldb-ptest \
-    psqlodbc-ptest \
+    libteam-ptest \
+    minicoredumper-ptest \
+    oprofile-ptest \
+    poco-ptest \
    protobuf-ptest \
+    psqlodbc-ptest \
    rsyslog-ptest \
-    oprofile-ptest \
-    libteam-ptest \
    uthash-ptest \
-    poco-ptest \
+    zeromq-ptest \
-    cmocka-ptest \
-    minicoredumper-ptest \
-    hiredis-ptest \
 "
 RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86 = " mcelog-ptest"
 RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86-64 = " mcelog-ptest"
diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb
index 54b47ea3f..60bf501eb 100644
--- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb
+++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb
@@ -53,7 +53,7 @@ PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup"
 PACKAGECONFIG[luks2-reencryption] = "--enable-luks2-reencryption,--disable-luks2-reencryption"
 PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux"
-PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2-udevrules"
+PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2"
 PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto"
 # gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't
 # recognized.
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index ae6581ec7..39c9f4c9d 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -23,6 +23,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
           file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
           file://lfs64.patch \
           file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
+           file://0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch \
          "
 SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
 SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20"
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch
new file mode 100644
index 000000000..416b17ba2
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch
@@ -0,0 +1,26 @@
+From 713c21880e25108bf0703433432acca58377cc7b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 27 Sep 2024 11:55:53 -0700
+Subject: [PATCH] Use a lambda function as deleter prototype in unique_ptr
+Fixes build with clang/libc++ 20+
+Upstream-Status: Submitted [https://jira.mariadb.org/browse/MDEV-35040]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ extra/mariabackup/backup_copy.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
+index a328f5e0ec7..2ab04b78bce 100644
+--- a/extra/mariabackup/backup_copy.cc
+++ b/extra/mariabackup/backup_copy.cc
+@@ -1641,7 +1641,7 @@ is_aria_log_dir_file(const datadir_node_t &node)
+ bool
+ copy_back_aria_logs(const char *dstdir)
+ {
+-  std::unique_ptr<ds_ctxt_t, void (&)(ds_ctxt_t*)>
+  std::unique_ptr<ds_ctxt_t, std::function<void(ds_ctxt_t*)>>
+     ds_ctxt_aria_log_dir_path(ds_create(dstdir, DS_TYPE_LOCAL), ds_destroy);
+ 
+   datadir_node_t node;
diff --git a/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch b/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch
deleted file mode 100644
index 173241ea5..000000000
--- a/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 45436592aa64308b2ab46f84c6107c6d7de0a3ec Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Wed, 6 Mar 2019 00:16:17 -0800
-Subject: [PATCH] _mysql.c: fix compilation with MariaDB 10.3.13
-Use standard API function MYSQL_OPT_RECONNECT
-instead of direct modification of internal structures
-which does not work for MariaDB.
-Upstream-Status: Pending
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
- _mysql.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
--- a/_mysql.c
-+++ b/_mysql.c
-@@ -2002,7 +2002,14 @@ _mysql_ConnectionObject_ping(
-        int r, reconnect = -1;
-        if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL;
-        check_connection(self);
-       if ( reconnect != -1 ) self->connection.reconnect = reconnect;
-+       if ( reconnect != -1 ) {
-+#if MYSQL_VERSION_ID >= 50013
-+               my_bool recon = reconnect;
-+               mysql_options(&self->connection, MYSQL_OPT_RECONNECT, &recon);
-+#else
-+               self->connection.reconnect = reconnect;
-+#endif
-+        }
-        Py_BEGIN_ALLOW_THREADS
-        r = mysql_ping(&(self->connection));
-        Py_END_ALLOW_THREADS
diff --git a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
deleted file mode 100644
index 15f6b6fb9..000000000
--- a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Python interface to MySQL"
-HOMEPAGE = "https://github.com/farcepest/MySQLdb1"
-SECTION = "devel/python"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "mysql5"
-SRCNAME = "MySQL-python"
-SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip \
-           file://0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch \
-"
-SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c"
-SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-SKIP_RECIPE[mysql-python] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}"
-inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)}
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch b/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch
new file mode 100644
index 000000000..89a509087
--- /dev/null
+++ b/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch
@@ -0,0 +1,26 @@
+From f0d8240dbf594e6dfab31fd7d70ce340ac365a65 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 3 Nov 2024 15:50:50 -0800
+Subject: [PATCH] tcl.m4: Recognize tclsh9
+Add missing support to recognize tclsh9 as supported
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ config/tcl.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/config/tcl.m4 b/config/tcl.m4
+index 9de31a5..568fd45 100644
+--- a/config/tcl.m4
+++ b/config/tcl.m4
+@@ -4,7 +4,7 @@
+ 
+ 
+ AC_DEFUN([PGAC_PATH_TCLSH],
+-[PGAC_PATH_PROGS(TCLSH, [tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84])
+[PGAC_PATH_PROGS(TCLSH, [tclsh tcl tclsh9.0 tclsh90 tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84])
+ AC_ARG_VAR(TCLSH, [Tcl interpreter program (tclsh)])dnl
+ if test x"$TCLSH" = x""; then
+   AC_MSG_ERROR([Tcl shell not found])
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc
index 4fc2e47b3..e19f2f48e 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql.inc
+++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc
@@ -39,7 +39,7 @@ export LDFLAGS_EX_BE = "-Wl,--export-dynamic"
 inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext perl-version multilib_header
-CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6"
+CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR}"
 SYSTEMD_SERVICE:${PN} = "postgresql.service"
 SYSTEMD_AUTO_ENABLE:${PN} = "disable"
@@ -55,7 +55,7 @@ pkg_postinst:${PN} () {
 PACKAGECONFIG ??= " \
    ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \
-    openssl python uuid libxml tcl perl zlib icu readline \
+    openssl python uuid libxml perl zlib icu readline \
 "
 PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native,"
 PACKAGECONFIG[perl] = "--with-perl,--without-perl,perl,perl"
@@ -242,7 +242,7 @@ postgresql_fix_sources () {
        for f in ${PKGD}${TARGET_DBGSRC_DIR}/src/pl/plperl/Util.c \
                        ${PKGD}${TARGET_DBGSRC_DIR}/src/pl/plperl/SPI.c; do
                if [ -e $f ]; then
-                        sed -i -e 's#${B}/../${P}#${TARGET_DBGSRC_DIR}#g' $f
+                        sed -i -e 's#${B}/../${BP}#${TARGET_DBGSRC_DIR}#g' $f
                fi
        done
 }
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb b/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb
index 1a47369e4..7135263da 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb
+++ b/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb
@@ -9,6 +9,7 @@ SRC_URI += "\
   file://0003-configure.ac-bypass-autoconf-2.69-version-check.patch \
   file://0004-config_info.c-not-expose-build-info.patch \
   file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \
+   file://0001-tcl.m4-Recognize-tclsh9.patch \
 "
 SRC_URI[sha256sum] = "971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f"
diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
index a1ef8e75e..d3b3ea510 100644
--- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
+++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
@@ -19,7 +19,7 @@ HOMEPAGE = "https://odbc.postgresql.org/"
 LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692"
-SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \
+SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions.old/src/${BPN}-${PV}.tar.gz \
    file://psqlodbc-remove-some-checks-for-cross-compiling.patch \
    file://psqlodbc-donot-use-the-hardcode-libdir.patch \
    file://psqlodbc-fix-for-ptest-support.patch \
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch
new file mode 100644
index 000000000..b0a949fe3
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch
@@ -0,0 +1,42 @@
+From 9abf6cd09c60f0be9a85c055dfdf43698f057f73 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Wed, 25 Sep 2024 13:47:37 +0800
+Subject: [PATCH] CMakeLists.txt: Make the test discovery occur on target
+Set DISCOVERY_MODE to PRE_TEST to delay test discovery until just
+prior to test execution on the target to fix the build failure as
+the default POST_BUILD behavior is not desirable in cross-compiling
+env.
+/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build/env_basic_test: error while loading shared libraries: libgflags.so.2.2: cannot open shared object file: No such file or directory
+CMake Error at /build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/recipe-sysroot-native/usr/share/cmake-3.30/Modules/GoogleTestAddTests.cmake:112 (message):
+  Error running test executable.
+    Path: '/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build/env_basic_test'
+    Working directory: '/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build'
+    Result: 127
+    Output:
+Upstream-Status: Inappropriate [oe specific]
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 403ad1243..f34397798 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1502,7 +1502,7 @@ if(WITH_TESTS)
+       )
+       target_link_libraries(${exename}${ARTIFACT_SUFFIX} testutillib${ARTIFACT_SUFFIX} testharness gtest ${THIRDPARTY_LIBS} ${ROCKSDB_LIB})
+       if(NOT "${exename}" MATCHES "db_sanity_test")
+-        gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120)
+        gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120 DISCOVERY_MODE PRE_TEST)
+         add_dependencies(rocksdb_check ${exename}${ARTIFACT_SUFFIX})
+       endif()
+   endforeach(sourcefile ${TESTS})
+-- 
+2.34.1
diff --git a/meta-oe/recipes-dbs/rocksdb/files/run-ptest b/meta-oe/recipes-dbs/rocksdb/files/run-ptest
new file mode 100644
index 000000000..45406fdfa
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/run-ptest
@@ -0,0 +1,12 @@
+#!/bin/sh
+ptestdir=$(dirname "$(readlink -f "$0")")
+cd "$ptestdir"/tests || exit
+for test in *_test; do
+    if ./${test} >/dev/null 2>&1; then
+        echo "PASS: ${test}"
+    else
+        echo "FAIL: ${test}"
+    fi
+done
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb
index fae54fdba..57d163bfc 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb
@@ -18,6 +18,8 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt
           file://0006-Implement-timer-for-arm-v6.patch \
           file://0007-Fix-declaration-scope-of-LE_LOAD32-in-crc32c.patch \
           file://static_library_as_option.patch \
+           file://0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch \
+           file://run-ptest \
          "
 SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch"
@@ -27,7 +29,7 @@ SRC_URI:remove:toolchain-clang:riscv32 = "file://0001-replace-old-sync-with-new-
 S = "${WORKDIR}/git"
-inherit cmake
+inherit cmake ptest
 PACKAGECONFIG ??= "bzip2 zlib lz4 gflags"
 PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON,-DWITH_BZ2=OFF,bzip2"
@@ -40,7 +42,7 @@ PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags"
 # Tools and tests currently don't compile on armv5 so we disable them
 EXTRA_OECMAKE = "\
    -DPORTABLE=ON \
-    -DWITH_TESTS=OFF \
+    -DWITH_TESTS=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "ON", "OFF", d)} \
    -DWITH_BENCHMARK_TOOLS=OFF \
    -DWITH_TOOLS=OFF \
    -DFAIL_ON_WARNINGS=OFF \
@@ -54,6 +56,21 @@ do_install:append() {
    sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/rocksdb/RocksDBTargets.cmake
 }
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    # only cover the basic test as all the tests need to take about 6 hours
+    # time ./run-ptest
+    # real    356m32.956s
+    # user    252m32.004s
+    # sys 178m50.246s
+    install -m 0755 ${B}/env_basic_test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/db_basic_test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/agg_merge_test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/testutil_test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/cache_test ${D}${PTEST_PATH}/tests/
+}
 # Need toku_time_now() implemented for ppc/musl
 # see utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
 COMPATIBLE_HOST:libc-musl:powerpc = "null"
+COMPATIBLE_HOST:armv5 = 'null'
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch
index 5242b29e0..6fecf2560 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch
@@ -1,7 +1,7 @@
-From 738549dea7a4e6c462a79962c414eaa450c2cffd Mon Sep 17 00:00:00 2001
+From 11faa06436fdeb0c9948080a11f9a99d3b5ba16c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 9 Apr 2020 13:06:27 -0700
-Subject: [PATCH 1/3] absl: always use <asm/sgidefs.h>
+Subject: [PATCH] absl: always use <asm/sgidefs.h>
 Fixes mips/musl build, since sgidefs.h is not present on all C libraries
 but on linux asm/sgidefs.h is there and contains same definitions, using
@@ -10,13 +10,12 @@ that makes it portable.
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 absl/base/internal/direct_mmap.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
 diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h
-index e492bb0..c8a4fba 100644
+index 1beb2ee4..140b0697 100644
 --- a/absl/base/internal/direct_mmap.h
 +++ b/absl/base/internal/direct_mmap.h
 @@ -41,13 +41,9 @@
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch
index b92a48752..d49e860f2 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch
@@ -1,20 +1,19 @@
-From d25cf3b9aa873595a19e197cc29ab46c0093bff1 Mon Sep 17 00:00:00 2001
+From a573ccd57e713486e7d8e782d6b3b34fde01ff9e Mon Sep 17 00:00:00 2001
 From: Sinan Kaya <sinan.kaya@microsoft.com>
 Date: Mon, 3 Feb 2020 03:25:57 +0000
-Subject: [PATCH 2/3] Remove maes option from cross-compilation
+Subject: [PATCH] Remove maes option from cross-compilation
---
 Upstream-Status: Pending
+---
 absl/copts/GENERATED_AbseilCopts.cmake | 4 ----
 absl/copts/GENERATED_copts.bzl         | 4 ----
 2 files changed, 8 deletions(-)
 diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
-index a4ab1aa2041e..23b9253c1f00 100644
+index da2282fe..5e0e8dfd 100644
 --- a/absl/copts/GENERATED_AbseilCopts.cmake
 +++ b/absl/copts/GENERATED_AbseilCopts.cmake
-@@ -158,7 +158,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS
+@@ -229,7 +229,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS
 list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS
 )
 
@@ -23,10 +22,10 @@ index a4ab1aa2041e..23b9253c1f00 100644
 -    "-msse4.1"
 -)
 diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
-index a6efc98e11d4..1e847f769501 100644
+index b9e0071e..0072008c 100644
 --- a/absl/copts/GENERATED_copts.bzl
 +++ b/absl/copts/GENERATED_copts.bzl
-@@ -159,7 +159,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [
+@@ -230,7 +230,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [
 ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [
 ]
 
@@ -35,5 +34,5 @@ index a6efc98e11d4..1e847f769501 100644
 -    "-msse4.1",
 -]
 -- 
-2.36.1
+2.25.1
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch
index 1a80a428b..c82b9e1b5 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch
@@ -1,24 +1,24 @@
-From fb24c3e3539b5743d398a429a302a3886186f261 Mon Sep 17 00:00:00 2001
+From 632632508daf8bb3a5800dac937ffc33c6d85973 Mon Sep 17 00:00:00 2001
 From: Jonas Gorski <jonas.gorski@bisdn.de>
 Date: Thu, 16 Jun 2022 11:46:31 +0000
-Subject: [PATCH 3/3] Remove neon option from cross compilation
+Subject: [PATCH] Remove neon option from cross compilation
 Not every arm platform supports neon instructions, so do not enforce
 them.
-Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
---
 Upstream-Status: Pending
+Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
+---
 absl/copts/GENERATED_AbseilCopts.cmake | 4 ----
 absl/copts/GENERATED_copts.bzl         | 4 ----
 2 files changed, 8 deletions(-)
 diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
-index 23b9253c1f00..5d112a97f3e4 100644
+index 5e0e8dfd..57cfc4d3 100644
 --- a/absl/copts/GENERATED_AbseilCopts.cmake
 +++ b/absl/copts/GENERATED_AbseilCopts.cmake
-@@ -147,10 +147,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS
+@@ -218,10 +218,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS
     "/DNOMINMAX"
 )
 
@@ -30,10 +30,10 @@ index 23b9253c1f00..5d112a97f3e4 100644
     "-march=armv8-a+crypto"
 )
 diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
-index 1e847f769501..3e10db204faf 100644
+index 0072008c..72840fda 100644
 --- a/absl/copts/GENERATED_copts.bzl
 +++ b/absl/copts/GENERATED_copts.bzl
-@@ -148,10 +148,6 @@ ABSL_MSVC_TEST_FLAGS = [
+@@ -219,10 +219,6 @@ ABSL_MSVC_TEST_FLAGS = [
     "/DNOMINMAX",
 ]
 
@@ -45,5 +45,5 @@ index 1e847f769501..3e10db204faf 100644
     "-march=armv8-a+crypto",
 ]
 -- 
-2.36.1
+2.25.1
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch
deleted file mode 100644
index 461df7a60..000000000
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001
-From: aurel32 <aurelien@aurel32.net>
-Date: Fri, 22 Mar 2024 14:21:13 -0700
-Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support
-Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644
-Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear.
-The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2].
-Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units.
-This fixes the testsuite on riscv64, tested on a VisionFive 2 board.
-[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3
-[2] https://github.com/abseil/abseil-cpp/pull/1631
-Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1
-Merging this change closes #1644
-COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71
-PiperOrigin-RevId: 618286262
-Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652
-Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/7335a36d]
-[Adapted to apply on top of meta-oe's patch stack]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
- absl/base/internal/unscaledcycleclock.cc       | 12 ------------
- absl/base/internal/unscaledcycleclock_config.h |  5 ++---
- 2 files changed, 2 insertions(+), 15 deletions(-)
-diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc
-index f11fecb3..103b4f6a 100644
--- a/absl/base/internal/unscaledcycleclock.cc
-+++ b/absl/base/internal/unscaledcycleclock.cc
-@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() {
-   return aarch64_timer_frequency;
- }
- 
-#elif defined(__riscv)
-
-int64_t UnscaledCycleClock::Now() {
-  int64_t virtual_timer_value;
-  asm volatile("rdcycle %0" : "=r"(virtual_timer_value));
-  return virtual_timer_value;
-}
-
-double UnscaledCycleClock::Frequency() {
-  return base_internal::NominalCPUFrequency();
-}
-
- #elif defined(_M_IX86) || defined(_M_X64)
- 
- #pragma intrinsic(__rdtsc)
-diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h
-index 5e232c1a..83552fc5 100644
--- a/absl/base/internal/unscaledcycleclock_config.h
-+++ b/absl/base/internal/unscaledcycleclock_config.h
-@@ -22,7 +22,6 @@
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-     ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-    defined(__riscv) ||     \
-     defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
-@@ -54,8 +53,8 @@
- #if ABSL_USE_UNSCALED_CYCLECLOCK
- // This macro can be used to test if UnscaledCycleClock::Frequency()
- // is NominalCPUFrequency() on a particular platform.
-#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \
-     defined(_M_IX86) || defined(_M_X64))
-+#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \
-+     defined(_M_X64))
- #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY
- #endif
- #endif
-- 
-2.44.0
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-abseil-ppc-fixes.patch
index f2ebd9f08..ba0cd6692 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-abseil-ppc-fixes.patch
@@ -1,4 +1,7 @@
-Upstream-Status: Pending
+From f9607924225ca59fb6c60222e6424b84e6f70029 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 21 Sep 2024 20:53:06 +0800
+Subject: [PATCH] abseil: ppc fixes
 An all-in-one patch that fixes several issues:
@@ -9,14 +12,24 @@ An all-in-one patch that fixes several issues:
 Sourced from void linux
+Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ absl/base/internal/unscaledcycleclock.cc       | 4 ++--
+ absl/base/internal/unscaledcycleclock_config.h | 3 ++-
+ absl/debugging/internal/examine_stack.cc       | 8 +++++++-
+ absl/debugging/internal/stacktrace_config.h    | 2 +-
+ 4 files changed, 12 insertions(+), 5 deletions(-)
+diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc
+index a0bf3a65..103b4f6a 100644
 --- a/absl/base/internal/unscaledcycleclock.cc
 +++ b/absl/base/internal/unscaledcycleclock.cc
 @@ -20,7 +20,7 @@
 #include <intrin.h>
 #endif
+ 
 -#if defined(__powerpc__) || defined(__ppc__)
 +#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
 #ifdef __GLIBC__
@@ -25,30 +38,34 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 @@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() {
   return base_internal::NominalCPUFrequency();
 }
+ 
 -#elif defined(__powerpc__) || defined(__ppc__)
 +#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
+ 
 int64_t UnscaledCycleClock::Now() {
 #ifdef __GLIBC__
+diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h
+index 43a3dabe..196a8535 100644
 --- a/absl/base/internal/unscaledcycleclock_config.h
 +++ b/absl/base/internal/unscaledcycleclock_config.h
 @@ -21,7 +21,8 @@
+ 
 // The following platforms have an implementation of a hardware counter.
 #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
+-    defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) ||     \
 +    ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-+    defined(__riscv) ||     \
+    defined(_M_IX86) ||     \
-     defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+     (defined(_M_X64) && !defined(_M_ARM64EC))
 #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
 #else
+diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc
+index 3dd6ba1a..f923b055 100644
 --- a/absl/debugging/internal/examine_stack.cc
 +++ b/absl/debugging/internal/examine_stack.cc
-@@ -33,6 +33,10 @@
+@@ -36,6 +36,10 @@
 #include <csignal>
 #include <cstdio>
+ 
 +#if defined(__powerpc__)
 +#include <asm/ptrace.h>
 +#endif
@@ -56,7 +73,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 #include "absl/base/attributes.h"
 #include "absl/base/internal/raw_logging.h"
 #include "absl/base/macros.h"
-@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) {
+@@ -177,8 +181,10 @@ void* GetProgramCounter(void* const vuc) {
     return reinterpret_cast<void*>(context->uc_mcontext.pc);
 #elif defined(__powerpc64__)
     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
@@ -68,6 +85,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 #elif defined(__riscv)
     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
 #elif defined(__s390__) && !defined(__s390x__)
+diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h
+index 3929b1b7..23d5e504 100644
 --- a/absl/debugging/internal/stacktrace_config.h
 +++ b/absl/debugging/internal/stacktrace_config.h
 @@ -60,7 +60,7 @@
@@ -79,3 +98,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 #define ABSL_STACKTRACE_INL_HEADER \
   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
 #elif defined(__aarch64__)
+-- 
+2.25.1
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch
new file mode 100644
index 000000000..9a4fc0b43
--- /dev/null
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch
@@ -0,0 +1,30 @@
+From 9cb5e5d15c142e5cc43a2c1db87c8e4e5b6d38a5 Mon Sep 17 00:00:00 2001
+From: Derek Mauro <dmauro@google.com>
+Date: Mon, 5 Aug 2024 07:35:05 -0700
+Subject: [PATCH] Don't match -Wnon-virtual-dtor in the "flags are needed to
+ suppress warnings in headers". It should fall through to the "don't impose
+ our warnings on others" case. Do this by matching on "-Wno-*" instead of
+ "-Wno*".
+Fixes #1737
+PiperOrigin-RevId: 659548798
+Change-Id: I49d7ba7ddcd7be30f946fca90ba9be467181e854
+Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/9cb5e5d15c142e5cc43a2c1db87c8e4e5b6d38a5]
+---
+ CMake/AbseilHelpers.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
+index b177e590..3c4c92fe 100644
+--- a/CMake/AbseilHelpers.cmake
+++ b/CMake/AbseilHelpers.cmake
+@@ -195,7 +195,7 @@ function(absl_cc_library)
+         # specified platform. Filter both of them out before the successor
+         # reaches the "^-m" filter.
+         set(skip_next_cflag ON)
+-      elseif(${cflag} MATCHES "^(-Wno|/wd)")
+      elseif(${cflag} MATCHES "^(-Wno-|/wd)")
+         # These flags are needed to suppress warnings that might fire in our headers.
+         set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
+       elseif(${cflag} MATCHES "^(-W|/w[1234eo])")
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb
index 87ab23931..d9634b2b0 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb
@@ -7,14 +7,14 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915"
-SRCREV = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a"
+SRCREV = "4447c7562e3bc702ade25105912dce503f0c4010"
-BRANCH = "lts_2024_01_16"
+BRANCH = "lts_2024_07_22"
 SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \
           file://0001-absl-always-use-asm-sgidefs.h.patch             \
           file://0002-Remove-maes-option-from-cross-compilation.patch \
-           file://abseil-ppc-fixes.patch \
           file://0003-Remove-neon-option-from-cross-compilation.patch \
-           file://0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \
+           file://0004-abseil-ppc-fixes.patch \
+           file://0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch \
          "
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb b/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
index cb4aef522..daeeb975f 100644
--- a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
+++ b/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
@@ -12,6 +12,8 @@ S = "${WORKDIR}/git/c++"
 inherit cmake
+CVE_PRODUCT = "capnproto capnp"
 CXXFLAGS:append:mips = " -latomic"
 CXXFLAGS:append:powerpc = " -latomic"
 CXXFLAGS:append:riscv32 = " -latomic"
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240908.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.1.20241006.0.bb
index 01e7e5e3f..90b0e2cb4 100644
--- a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240908.0.bb
+++ b/meta-oe/recipes-devtools/ctags/ctags_6.1.20241006.0.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 inherit autotools-brokensep pkgconfig manpages
-SRCREV = "0a2ad188848b75f56bb2af33bcf556bd7cf422ed"
+SRCREV = "ecf0c4adcce9853d666590bf2be101f983bad1cf"
 SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
deleted file mode 100644
index 47c8edb49..000000000
--- a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 24650b0c7db6b213a2eaa5061b75b9f1b43f1ce9 Mon Sep 17 00:00:00 2001
-From: Bartosz Golaszewski <brgl@bgdev.pl>
-Date: Fri, 23 Nov 2018 11:44:56 +0100
-Subject: [PATCH] build: don't look for Iconv
-Drop the find_package() for Iconv. CMake is unable to find iconv.h in
-native build but all modern systems supply it as part of the standard
-C library. We don't need this check in meta-openembedded.
-Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
-Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
-Upstream-Status: Inappropriate
- upstream doxygen must build on many architectures, this change is
-  too intrusive for upstream
---
- CMakeLists.txt | 4 ----
- 1 file changed, 4 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 06b9696f..f30b46b8 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,10 +117,6 @@ if (sqlite3)
-   endif()
- endif()
- 
-find_package(Iconv REQUIRED)
-include_directories(${ICONV_INCLUDE_DIR})
-
-
- #set(DOXYDOCS ${PROJECT_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs")
- set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc)
- set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS})
-- 
-2.27.0
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
deleted file mode 100644
index 796bc61dd..000000000
--- a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From daf686508f2ee4711d93e96e5b100e50bf161656 Mon Sep 17 00:00:00 2001
-From: Leon Anavi <leon.anavi@konsulko.com>
-Date: Wed, 26 Aug 2020 10:52:10 +0300
-Subject: [PATCH] doxygen: Fix Python issues for doxygen-native
-It fails to compile doxygen-native when /usr/bin/python is a link
-to python3 on build host:
-| Failed to import the site module
-| Traceback (most recent call last):
-|   File "/usr/lib64/python3.6/site.py", line 564, in <module>
-|     main()
-|   File "/usr/lib64/python3.6/site.py", line 550, in main
-|     known_paths = addusersitepackages(known_paths)
-|   File "/usr/lib64/python3.6/site.py", line 282, in addusersitepackages
-|     user_site = getusersitepackages()
-|   File "/usr/lib64/python3.6/site.py", line 258, in getusersitepackages
-|     user_base = getuserbase() # this will also set USER_BASE
-|   File "/usr/lib64/python3.6/site.py", line 248, in getuserbase
-|     USER_BASE = get_config_var('userbase')
-|   File "/usr/lib64/python3.6/sysconfig.py", line 604, in get_config_var
-|     return get_config_vars().get(name)
-|   File "/usr/lib64/python3.6/sysconfig.py", line 553, in get_config_vars
-|     _init_posix(_CONFIG_VARS)
-|   File "/usr/lib64/python3.6/sysconfig.py", line 424, in _init_posix
-|     _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
-| ModuleNotFoundError: No module named '_sysconfigdata'
-Replace find_package PythonInterp with Python3 to fix this issue
-that it uses python3 from python3-native. And it also replaces the
-result variable PYTHON_EXECUTABLE with Python3_EXECUTABLE.
-This patch is only needded by doxygen-native.
-Updated to apply to release 1.9.1.
-Upstream-Status: Inappropriate [oe specific]
-Co-Authored-By: Kai Kang <kai.kang@windriver.com>
-Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
-Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
- CMakeLists.txt                  |  2 +-
- addon/doxywizard/CMakeLists.txt |  6 +++---
- doc/CMakeLists.txt              |  6 +++---
- examples/CMakeLists.txt         |  4 ++--
- libmscgen/CMakeLists.txt        |  2 +-
- src/CMakeLists.txt              | 10 +++++-----
- testing/CMakeLists.txt          |  4 ++--
- 7 files changed, 17 insertions(+), 17 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2455793..28f0d83 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -105,7 +105,7 @@ else ()
- endif ()
- 
- find_program(DOT NAMES dot)
-find_package(PythonInterp REQUIRED)
-+find_package(Python3 REQUIRED)
- find_package(FLEX REQUIRED)
- find_package(BISON REQUIRED)
- if (BISON_VERSION VERSION_LESS 2.7)
-diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
-index 63ac8e3..d37d1d0 100644
--- a/addon/doxywizard/CMakeLists.txt
-+++ b/addon/doxywizard/CMakeLists.txt
-@@ -57,7 +57,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA
- 
- # generate version.cpp
- add_custom_command(
-    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
-+    COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
-     DEPENDS ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/src/version.py
-     OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp
- )
-@@ -65,7 +65,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER
- 
- # generate configdoc.cpp
- add_custom_command(
-    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
-+    COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
-     DEPENDS  ${PROJECT_SOURCE_DIR}/src/configgen.py ${PROJECT_SOURCE_DIR}/src/config.xml
-     OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp
- )
-@@ -74,7 +74,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN
- set(LEX_FILES config_doxyw)
- foreach(lex_file ${LEX_FILES})
-     add_custom_command(
-        COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
-+        COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
-         DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l
-         OUTPUT  ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
-     )
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index ec63ceb..49a2bda 100644
--- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -168,7 +168,7 @@ configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1      ${PROJECT_BINARY_DIR
- 
- # doc/language.doc (see tag Doxyfile:INPUT)
- add_custom_command(
-        COMMAND ${PYTHON_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR}
-+        COMMAND ${Python3_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR}
-         DEPENDS ${PROJECT_SOURCE_DIR}/doc/maintainers.txt ${PROJECT_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES}
-         OUTPUT language.doc
-         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc
-@@ -177,7 +177,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1)
- 
- # doc/config.doc (see tag Doxyfile:INPUT)
- add_custom_command(
-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/src/configgen.py -doc ${TOP}/src/config.xml > config.doc
-+        COMMAND ${Python3_EXECUTABLE}  ${TOP}/src/configgen.py -doc ${TOP}/src/config.xml > config.doc
-         DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py
-         OUTPUT config.doc
-         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/
-@@ -228,7 +228,7 @@ add_custom_target(docs_chm
-     COMMAND ${CMAKE_COMMAND} -E echo "    for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
-     COMMAND ${CMAKE_COMMAND} -E echo "        if file.endswith('.html') or file.endswith('.png') or file.endswith('.css') or file.endswith('.gif'):" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
-     COMMAND ${CMAKE_COMMAND} -E echo "            print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
-    COMMAND ${CMAKE_COMMAND} -E chdir  ${PROJECT_BINARY_DIR}/chm ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual.hhp
-+    COMMAND ${CMAKE_COMMAND} -E chdir  ${PROJECT_BINARY_DIR}/chm ${Python3_EXECUTABLE} ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual.hhp
-     COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/chm "${HTML_HELP_COMPILER}" doxygen_manual.hhp || echo > nul
-     COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm
-         DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 194b427..248b807 100644
--- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -54,7 +54,7 @@ foreach (f_inp  ${BASIC_EXAMPLES})
-         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/${f}
-         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/${f}
-        COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen ${f}.cfg
-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
-+        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
-        DEPENDS doxygen ${f}.${f_ext} ${f}.cfg ${TOP}/examples/strip_example.py
-        OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
-     )
-@@ -73,7 +73,7 @@ if (DOT)
-         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/diagrams
-         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/diagrams
-        COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg
-        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
-+        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
-        DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py
-        OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
-   )
-diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt
-index 34cf4d8..f015afc 100644
--- a/libmscgen/CMakeLists.txt
-+++ b/libmscgen/CMakeLists.txt
-@@ -7,7 +7,7 @@ include_directories(
- set(LEX_FILES mscgen_lexer) 
- foreach(lex_file ${LEX_FILES})
-     add_custom_command(
-        COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
-+        COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
-         DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l
-         OUTPUT  ${GENERATED_SRC}/${lex_file}.l.h
-     )
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0e0c5f7..c1d3ca5 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -40,7 +40,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1)
- 
- # configvalues.h
- add_custom_command(
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maph ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.h
-+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maph ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.h
-     DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
-     OUTPUT ${GENERATED_SRC}/configvalues.h
- )
-@@ -52,7 +52,7 @@ add_custom_target(
- 
- # configvalues.cpp
- add_custom_command(
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maps ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.cpp
-+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maps ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.cpp
-     DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
-     OUTPUT ${GENERATED_SRC}/configvalues.cpp
- )
-@@ -60,7 +60,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT
- 
- # configoptions.cpp
- add_custom_command(
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -cpp ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configoptions.cpp
-+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -cpp ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configoptions.cpp
-     DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
-     OUTPUT ${GENERATED_SRC}/configoptions.cpp
- )
-@@ -95,7 +95,7 @@ endif()
- # resources.cpp
- add_custom_command(
-     COMMENT  "Generating ${GENERATED_SRC}/resources.cpp"
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
-+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
-     DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py
-     OUTPUT ${GENERATED_SRC}/resources.cpp
- )
-@@ -126,7 +126,7 @@ foreach(lex_file ${LEX_FILES})
-     set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files")
-     set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files")
-     add_custom_command(
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
-+        COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
-         DEPENDS ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l
-         OUTPUT  ${GENERATED_SRC}/${lex_file}.l.h
-     )
-diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
-index fd6912e..0af1865 100644
--- a/testing/CMakeLists.txt
-+++ b/testing/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # run all tests sequentially (keep for backward compatibility)
- add_custom_target(tests
-        COMMENT "Running doxygen tests..."
-       COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
-+       COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
-        DEPENDS doxygen
- )
- 
-@@ -19,6 +19,6 @@ foreach(TEST_FILE ${TEST_FILES})
-        string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}")
-        # add a test target for each test
-        add_test(NAME ${TEST_NAME}
-                COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
-+                COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
-        )
- endforeach()
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.12.0.bb
index 16a4250b2..11ea116af 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.12.0.bb
@@ -4,16 +4,17 @@ HOMEPAGE = "http://www.doxygen.org/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "flex-native bison-native"
+DEPENDS = "bison-native flex-native"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \
+SRC_URI = "\
-           file://0001-build-don-t-look-for-Iconv.patch \
+    git://github.com/doxygen/doxygen.git;branch=master;protocol=https \
 "
-SRC_URI:append:class-native = " file://doxygen-native-only-check-python3.patch"
-SRC_URI[sha256sum] = "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0"
-UPSTREAM_CHECK_URI = "https://github.com/doxygen/doxygen/releases"
+SRCREV = "c73f5d30f9e8b1df5ba15a1d064ff2067cbb8267"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+S = "${WORKDIR}/git"
+UPSTREAM_CHECK_GITTAGREGEX = "Release_(?P<pver>\d+(\_\d+)+)"
 inherit cmake python3native
@@ -21,4 +22,5 @@ EXTRA_OECMAKE += "\
    -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \
    -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \
 "
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/fastfloat/fastfloat_5.2.0.bb b/meta-oe/recipes-devtools/fastfloat/fastfloat_5.2.0.bb
new file mode 100644
index 000000000..b121a97b2
--- /dev/null
+++ b/meta-oe/recipes-devtools/fastfloat/fastfloat_5.2.0.bb
@@ -0,0 +1,15 @@
+SUMMARY = "fast_float number parsing library: 4x faster than strtod"
+HOMEPAGE = "https://github.com/fastfloat/fast_float"
+LICENSE = "Apache-2.0 & BSL-1.0 & MIT"
+LIC_FILES_CHKSUM = " \
+        file://LICENSE-MIT;md5=32b11d50c7d9788d4270f6a83f3e68eb \
+        file://LICENSE-APACHE;md5=81db248e90379bcfc0582b578b009bc3 \
+        file://LICENSE-BOOST;md5=2c7a3fa82e66676005cd4ee2608fd7d2 \
+"
+SRC_URI = "git://github.com/fastfloat/fast_float.git;protocol=https;branch=main"
+SRCREV = "2b2395f9ac836ffca6404424bcc252bff7aa80e4"
+S = "${WORKDIR}/git"
+inherit cmake
diff --git a/meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch b/meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch
new file mode 100644
index 000000000..cb3d10ee7
--- /dev/null
+++ b/meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch
@@ -0,0 +1,35 @@
+From 9c7cef94a551cfdbbe2cce262c29221e22643d84 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
+Date: Mon, 19 Aug 2024 06:35:03 +0200
+Subject: [PATCH] fix: add missing zero initialization to region
+Fixes below error:
+/build/tmp-glibc/work/core2-64-wrs-linux/libtoml11/1_4.2.0-r0/git/include/toml11/fwd/../fwd/../fwd/region_fwd.hpp:49:5: error: '<unnamed>.toml::detail::region::first_' is used uninitialized [-Werror=uninitialized]
+   49 |     region(region&&)      = default;
+      |     ^~~~~~
+Upstream-Status: Backport [https://github.com/ToruNiina/toml11/commit/9c7cef94a551cfdbbe2cce262c29221e22643d84]
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ include/toml11/fwd/region_fwd.hpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/include/toml11/fwd/region_fwd.hpp b/include/toml11/fwd/region_fwd.hpp
+index b40317d..26f1a9b 100644
+--- a/include/toml11/fwd/region_fwd.hpp
+++ b/include/toml11/fwd/region_fwd.hpp
+@@ -34,7 +34,8 @@ class region
+     // a value that is constructed manually does not have input stream info
+     region()
+         : source_(nullptr), source_name_(""), length_(0),
+-          first_line_(0), first_column_(0), last_line_(0), last_column_(0)
+          first_(0), first_line_(0), first_column_(0), last_(0), last_line_(0),
+          last_column_(0)
+     {}
+ 
+     // a value defined in [first, last).
+-- 
+2.34.1
diff --git a/meta-oe/recipes-devtools/libtoml11/files/run-ptest b/meta-oe/recipes-devtools/libtoml11/files/run-ptest
new file mode 100755
index 000000000..9bc480aa7
--- /dev/null
+++ b/meta-oe/recipes-devtools/libtoml11/files/run-ptest
@@ -0,0 +1,12 @@
+#!/bin/sh
+cd tests
+for atest in test_* ; do
+    rm -rf tests.log
+    ./${atest} > tests.log 2>&1
+    if [ $? = 0 ] ; then
+        echo "PASS: ${atest}"
+    else
+        echo "FAIL: ${atest}"
+    fi
+done
diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.2.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.2.0.bb
new file mode 100644
index 000000000..758e258a5
--- /dev/null
+++ b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.2.0.bb
@@ -0,0 +1,39 @@
+SUMMARY = "TOML for Modern C++"
+DESCRIPTION = "toml11 is a feature-rich TOML language library for \
+               C++11/14/17/20."
+HOMEPAGE = "https://github.com/ToruNiina/toml11"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=44d1fcf70c7aa6991533c38daf7befa3"
+PE = "1"
+SRCREV = "cc0bee4fd46ea1f5db147d63ea545208cc9e8405"
+SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+SRCREV_doctest = "ae7a13539fb71f270b87eb2e874fbac80bc8dda2"
+SRC_URI = "git://github.com/ToruNiina/toml11;branch=main;protocol=https \
+           git://github.com/nlohmann/json;destsuffix=git/tests/extlib/json;name=json;branch=develop;protocol=https \
+           git://github.com/doctest/doctest;destsuffix=git/tests/extlib/doctest;name=doctest;branch=master;protocol=https \
+           file://0001-fix-add-missing-zero-initialization-to-region.patch \
+           file://run-ptest \
+"
+SRCREV_FORMAT = "json_doctest"
+S = "${WORKDIR}/git"
+inherit cmake ptest
+EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \
+                  -DTOML11_BUILD_TESTS=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "ON", "OFF", d)} \
+"
+ALLOW_EMPTY:${PN} = "1"
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/tests
+    cp -r ${B}/tests/test_* ${D}${PTEST_PATH}/tests
+}
diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.2.2.bb b/meta-oe/recipes-devtools/mpich/mpich_4.2.3.bb
index f9ff07740..941dbf68a 100644
--- a/meta-oe/recipes-devtools/mpich/mpich_4.2.2.bb
+++ b/meta-oe/recipes-devtools/mpich/mpich_4.2.3.bb
@@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7a88f0d96d0d7396a7c66bf353235b62"
 SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz"
-SRC_URI[sha256sum] = "883f5bb3aeabf627cb8492ca02a03b191d09836bbe0f599d8508351179781d41"
+SRC_URI[sha256sum] = "7a019180c51d1738ad9c5d8d452314de65e828ee240bcb2d1f80de9a65be88a8"
 RDEPENDS:${PN} += "bash perl libxml2"
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.17/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.11/oe-npm-cache
index eb0f143ea..eb0f143ea 100755
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.17/oe-npm-cache
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.11/oe-npm-cache
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.17.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.11.bb
index d4b818f96..d4b818f96 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.17.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.11.bb
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
index 12f6cd8b9..f692eedd4 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
@@ -1,4 +1,4 @@
-From 7d94bfe53beeb2d25eb5f2ff6b1d509df7e6ab80 Mon Sep 17 00:00:00 2001
+From 689e098cbde130ecde523ae39df3567456271fda Mon Sep 17 00:00:00 2001
 From: Zuzana Svetlikova <zsvetlik@redhat.com>
 Date: Thu, 27 Apr 2017 14:25:42 +0200
 Subject: [PATCH] Disable running gyp on shared deps
@@ -28,19 +28,20 @@ python prune_sources() {
        shutil.rmtree(d.getVar('S') + '/deps/zlib')
 }
 do_unpack[postfuncs] += "prune_sources"
 ---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/Makefile b/Makefile
+index dba16e5e..da4faffc 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -169,7 +169,7 @@ with-code-cache test-code-cache:
+@@ -173,7 +173,7 @@ with-code-cache test-code-cache:
        $(warning '$@' target is a noop)
 
- out/Makefile: config.gypi common.gypi node.gyp \
+ out/Makefile: config.gypi common.gypi common_node.gypi node.gyp \
 -       deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
 +       deps/llhttp/llhttp.gyp \
-        deps/simdutf/simdutf.gyp deps/ada/ada.gyp \
+        deps/simdutf/simdutf.gyp deps/ada/ada.gyp deps/nbytes/nbytes.gyp \
-        tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
+        tools/v8_gypfiles/toolchain.gypi \
-        tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
+        tools/v8_gypfiles/features.gypi \
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
deleted file mode 100644
index 39026d074..000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 656f6c91f1da7f1e1ffb01e2de7d9026a84958b5 Mon Sep 17 00:00:00 2001
-From: Luigi Pinca <luigipinca@gmail.com>
-Date: Wed, 8 Nov 2023 21:20:53 +0100
-Subject: [PATCH] build: fix build with Python 3.12
-Replace `distutils.version.StrictVersion` with
-`packaging.version.Version`.
-Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539
-PR-URL: https://github.com/nodejs/node/pull/50582
-Reviewed-By: Richard Lau <rlau@redhat.com>
-Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
-Upstream-Status: Backport [https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
- configure.py | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-diff --git a/configure.py b/configure.py
-index 62f041ce..18fe7c14 100755
--- a/configure.py
-+++ b/configure.py
-@@ -14,8 +14,6 @@ import bz2
- import io
- from pathlib import Path
- 
-from distutils.version import StrictVersion
-
- # If not run from node/, cd to node/.
- os.chdir(Path(__file__).parent)
- 
-@@ -30,6 +28,7 @@ tools_path = Path('tools')
- 
- sys.path.insert(0, str(tools_path / 'gyp' / 'pylib'))
- from gyp.common import GetFlavor
-+from packaging.version import Version
- 
- # imports in tools/configure.d
- sys.path.insert(0, str(tools_path / 'configure.d'))
-@@ -1565,10 +1564,10 @@ def configure_openssl(o):
-     # supported asm compiler for AVX2. See https://github.com/openssl/openssl/
-     # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
-     openssl110_asm_supported = \
-      ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \
-      ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \
-      ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \
-      ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10'))
-+      ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \
-+      ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \
-+      ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \
-+      ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10'))
- 
-     if is_x86 and not openssl110_asm_supported:
-       error('''Did not find a new enough assembler, install one or build with
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-custom-env.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-custom-env.patch
new file mode 100644
index 000000000..532d3c5f5
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-custom-env.patch
@@ -0,0 +1,18 @@
+From 9c1a31afdcf368f794b9f5378cb3fe759570f905 Mon Sep 17 00:00:00 2001
+From: Jason Schonberg <schonm@gmail.com>
+Date: Tue, 30 Apr 2024 21:48:33 -0400
+Subject: [PATCH] Update to nodejs 22.0.0
+Upstream-Status: Inappropriate [embedded specific]
+---
+ test/fixtures/run-script/node_modules/.bin/custom-env | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/test/fixtures/run-script/node_modules/.bin/custom-env b/test/fixtures/run-script/node_modules/.bin/custom-env
+index e6f291c6..1430f2e9 100755
+--- a/test/fixtures/run-script/node_modules/.bin/custom-env
+++ b/test/fixtures/run-script/node_modules/.bin/custom-env
+@@ -1,2 +1,2 @@
+-#!/bin/bash
+#!/bin/sh
+ echo "$CUSTOM_ENV"
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch
new file mode 100644
index 000000000..04398ac68
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch
@@ -0,0 +1,52 @@
+From 2bb296f169f86dbb04ee47e9a0dc1e3ee13d4f73 Mon Sep 17 00:00:00 2001
+From: Jason Schonberg <schonm@gmail.com>
+Date: Thu, 7 Mar 2024 12:55:56 -0500
+Subject: [PATCH] Update to nodejs 20.11.1
+Upstream-Status: Inappropriate [embedded specific]
+---
+ ...ps-disable-io_uring-support-in-libuv.patch | 35 +++++++++++++++++++
+ 1 file changed, 35 insertions(+)
+ create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch
+diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch
+new file mode 100644
+index 00000000..5ac711fb
+--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch
+@@ -0,0 +1,35 @@
+From 9838be9c710ab4249df86726fa390232a3b6a6e7 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 1 Mar 2024 15:46:11 +0800
+Subject: [PATCH] deps: disable io_uring support in libuv
+
+Refer [1], Pseudo fails to intercept some of the syscalls when io_uring
+enabled. Refer [2], always disable io_uring support in libuv to fix
+issue in [1].
+
+[1] https://git.openembedded.org/meta-openembedded/commit/?id=d08453978c31ee41d28206c6ff198d7d9d701d88
+[2] https://github.com/nodejs/node/commit/686da19abb
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ deps/uv/src/unix/linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/uv/src/unix/linux.c b/deps/uv/src/unix/linux.c
+index 0c997185..7508409d 100644
+--- a/deps/uv/src/unix/linux.c
++++ b/deps/uv/src/unix/linux.c
+@@ -433,7 +433,7 @@ static int uv__use_io_uring(void) {
+   if (use == 0) {
+     /* Disable io_uring by default due to CVE-2024-22017. */
+     val = getenv("UV_USE_IO_URING");
+-    use = val != NULL && atoi(val) ? 1 : -1;
++    use = 0;
+     atomic_store_explicit(&use_io_uring, use, memory_order_relaxed);
+   }
+ 
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
deleted file mode 100644
index 9d878dfb8..000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bf8c96ba6936050ed4a0de5bc8aeeaf2b3c50dc1 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Thu, 7 Dec 2023 12:54:30 +0100
-Subject: [PATCH] gyp: resolve python 3.12 issues
-Upstream has updated gyp wholesale in the main branch, so
-this patch can be dropped in due time.
-Upstream-Status: Inappropriate [issue will be fixed upstream with the next nodejs LTS update]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
- deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py | 4 ++--
- tools/gyp/pylib/gyp/input.py                          | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
-index d9699a0a..173e9465 100644
--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
-+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
-@@ -16,7 +16,7 @@ import subprocess
- import sys
- import threading
- import traceback
-from distutils.version import StrictVersion
-+from packaging.version import Version
- from gyp.common import GypError
- from gyp.common import OrderedSet
- 
-@@ -1183,7 +1183,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
-         else:
-             ast_code = compile(cond_expr_expanded, "<string>", "eval")
-             cached_conditions_asts[cond_expr_expanded] = ast_code
-        env = {"__builtins__": {}, "v": StrictVersion}
-+        env = {"__builtins__": {}, "v": Version}
-         if eval(ast_code, env, variables):
-             return true_dict
-         return false_dict
-diff --git a/tools/gyp/pylib/gyp/input.py b/tools/gyp/pylib/gyp/input.py
-index 354958bf..ab6112e5 100644
--- a/tools/gyp/pylib/gyp/input.py
-+++ b/tools/gyp/pylib/gyp/input.py
-@@ -16,7 +16,7 @@ import subprocess
- import sys
- import threading
- import traceback
-from distutils.version import StrictVersion
-+from packaging.version import Version
- from gyp.common import GypError
- from gyp.common import OrderedSet
- 
-@@ -1190,7 +1190,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
-         else:
-             ast_code = compile(cond_expr_expanded, "<string>", "eval")
-             cached_conditions_asts[cond_expr_expanded] = ast_code
-        env = {"__builtins__": {}, "v": StrictVersion}
-+        env = {"__builtins__": {}, "v": Version}
-         if eval(ast_code, env, variables):
-             return true_dict
-         return false_dict
-- 
-2.39.2
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch
index 5af87d866..5e617e655 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch
@@ -1,7 +1,7 @@
-From dc3652c0abcdf8573fd044907b19d8eda7ca1124 Mon Sep 17 00:00:00 2001
+From 33393507ba8209f0d6b85b391c525b4c70807275 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 3 Jul 2023 12:33:16 +0000
-Subject: [PATCH] [liftoff] Correct function signatures
+Subject: [PATCH] Correct function signatures
 Fixes builds on mips where clang reports an error
 ../deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h:661:5: error: no matching member function for call to 'Move'
@@ -13,15 +13,15 @@ Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/v8/v8/+/3
 Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
 ---
 deps/v8/src/wasm/baseline/liftoff-assembler.h               | 6 +++---
- deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | 2 +-
+ .../src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h | 2 +-
- deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h | 2 +-
+ .../src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.h b/deps/v8/src/wasm/baseline/liftoff-assembler.h
-index aef63c64..f2a11b01 100644
+index 7cb2f500..713d16db 100644
 --- a/deps/v8/src/wasm/baseline/liftoff-assembler.h
 +++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h
-@@ -717,7 +717,7 @@ class LiftoffAssembler : public MacroAssembler {
+@@ -681,7 +681,7 @@ class LiftoffAssembler : public MacroAssembler {
   void FinishCall(const ValueKindSig*, compiler::CallDescriptor*);
 
   // Move {src} into {dst}. {src} and {dst} must be different.
@@ -30,7 +30,7 @@ index aef63c64..f2a11b01 100644
 
   // Parallel register move: For a list of tuples <dst, src, kind>, move the
   // {src} register of kind {kind} into {dst}. If {src} equals {dst}, ignore
-@@ -884,8 +884,8 @@ class LiftoffAssembler : public MacroAssembler {
+@@ -851,8 +851,8 @@ class LiftoffAssembler : public MacroAssembler {
   inline void MoveStackValue(uint32_t dst_offset, uint32_t src_offset,
                              ValueKind);
 
@@ -41,24 +41,24 @@ index aef63c64..f2a11b01 100644
 
   inline void Spill(int offset, LiftoffRegister, ValueKind);
   inline void Spill(int offset, WasmValue);
-diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
+diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h
-index 96cba24c..53e1842d 100644
+index bd59f162..56b4d70c 100644
--- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
+--- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h
-+++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
+++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h
-@@ -592,7 +592,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
+@@ -672,7 +672,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
     pinned.set(dst_op.rm());
-     LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned);
+     LiftoffRegister tmp = kScratchReg2;
     // Save original value.
 -    Move(tmp, src, type.value_type());
 +    Move(tmp, src, type.value_type().kind());
 
     src = tmp;
     pinned.set(tmp);
-diff --git a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h
+diff --git a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h
-index 1d6ae09e..397e82b2 100644
+index a3c94af0..456e5334 100644
--- a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h
+--- a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h
-+++ b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h
+++ b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h
-@@ -286,7 +286,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
+@@ -452,7 +452,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
     pinned.set(dst_op.rm());
     LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned);
     // Save original value.
@@ -67,5 +67,3 @@ index 1d6ae09e..397e82b2 100644
 
     src = tmp;
     pinned.set(tmp);
--
-2.40.0
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-positional-args.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-positional-args.patch
new file mode 100644
index 000000000..5fd6aee35
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-positional-args.patch
@@ -0,0 +1,19 @@
+From 07ee84863fa4a9e4d5f155632478587b0acbf71a Mon Sep 17 00:00:00 2001
+From: Jason Schonberg <schonm@gmail.com>
+Date: Tue, 30 Apr 2024 21:48:33 -0400
+Subject: [PATCH] Update to nodejs 22.0.0
+Upstream-Status: Inappropriate [embedded specific]
+---
+ test/fixtures/run-script/node_modules/.bin/positional-args | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/test/fixtures/run-script/node_modules/.bin/positional-args b/test/fixtures/run-script/node_modules/.bin/positional-args
+index 2d809237..3dc5314f 100755
+--- a/test/fixtures/run-script/node_modules/.bin/positional-args
+++ b/test/fixtures/run-script/node_modules/.bin/positional-args
+@@ -1,3 +1,3 @@
+-#!/bin/bash
+#!/bin/sh
+ echo "Arguments: '$@'"
+ echo "The total number of arguments are: $#"
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch
index 97ed972ce..cc920118a 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch
@@ -1,4 +1,4 @@
-From 47ee5cc5501289205d3e8e9f27ea9daf18cebac1 Mon Sep 17 00:00:00 2001
+From afc085af7b6b935a5e14fc3f40db47df02ca3af2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net>
 Date: Sat, 9 Nov 2019 14:45:30 +0000
 Subject: [PATCH] v8: don't override ARM CFLAGS
@@ -28,10 +28,10 @@ Signed-off-by: André Draszik <git@andred.net>
 1 file changed, 2 insertions(+), 50 deletions(-)
 diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi
-index 264b3e478e..0b41848145 100644
+index 9d1b0987..4df15e60 100644
 --- a/tools/v8_gypfiles/toolchain.gypi
 +++ b/tools/v8_gypfiles/toolchain.gypi
-@@ -211,31 +211,7 @@
+@@ -203,31 +203,7 @@
         'target_conditions': [
           ['_toolset=="host"', {
             'conditions': [
@@ -64,7 +64,7 @@ index 264b3e478e..0b41848145 100644
                 # Host not built with an Arm CXX compiler (simulator build).
                 'conditions': [
                   [ 'arm_float_abi=="hard"', {
-@@ -254,31 +230,7 @@
+@@ -246,31 +222,7 @@
           }],  # _toolset=="host"
           ['_toolset=="target"', {
             'conditions': [
@@ -97,6 +97,3 @@ index 264b3e478e..0b41848145 100644
                 # Target not built with an Arm CXX compiler (simulator build).
                 'conditions': [
                   [ 'arm_float_abi=="hard"', {
-- 
-2.20.1
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch b/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch
deleted file mode 100644
index 689512cb6..000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 182d9c05e78b1ddb1cb8242cd3628a7855a0336f Mon Sep 17 00:00:00 2001
-From: Andrey Kosyakov <caseq@chromium.org>
-Date: Thu, 17 Aug 2023 13:50:11 -0700
-Subject: [PATCH] Define UChar as char16_t
-We used to have UChar defined as uint16_t which does not go along
-with STL these days if you try to have an std::basic_string<> of it,
-as there are no standard std::char_traits<> specialization for uint16_t.
-This switches UChar to char16_t where practical, introducing a few
-compatibility shims to keep CL size small, as (1) this would likely
-have to be back-ported and (2) crdtp extensively uses uint16_t for
-wide chars.
-Bug: b:296390693
-Change-Id: I66a32d8f0050915225b187de56896c26dd76163d
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4789966
-Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
-Commit-Queue: Jaroslav Sevcik <jarin@chromium.org>
-Auto-Submit: Andrey Kosyakov <caseq@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#89559}
-Upstream-Status: Backport [https://chromium-review.googlesource.com/c/v8/v8/+/4789966]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/inspector/string-16.cc                             |  8 +++++++-
- src/inspector/string-16.h                              | 10 ++++++++--
- src/inspector/v8-string-conversions.cc                 |  6 +++---
- src/inspector/v8-string-conversions.h                  |  6 ++++--
- .../inspector_protocol/crdtp/test_platform_v8.cc       |  9 ++++++---
- 5 files changed, 28 insertions(+), 11 deletions(-)
--- a/deps/v8/src/inspector/string-16.cc
-+++ b/deps/v8/src/inspector/string-16.cc
-@@ -27,7 +27,7 @@ bool isSpaceOrNewLine(UChar c) {
-   return isASCII(c) && c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9));
- }
- 
-int64_t charactersToInteger(const UChar* characters, size_t length,
-+int64_t charactersToInteger(const uint16_t* characters, size_t length,
-                             bool* ok = nullptr) {
-   std::vector<char> buffer;
-   buffer.reserve(length + 1);
-@@ -50,6 +50,8 @@ int64_t charactersToInteger(const UChar*
- 
- String16::String16(const UChar* characters, size_t size)
-     : m_impl(characters, size) {}
-+String16::String16(const uint16_t* characters, size_t size)
-+    : m_impl(reinterpret_cast<const UChar*>(characters), size) {}
- 
- String16::String16(const UChar* characters) : m_impl(characters) {}
- 
-@@ -241,6 +243,10 @@ String16 String16::fromUTF16LE(const UCh
- #endif  // V8_TARGET_BIG_ENDIAN
- }
- 
-+String16 String16::fromUTF16LE(const uint16_t* stringStart, size_t length) {
-+  return fromUTF16LE(reinterpret_cast<const UChar*>(stringStart), length);
-+}
-+
- std::string String16::utf8() const {
-   return UTF16ToUTF8(m_impl.data(), m_impl.size());
- }
--- a/deps/v8/src/inspector/string-16.h
-+++ b/deps/v8/src/inspector/string-16.h
-@@ -6,6 +6,7 @@
- #define V8_INSPECTOR_STRING_16_H_
- 
- #include <stdint.h>
-+#include <uchar.h>
- 
- #include <cctype>
- #include <climits>
-@@ -17,7 +18,7 @@
- 
- namespace v8_inspector {
- 
-using UChar = uint16_t;
-+using UChar = char16_t;
- 
- class String16 {
-  public:
-@@ -27,6 +28,7 @@ class String16 {
-   String16(const String16&) V8_NOEXCEPT = default;
-   String16(String16&&) V8_NOEXCEPT = default;
-   String16(const UChar* characters, size_t size);
-+  String16(const uint16_t* characters, size_t size);
-   V8_EXPORT String16(const UChar* characters);
-   V8_EXPORT String16(const char* characters);
-   String16(const char* characters, size_t size);
-@@ -48,7 +50,9 @@ class String16 {
-   int toInteger(bool* ok = nullptr) const;
-   std::pair<size_t, size_t> getTrimmedOffsetAndLength() const;
-   String16 stripWhiteSpace() const;
-  const UChar* characters16() const { return m_impl.c_str(); }
-+  const uint16_t* characters16() const {
-+    return reinterpret_cast<const uint16_t*>(m_impl.c_str());
-+  }
-   size_t length() const { return m_impl.length(); }
-   bool isEmpty() const { return !m_impl.length(); }
-   UChar operator[](size_t index) const { return m_impl[index]; }
-@@ -78,6 +82,8 @@ class String16 {
-   // On Big endian architectures, byte order needs to be flipped.
-   V8_EXPORT static String16 fromUTF16LE(const UChar* stringStart,
-                                         size_t length);
-+  V8_EXPORT static String16 fromUTF16LE(const uint16_t* stringStart,
-+                                        size_t length);
- 
-   std::size_t hash() const {
-     if (!hash_code) {
--- a/deps/v8/src/inspector/v8-string-conversions.cc
-+++ b/deps/v8/src/inspector/v8-string-conversions.cc
-@@ -12,7 +12,7 @@
- 
- namespace v8_inspector {
- namespace {
-using UChar = uint16_t;
-+using UChar = char16_t;
- using UChar32 = uint32_t;
- 
- bool isASCII(UChar c) { return !(c & ~0x7F); }
-@@ -386,7 +386,7 @@ std::string UTF16ToUTF8(const UChar* str
- 
- std::basic_string<UChar> UTF8ToUTF16(const char* stringStart, size_t length) {
-   if (!stringStart || !length) return std::basic_string<UChar>();
-  std::vector<uint16_t> buffer(length);
-+  std::vector<UChar> buffer(length);
-   UChar* bufferStart = buffer.data();
- 
-   UChar* bufferCurrent = bufferStart;
-@@ -395,7 +395,7 @@ std::basic_string<UChar> UTF8ToUTF16(con
-                          reinterpret_cast<const char*>(stringStart + length),
-                          &bufferCurrent, bufferCurrent + buffer.size(), nullptr,
-                          true) != conversionOK)
-    return std::basic_string<uint16_t>();
-+    return std::basic_string<UChar>();
-   size_t utf16Length = bufferCurrent - bufferStart;
-   return std::basic_string<UChar>(bufferStart, bufferStart + utf16Length);
- }
--- a/deps/v8/src/inspector/v8-string-conversions.h
-+++ b/deps/v8/src/inspector/v8-string-conversions.h
-@@ -5,14 +5,16 @@
- #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- 
-+#include <uchar.h>
-+
- #include <cstdint>
- #include <string>
- 
- // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
- // want to use string-16.h directly rather than these.
- namespace v8_inspector {
-std::basic_string<uint16_t> UTF8ToUTF16(const char* stringStart, size_t length);
-std::string UTF16ToUTF8(const uint16_t* stringStart, size_t length);
-+std::basic_string<char16_t> UTF8ToUTF16(const char* stringStart, size_t length);
-+std::string UTF16ToUTF8(const char16_t* stringStart, size_t length);
- }  // namespace v8_inspector
- 
- #endif  // V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
--- a/deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc
-+++ b/deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc
-@@ -11,13 +11,16 @@
- namespace v8_crdtp {
- 
- std::string UTF16ToUTF8(span<uint16_t> in) {
-  return v8_inspector::UTF16ToUTF8(in.data(), in.size());
-+  return v8_inspector::UTF16ToUTF8(reinterpret_cast<const char16_t*>(in.data()),
-+                                   in.size());
- }
- 
- std::vector<uint16_t> UTF8ToUTF16(span<uint8_t> in) {
-  std::basic_string<uint16_t> utf16 = v8_inspector::UTF8ToUTF16(
-+  std::basic_string<char16_t> utf16 = v8_inspector::UTF8ToUTF16(
-       reinterpret_cast<const char*>(in.data()), in.size());
-  return std::vector<uint16_t>(utf16.begin(), utf16.end());
-+  return std::vector<uint16_t>(
-+      reinterpret_cast<const uint16_t*>(utf16.data()),
-+      reinterpret_cast<const uint16_t*>(utf16.data()) + utf16.size());
- }
- 
- }  // namespace v8_crdtp
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
index bc51f99d8..d987ac50b 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
@@ -29,7 +29,7 @@ index b425f443..f296f35c 100644
 @@ -487,7 +487,18 @@
         ],
       }],
-       ['OS == "linux" and llvm_version != "0.0"', {
+       ['OS=="linux" and clang==1', {
 -        'libraries': ['-latomic'],
 +        'target_conditions': [
 +           ['_toolset=="host"', {
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/system-c-ares.patch b/meta-oe/recipes-devtools/nodejs/nodejs/system-c-ares.patch
index 141889ad2..6f08c71e1 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/system-c-ares.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/system-c-ares.patch
@@ -1,11 +1,19 @@
-keep nodejs compatible with c-ares 1.17.1
+From ce931ad5f5aba60e8e77f39e0af43bce7d25d287 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 4 Mar 2024 11:05:25 -0500
+Subject: [PATCH] keep nodejs compatible with c-ares 1.17.1
 Upstream-Status: Inappropriate [c-ares specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/cares_wrap.h | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+diff --git a/src/cares_wrap.h b/src/cares_wrap.h
+index 021ef1c9..820c5d88 100644
 --- a/src/cares_wrap.h
 +++ b/src/cares_wrap.h
-@@ -22,7 +22,15 @@
+@@ -23,7 +23,15 @@
 # include <netdb.h>
 #endif  // __POSIX__
 
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.11.0.bb
index 38e5ca9ff..49a5f350d 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.11.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
 HOMEPAGE = "http://nodejs.org"
 LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2ab85b3bae451276a10919163bcc5b74"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=25e89142a2f4b075904a9986c45fbdb2"
 CVE_PRODUCT = "nodejs node.js"
@@ -25,7 +25,9 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
           file://system-c-ares.patch \
           file://0001-liftoff-Correct-function-signatures.patch \
           file://libatomic.patch \
-           file://182d9c05e78.patch \
+           file://0001-deps-disable-io_uring-support-in-libuv.patch \
+           file://0001-positional-args.patch \
+           file://0001-custom-env.patch \
           file://run-ptest \
           "
 SRC_URI:append:class-target = " \
@@ -34,7 +36,7 @@ SRC_URI:append:class-target = " \
 SRC_URI:append:toolchain-clang:powerpc64le = " \
           file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
           "
-SRC_URI[sha256sum] = "9abf03ac23362c60387ebb633a516303637145cb3c177be3348b16880fd8b28c"
+SRC_URI[sha256sum] = "bbf0297761d53aefda9d7855c57c7d2c272b83a7b5bad4fea9cb29006d8e1d35"
 S = "${WORKDIR}/node-v${PV}"
@@ -98,7 +100,7 @@ do_unpack[postfuncs] += "prune_sources"
 # 1. If host and target have the different bit width, run those
 #    binaries for the target and run them on the host with QEMU.
 # 2. If host and target have the same bit width, enable upstream
-#    cross crompile support and no QEMU
+#    cross compile support and no QEMU
 python do_create_v8_qemu_wrapper () {
    """Creates a small wrapper that invokes QEMU to run some target V8 binaries
    on the host."""
@@ -192,7 +194,7 @@ python set_gyp_variables () {
        d.setVar("LDFLAGS_host", d.getVar("LDFLAGS"))
        d.setVar("AR_host", d.getVar("AR"))
    elif d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1":
-        # Enable upstream cross crompile support
+        # Enable upstream cross compile support
        d.setVar("CC_host", d.getVar("BUILD_CC"))
        d.setVar("CFLAGS_host", d.getVar("BUILD_CFLAGS"))
        d.setVar("CXX_host", d.getVar("BUILD_CXX"))
diff --git a/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch b/meta-oe/recipes-devtools/pahole/files/0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch
index 4f7dfd4cc..7dc18d7aa 100644
--- a/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch
+++ b/meta-oe/recipes-devtools/pahole/files/0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch
@@ -4,7 +4,6 @@ Date: Wed, 15 Sep 2021 17:54:01 +0200
 Subject: [PATCH] Use /usr/bin/env python3 instead of just /usr/bin/python3
 Upstream-Status: Inappropriate [OE specific]
 ---
 ostra/ostra-cg        | 2 +-
 ostra/python/ostra.py | 2 +-
diff --git a/meta-oe/recipes-devtools/pahole/pahole_1.25.bb b/meta-oe/recipes-devtools/pahole/pahole_1.27.bb
index 1334c850e..b899684eb 100644
--- a/meta-oe/recipes-devtools/pahole/pahole_1.25.bb
+++ b/meta-oe/recipes-devtools/pahole/pahole_1.27.bb
@@ -7,11 +7,12 @@ DEPENDS = "elfutils zlib libbpf"
 # Depends on MACHINE_ARCH libbpf
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux"
+COMPATIBLE_HOST:mips = "null"
+COMPATIBLE_HOST:riscv32 = "null"
-SRCREV = "81558a5a996005df0d607dd33f74ec5b7bdb619d"
+SRCREV = "3e265dac5ec85b956c664464072196c37d2af4f3"
 SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master \
-           file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch"
+           file://0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch b/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch
deleted file mode 100644
index d08721ae6..000000000
--- a/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e63949205682bbd2a0e33e256119472d704a2549 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 29 Jan 2023 22:03:01 -0800
-Subject: [PATCH] Add missing header <cstdint> for uintXX_t types
-This is detected by gcc-13
-gcc 13 moved some includes around and as a result <cstdint> is no
-longer transitively included [1]. Explicitly include it for uintXX_t.
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-Upstream-Status: Submitted [https://android-review.googlesource.com/c/platform/external/perfetto/+/2399128]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- include/perfetto/ext/base/http/sha1.h    | 1 +
- include/perfetto/ext/base/uuid.h         | 1 +
- src/traced/probes/common/cpu_freq_info.h | 1 +
- 3 files changed, 3 insertions(+)
-diff --git a/include/perfetto/ext/base/http/sha1.h b/include/perfetto/ext/base/http/sha1.h
-index c583d69d4..7e3a48c83 100644
--- a/include/perfetto/ext/base/http/sha1.h
-+++ b/include/perfetto/ext/base/http/sha1.h
-@@ -20,6 +20,7 @@
- #include <stddef.h>
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- namespace perfetto {
-diff --git a/include/perfetto/ext/base/uuid.h b/include/perfetto/ext/base/uuid.h
-index 1b4c53815..472042fab 100644
--- a/include/perfetto/ext/base/uuid.h
-+++ b/include/perfetto/ext/base/uuid.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- #include "perfetto/ext/base/optional.h"
-diff --git a/src/traced/probes/common/cpu_freq_info.h b/src/traced/probes/common/cpu_freq_info.h
-index 36f7f9c09..8232cbf64 100644
--- a/src/traced/probes/common/cpu_freq_info.h
-+++ b/src/traced/probes/common/cpu_freq_info.h
-@@ -17,6 +17,7 @@
- #ifndef SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_
- #define SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- #include <vector>
-- 
-2.39.1
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch b/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch
new file mode 100644
index 000000000..3b7ca951a
--- /dev/null
+++ b/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch
@@ -0,0 +1,40 @@
+From 485c21940eb0100a33b7efea40a83e7f79e765f8 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Sun, 22 Sep 2024 20:17:52 +0200
+Subject: [PATCH] fix musl build
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+Upstream-Status: Pending
+ sdk/perfetto.cc   | 1 -
+ src/base/utils.cc | 1 -
+ 2 files changed, 2 deletions(-)
+diff --git a/sdk/perfetto.cc b/sdk/perfetto.cc
+index b10dd5aa92..2eb90f0d15 100644
+--- a/sdk/perfetto.cc
+++ b/sdk/perfetto.cc
+@@ -6558,7 +6558,6 @@ std::optional<int32_t> GetTimezoneOffsetMins() {
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+-#include <linux/prctl.h>
+ #include <sys/prctl.h>
+ 
+ #ifndef PR_GET_TAGGED_ADDR_CTRL
+diff --git a/src/base/utils.cc b/src/base/utils.cc
+index 0d9318c136..419c7dbc1a 100644
+--- a/src/base/utils.cc
+++ b/src/base/utils.cc
+@@ -40,7 +40,6 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+-#include <linux/prctl.h>
+ #include <sys/prctl.h>
+ 
+ #ifndef PR_GET_TAGGED_ADDR_CTRL
+-- 
+2.43.0
diff --git a/meta-oe/recipes-devtools/perfetto/libperfetto.bb b/meta-oe/recipes-devtools/perfetto/libperfetto.bb
index c8f56fd52..8383db3cc 100644
--- a/meta-oe/recipes-devtools/perfetto/libperfetto.bb
+++ b/meta-oe/recipes-devtools/perfetto/libperfetto.bb
@@ -1,5 +1,5 @@
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f87516e0b698007e9e75a1fe1012b390"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d"
 require perfetto.inc
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch b/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch
index ae644747c..719663a80 100644
--- a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch
+++ b/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch
@@ -3,21 +3,22 @@ From: Markus Volk <f_l_k@t-online.de>
 Date: Mon, 17 Oct 2022 19:20:53 +0200
 Subject: [PATCH] meson: add PC file for lib_perfetto
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
 ---
 Upstream-Status: Pending
- meson.build | 12 ++++++++++--
+ meson.build | 10 +++++++++-
- 1 file changed, 10 insertions(+), 2 deletions(-)
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+diff --git a/meson.build b/meson.build
+index 8fb1e26275..3ef3ebf27d 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -19,9 +19,12 @@
+@@ -19,8 +19,11 @@
 project(
     'perfetto',
     ['cpp'],
-    default_options: ['cpp_std=c++17']
+    version: '47.0'
-+    default_options: ['cpp_std=c++17'],
-+    version: '31.0'
 )
 
 +soversion = meson.project_version()
@@ -25,7 +26,7 @@ Upstream-Status: Pending
 fs = import('fs')
 
 if not fs.is_dir('sdk')
-@@ -36,8 +39,9 @@ if host_machine.system() == 'android'
+@@ -35,8 +38,9 @@ if host_machine.system() == 'android'
   deps_perfetto += cpp.find_library('log')
 endif
 
@@ -36,7 +37,7 @@ Upstream-Status: Pending
     sources: 'sdk/perfetto.cc',
     dependencies: deps_perfetto,
     install: true,
-@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.cu
+@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.current_source_dir(),
 
 install_data(dir_perfetto_trace / 'perfetto_trace.proto')
 
@@ -47,3 +48,6 @@ Upstream-Status: Pending
 dep_perfetto = declare_dependency(
     link_with: lib_perfetto,
     include_directories: inc_perfetto,
+-- 
+2.43.0
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-oe/recipes-devtools/perfetto/perfetto.bb
index 884e0a024..d2a6fbe65 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto.bb
+++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb
@@ -1,16 +1,17 @@
 LICENSE = "Apache-2.0 & BSD-3-Clause & MIT & Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f87516e0b698007e9e75a1fe1012b390 \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d \
                    file://buildtools/libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
                    file://buildtools/libcxxabi/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
                    file://buildtools/libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
                    file://buildtools/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
-                    file://buildtools/zlib/LICENSE;md5=f09575dbfb09420642318b413159496f \
+                    file://buildtools/zlib/LICENSE;md5=8c75f2b4df47a77f9445315a9500cd1c \
                    file://debian/copyright;md5=4e08364c82141f181de69d0a2b89d612 \
                    file://python/LICENSE;md5=c602a632c34ade9c78a976734077bce7"
+# Dependencies from perfetto/tools/install-build-deps
 SRC_URI:append = " \
-           git://github.com/protocolbuffers/protobuf.git;branch=3.9.x;protocol=https;destsuffix=git/buildtools/protobuf;name=protobuf \
+           git://github.com/protocolbuffers/protobuf.git;branch=main;protocol=https;destsuffix=git/buildtools/protobuf;name=protobuf \
           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git;protocol=https;destsuffix=git/buildtools/libcxx;branch=main;name=libcxx \
           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git;protocol=https;destsuffix=git/buildtools/libcxxabi;branch=main;name=libcxxabi \
           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=git/buildtools/libunwind;branch=main;name=libunwind \
@@ -22,25 +23,28 @@ SRC_URI:append = " \
           git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=git/buildtools/bionic;name=bionic \
           git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=git/buildtools/zlib;name=zlib \
           git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=git/buildtools/lzma;name=lzma \
+           git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=git/buildtools/zstd;name=zstd \
           https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=git/buildtools/;name=gn \
           \
           file://0001-Remove-check_build_deps-build-steps.patch \
-           file://0001-Add-missing-header-cstdint-for-uintXX_t-types.patch"
+           file://0002-traced-fix-missing-include.patch \
+           "
-SRCREV_bionic = "4b0e16bc72a82a63c699977376a7d6eadca1b206"
+SRCREV_bionic = "a0d0355105cb9d4a4b5384897448676133d7b8e2"
 SRCREV_core = "9e6cef7f07d8c11b3ea820938aeb7ff2e9dbaa52"
 SRCREV_lzma = "7851dce6f4ca17f5caa1c93a4e0a45686b1d56c3"
 SRCREV_libprocinfo = "fd214c13ededecae97a3b15b5fccc8925a749a84"
 SRCREV_logging = "7b36b566c9113fc703d68f76e8f40c0c2432481c"
-SRCREV_unwinding = "d66882575ebe3700d6a6b10185f3aee28acc1051"
+SRCREV_unwinding = "4b59ea8471e89d01300481a92de3230b79b6d7c7"
-SRCREV_protobuf = "6a59a2ad1f61d9696092f79b6d74368b4d7970a3"
+SRCREV_protobuf = "f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c"
 SRCREV_libbase = "78f1c2f83e625bdf66d55b48bdb3a301c20d2fb3"
-SRCREV_libcxx = "f8571eaba606bde2eb8cd34b30104ca33e7c207e"
+SRCREV_libcxx = "852bc6746f45add53fec19f3a29280e69e358d44"
-SRCREV_libcxxabi = "8dd405113a4f3694e910b79785dd7fb7535a888a"
+SRCREV_libcxxabi = "a37a3aa431f132b02a58656f13984d51098330a2"
-SRCREV_libunwind = "aabcd8753678f1536e15eb6385a948470debdae4"
+SRCREV_libunwind = "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad"
-SRCREV_zlib = "5c85a2da4c13eda07f69d81a1579a5afddd35f59"
+SRCREV_zlib = "6d3f6aa0f87c9791ca7724c279ef61384f331dfd"
+SRCREV_zstd = "77211fcc5e08c781734a386402ada93d0d18d093"
-SRCREV_FORMAT .="_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib"
+SRCREV_FORMAT .="_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib_zstd"
 SRC_URI[gn.sha256sum] = "f706aaa0676e3e22f5fc9ca482295d7caee8535d1869f99efa2358177b64f5cd"
@@ -97,7 +101,7 @@ do_configure () {
    ARGS=$ARGS" target_os=\"linux\""
    ARGS=$ARGS" target_cpu=\"$arch\""
    ARGS=$ARGS" target_cc=\"$CC_BIN ${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}\""
-    ARGS=$ARGS" target_cxx=\"$CXX_BIN -std=c++11 ${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}\""
+    ARGS=$ARGS" target_cxx=\"$CXX_BIN ${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}\""
    ARGS=$ARGS" target_strip=\"$STRIP_BIN\"" #
    ARGS=$ARGS" target_sysroot=\"${RECIPE_SYSROOT}\""
    ARGS=$ARGS" target_linker=\"$CC_BIN ${TUNE_CCARGS} ${LDFLAGS}\""
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.inc b/meta-oe/recipes-devtools/perfetto/perfetto.inc
index 4b06c5bf0..3cd0cb91b 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto.inc
+++ b/meta-oe/recipes-devtools/perfetto/perfetto.inc
@@ -1,10 +1,13 @@
 SUMMARY = "Perfetto - System profiling, app tracing and trace analysis."
 HOMEPAGE = "https://github.com/google/perfetto"
-SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1"
+# Add only patches here which are used by both perfetto and libperfetto
+SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1 \
+           file://0001-fix-musl-build.patch \
+        "
-SRCREV_perfetto = "b8da07095979310818f0efde2ef3c69ea70d62c5"
+SRCREV_perfetto = "c74251226a8caa0b43377902ee06d2570faa0c15"
 SRCREV_FORMAT = "perfetto"
-PV = "31.0"
+PV = "47.0"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch
index c10400aef..118c3aed4 100644
--- a/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch
+++ b/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch
@@ -1,4 +1,4 @@
-From 3b7091243ec03054ca8800b51b85a1c09e7e3075 Mon Sep 17 00:00:00 2001
+From 07ddc4b9b7a6fec73cdc295baba353944857212e Mon Sep 17 00:00:00 2001
 From: Sui Chen <suichen6@gmail.com>
 Date: Mon, 13 Jun 2022 17:46:49 +0000
 Subject: [PATCH] Remove "check_build_deps" build steps
@@ -11,6 +11,7 @@ Also setting "is_cross_compiling" to true, so that the host-side tools
 rather than the Bitbake-generated one.
 Signed-off-by: Sui Chen <suichen6@gmail.com>
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
 ---
 Upstream-Status: Pending
@@ -20,10 +21,10 @@ Upstream-Status: Pending
 3 files changed, 9 insertions(+), 9 deletions(-)
 diff --git a/gn/BUILD.gn b/gn/BUILD.gn
-index 8a7ca72a8..e4a2d39f0 100644
+index ed055ee700..ea79979ec5 100644
 --- a/gn/BUILD.gn
 +++ b/gn/BUILD.gn
-@@ -111,7 +111,6 @@ group("default_deps") {
+@@ -117,7 +117,6 @@ group("default_deps") {
   deps = [ ":gen_buildflags" ]
   if (perfetto_build_standalone) {
     public_deps = [
@@ -32,10 +33,10 @@ index 8a7ca72a8..e4a2d39f0 100644
       "//gn/standalone/sanitizers:deps",
     ]
 diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn
-index 582e9b867..9c77ac64c 100644
+index 36fb6371a5..f7bc97b1a6 100644
 --- a/gn/standalone/BUILD.gn
 +++ b/gn/standalone/BUILD.gn
-@@ -441,10 +441,10 @@ config("android_liblog") {
+@@ -469,10 +469,10 @@ config("android_liblog") {
 }
 
 # Checks that tools/install-build-deps has been run since it last changed.
@@ -53,7 +54,7 @@ index 582e9b867..9c77ac64c 100644
 +#  args = [ "--android" ]
 +#}
 diff --git a/gn/standalone/BUILDCONFIG.gn b/gn/standalone/BUILDCONFIG.gn
-index 6f32686c1..c041989b0 100644
+index 05ed548f9d..94db724b2b 100644
 --- a/gn/standalone/BUILDCONFIG.gn
 +++ b/gn/standalone/BUILDCONFIG.gn
 @@ -59,8 +59,9 @@ declare_args() {
@@ -67,7 +68,4 @@ index 6f32686c1..c041989b0 100644
 +  is_cross_compiling = true
 }
 default_configs = [
-   "//gn/standalone:debug_symbols",
+   "//gn/standalone:default",
-- 
-2.37.1
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch
new file mode 100644
index 000000000..49b798935
--- /dev/null
+++ b/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch
@@ -0,0 +1,28 @@
+From d005c0123b2f929b918359a53ffe61d7ca2212a0 Mon Sep 17 00:00:00 2001
+From: Lalit Maganti <lalitm@google.com>
+Date: Wed, 14 Aug 2024 11:56:47 +0100
+Subject: [PATCH] traced: fix missing include
+Change-Id: Ib9ce8ce5b057e89fa451ccef228228d607b36793
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+Upstream-Status: Backport [https://github.com/google/perfetto/commit/d005c0123b2f929b918359a53ffe61d7ca2212a0]
+ src/traced/probes/sys_stats/sys_stats_data_source.h | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/src/traced/probes/sys_stats/sys_stats_data_source.h b/src/traced/probes/sys_stats/sys_stats_data_source.h
+index e09cd8a2ca..7e4749bdcd 100644
+--- a/src/traced/probes/sys_stats/sys_stats_data_source.h
+++ b/src/traced/probes/sys_stats/sys_stats_data_source.h
+@@ -21,6 +21,7 @@
+ 
+ #include <map>
+ #include <memory>
+#include <optional>
+ #include <string>
+ 
+ #include "perfetto/ext/base/paged_memory.h"
+-- 
+2.43.0
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.4.bb b/meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb
index cc5204de4..d5fd90137 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.4.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
 DEPENDS = "zlib abseil-cpp"
 DEPENDS:append:class-target = " protobuf-native"
-SRCREV = "e915ce24b3d43c0fffcbf847354288c07dda1de0"
+SRCREV = "9d0ec0f92b5b5fdeeda11f9dcecc1872ff378014"
 SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol=https \
           file://run-ptest \
@@ -106,6 +106,8 @@ FILES:${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}"
 # CMake requires protoc binary to exist in sysroot, even if it has wrong architecture.
 SYSROOT_DIRS += "${bindir}"
+RDEPENDS:${PN} = "abseil-cpp"
+RDEPENDS:${PN}-lite = "abseil-cpp"
 RDEPENDS:${PN}-compiler = "${PN}"
 RDEPENDS:${PN}-dev += "${PN}-compiler"
 RDEPENDS:${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-protobuf', '', d)}"
diff --git a/meta-oe/recipes-devtools/python/python3-pefile/run-ptest b/meta-oe/recipes-devtools/python/python3-pefile/run-ptest
deleted file mode 100644
index 95ae72306..000000000
--- a/meta-oe/recipes-devtools/python/python3-pefile/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-pytest --automake --ignore=./tests/pefile_test.py
diff --git a/meta-oe/recipes-devtools/python/python3-pefile_2024.8.26.bb b/meta-oe/recipes-devtools/python/python3-pefile_2024.8.26.bb
deleted file mode 100644
index 87e651d9d..000000000
--- a/meta-oe/recipes-devtools/python/python3-pefile_2024.8.26.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Python PE parsing module"
-DESCRIPTION = "A multi-platform Python module to parse and work with Portable Executable (PE) files."
-HOMEPAGE = "https://github.com/erocarrera/pefile"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e34c75178086aca0a17551ffbacaca53"
-inherit setuptools3 ptest
-SRCREV = "4b3b1e2e568a88d4f1897d694d684f23d9e270c4"
-SRC_URI = "git://github.com/erocarrera/pefile;branch=master;protocol=https \
-           file://run-ptest"
-S = "${WORKDIR}/git"
-BBCLASSEXTEND = "native nativesdk"
-do_install_ptest() {
-   install -d ${D}${PTEST_PATH}/tests
-   cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
-RDEPENDS:${PN} += " \
-    python3-mmap \
-    python3-netclient \
-    python3-stringold \
-"
-RDEPENDS:${PN}-ptest += "\
-    python3-pytest \
-    python3-unittest-automake-output \
-"
diff --git a/meta-oe/recipes-devtools/python/python3-psycopg_3.2.1.bb b/meta-oe/recipes-devtools/python/python3-psycopg_3.2.3.bb
index 09c49c665..8c79958ac 100644
--- a/meta-oe/recipes-devtools/python/python3-psycopg_3.2.1.bb
+++ b/meta-oe/recipes-devtools/python/python3-psycopg_3.2.3.bb
@@ -7,7 +7,7 @@ features offered by PostgreSQL."
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404"
-SRC_URI[sha256sum] = "dc8da6dc8729dacacda3cc2f17d2c9397a70a66cf0d2b69c91065d60d5f00cb7"
+SRC_URI[sha256sum] = "a5764f67c27bec8bfac85764d23c534af2c27b893550377e37ce59c12aac47a2"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-oe/recipes-devtools/sip/sip_6.8.3.bb b/meta-oe/recipes-devtools/sip/sip_6.8.6.bb
index d12130af4..157e40451 100644
--- a/meta-oe/recipes-devtools/sip/sip_6.8.3.bb
+++ b/meta-oe/recipes-devtools/sip/sip_6.8.6.bb
@@ -6,12 +6,14 @@ SUMMARY = "A Python bindings generator for C/C++ libraries"
 HOMEPAGE = "https://www.riverbankcomputing.com/software/sip/"
 LICENSE = "GPL-2.0-or-later"
 SECTION = "devel"
-LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ed1d69a33480ebf4ff8a7a760826d84e"
-inherit pypi setuptools3 python3native
+inherit pypi python_setuptools_build_meta python3native
 PYPI_PACKAGE = "sip"
-SRC_URI[sha256sum] = "888547b018bb24c36aded519e93d3e513d4c6aa0ba55b7cc1affbd45cf10762c"
+SRC_URI[sha256sum] = "7fc959e48e6ec5d5af8bd026f69f5e24d08b3cb8abb342176f5ab8030cc07d7a"
+DEPENDS += "python3-setuptools-scm-native"
 RDEPENDS:${PN} = " \
    python3-core \
diff --git a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.1.bb b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.2.bb
index a542396d4..10e0e27a2 100644
--- a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.1.bb
+++ b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.2.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=a709b68f1ce8a9f10aeea6401446c1f4 \
                    file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8 \
                    "
-SRCREV = "8f9966c8ea3ea8a854941d041e7fcb9eb4f772fb"
+SRCREV = "667faf69cc35215e33e747b4bffdcba3643c2629"
 SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=fixes-1.3.0"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
index e13bf69b2..81d473575 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
@@ -7,9 +7,8 @@ Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
---
 Upstream-Status: Pending
+---
 unix/configure | 1 +
 unix/tcl.m4    | 2 ++
 2 files changed, 3 insertions(+)
diff --git a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
index fdf3c6653..c1e2f7344 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
@@ -1,7 +1,7 @@
 Upstream-Status: Pending
--- /tmp/configure.in   2010-05-19 13:29:03.000000000 +0200
+--- a/unix/configure.in 2010-05-19 13:29:03.000000000 +0200
-+++ unix/configure.in   2010-05-19 13:42:05.000000000 +0200
+++ b/unix/configure.in 2010-05-19 13:42:05.000000000 +0200
 @@ -526,13 +526,9 @@
        found_xft="yes"
        dnl make sure package configurator (xft-config or pkg-config
diff --git a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
index 62467af1d..8cdcf2020 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
@@ -1,9 +1,9 @@
-Upstream-Status: Pending
 Patch by Chris Waters sets path which are normally point to a directory
 with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tk headers there).
+Upstream-Status: Pending
 --- tk8.5-8.5.8.orig/unix/tkConfig.sh.in
 +++ tk8.5-8.5.8/unix/tkConfig.sh.in
 @@ -55,7 +55,7 @@
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb
index 7159e74c2..1438a0562 100644
--- a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb
@@ -4,42 +4,42 @@ SECTION = "devel/tcltk"
 # http://www.tcl.tk/software/tcltk/license.html
 LICENSE = "TCL"
-LIC_FILES_CHKSUM = "file://${S}/../license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
 "
 DEPENDS = "tcl virtual/libx11 libxt"
 SRC_URI = "\
    ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \
-    file://confsearch.diff;striplevel=2 \
+    file://confsearch.diff \
-    file://tkprivate.diff;striplevel=2 \
+    file://tkprivate.diff \
    file://fix-xft.diff \
 "
-SRC_URI[md5sum] = "602a47ad9ecac7bf655ada729d140a94"
-SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386"
+SRC_URI[sha256sum] = "550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca793fec"
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"
 UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/"
-S = "${WORKDIR}/${BPN}${PV}/unix"
+S = "${WORKDIR}/${BPN}${PV}"
-DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${S}/../=${TARGET_DBGSRC_DIR}/.."
-PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}"
 # Short version format: "8.6"
 VER = "${@os.path.splitext(d.getVar('PV'))[0]}"
 LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib"
 inherit autotools features_check pkgconfig
+AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -49,7 +49,9 @@ EXTRA_OECONF = "\
    --with-tcl=${STAGING_BINDIR}/crossscripts \
    --libdir=${libdir} \
 "
 export TK_LIBRARY='${libdir}/tk${VER}'
 do_install:append() {
    ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0
    oe_libinstall -so libtk${VER} ${D}${libdir}
diff --git a/meta-oe/recipes-devtools/tomlplusplus/files/run-ptest b/meta-oe/recipes-devtools/tomlplusplus/files/run-ptest
new file mode 100755
index 000000000..4f682c5eb
--- /dev/null
+++ b/meta-oe/recipes-devtools/tomlplusplus/files/run-ptest
@@ -0,0 +1,12 @@
+#!/bin/sh
+cd tests
+for atest in tomlplusplus_* ; do
+    rm -rf tests.log
+    ./${atest} > tests.log 2>&1
+    if [ $? = 0 ] ; then
+        echo "PASS: ${atest}"
+    else
+        echo "FAIL: ${atest}"
+    fi
+done
diff --git a/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb b/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb
new file mode 100644
index 000000000..a6ec89a2f
--- /dev/null
+++ b/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb
@@ -0,0 +1,25 @@
+SUMMARY = "toml config parser and serializer for c++."
+HOMEPAGE = "https://github.com/marzer/tomlplusplus"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=90960f22c10049c117d56ed2ee5ee167"
+SRC_URI = "git://github.com/marzer/tomlplusplus.git;protocol=https;branch=master \
+           file://run-ptest \
+"
+PV = "3.4.0"
+SRCREV = "30172438cee64926dc41fdd9c11fb3ba5b2ba9de"
+S = "${WORKDIR}/git"
+DEPENDS = "cmake-native"
+inherit meson ptest pkgconfig
+EXTRA_OEMESON += "-Dbuild_tests=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "true", "false", d)} \
+"
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/tests
+    cp ${B}/tests/tomlplusplus_odr_test ${D}${PTEST_PATH}/tests
+    cp ${B}/tests/tomlplusplus_tests ${D}${PTEST_PATH}/tests
+}
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
new file mode 100644
index 000000000..152667661
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
@@ -0,0 +1,109 @@
+From c9bd05e8f0ad805b81625cfa717d06071cfd9b48 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 16 Oct 2024 22:52:38 -0700
+Subject: [PATCH] unix-common.mk: Avoid race condition between mutliple make calls running in parallel
+With high parallel execution, it results in race condition where
+its trying to create symlink while the original symlink while rm is
+not done deleting the existing file yet.
+The issue is that submake for libxmlrpc_util.so is called 12 times
+which can run in parallel and then some of them will try to create
+target link at the same time (after both already finished rm call).
+Use -f which should be supported even by relatively old ln and
+should avoid the need for rm (and hopefully will avoid this race)
+For libutil++ it calls "all" and "libxmlrpc_util++.so" only once,
+but for libutil it calls "all" and then 12 times libxmlrpc_util.so
+(after-clean-j1.log is the make output with -n and -j1 instead of
+-j70), still trying to figure out why, my autofoo is rusty :).
+Ideally we should prevent calling it 12 times, but until we figure
+out why we can at least avoid the random build failures.
+Another interesting fact is that I haven't seen this issue until
+the upgrade to 1.60.03 from 1.59.01 from:
+https://lists.openembedded.org/g/openembedded-devel/message/112706
+but I don't see any changes which should cause this in the git since
+1.59.01, but the gentoo bug report is against 1.54.06 already.
+martin@jama /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable $ grep -A 1 lib/libutil++/Makefile after-clean-j1.log
+make -C libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil++/Makefile \
+    all 
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil++/Makefile \
+    libxmlrpc_util++.so
+martin@jama /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable $ grep -A 1 lib/libutil/Makefile after-clean-j1.log
+make -C libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    all 
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable/lib/libutil/Makefile \
+    libxmlrpc_util.so
+Similar error reported here [1]
+[1] https://bugs.gentoo.org/932835
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ unix-common.mk | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+diff --git a/unix-common.mk b/unix-common.mk
+index 6954faf5..983c48cd 100644
+--- a/unix-common.mk
+++ b/unix-common.mk
+@@ -62,14 +62,12 @@ SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^
+ SHLIB_LE_TARGETS = $(call shliblefn, $(SHARED_LIBS_TO_BUILD))
+ 
+ $(SHLIB_LE_TARGETS):%:%.$(MAJ)
+-       rm -f $@
+-       $(LN_S) $< $@
+       $(LN_S) -f $< $@
+ 
+ SONAME_TARGETS = $(SHLIB_LE_TARGETS:%=%.$(MAJ))
+ 
+ $(SONAME_TARGETS):%:%.$(MIN)
+-       rm -f $@
+-       $(LN_S) $< $@
+       $(LN_S) -f $< $@
+ 
+ .PHONY: $(SHLIB_INSTALL_TARGETS)
+ .PHONY: install-shared-libraries
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
deleted file mode 100644
index 9d92e4712..000000000
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 14f15cb0f03defa8efb4c8e2fece58e50655be6b Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Sun, 23 Jul 2017 22:20:29 -0400
-Subject: [PATCH] src/xmlrpc_server_abyss.c: fix formatting issues
-Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
-|src/xmlrpc_server_abyss.c:771:13: error: format not a string literal
-and no format arguments [-Werror=format-security]
-|             xmlrpc_faultf(envP, error);
-|             ^~~~~~~~~~~~~
-Upstream-Status: Pending
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- src/xmlrpc_server_abyss.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/xmlrpc_server_abyss.c b/src/xmlrpc_server_abyss.c
-index 2388652..3843f10 100644
--- a/src/xmlrpc_server_abyss.c
-+++ b/src/xmlrpc_server_abyss.c
-@@ -768,7 +768,7 @@ createServer(xmlrpc_env *                      const envP,
-         ServerInit2(abyssServerP, &error);
- 
-         if (error) {
-            xmlrpc_faultf(envP, error);
-+            xmlrpc_faultf(envP, "%s", error);
-             xmlrpc_strfree(error);
-         }
-     }
-- 
-2.8.1
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
index 5d5152b83..f5ee920ca 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951"
 SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \
           file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \
-           file://0002-fix-formatting-issues.patch \
+           file://0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch \
           "
-#Release 1.59.01
+# one more commit after Release 1.60.03 in the Stable series
-SRCREV = "352aeaa9ae49e90e55187cbda839f2113df06278"
+SRCREV = "a823b0bb5cf0a4dbd34f929cbfdfb0439c5d9b0e"
 S = "${WORKDIR}/git/stable"
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
index 4f2585fe7..5bfa31112 100644
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
@@ -21,7 +21,7 @@ inherit cmake python3targetconfig
 EXTRA_OECMAKE = "-DLIB='${baselib}' \
                 -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \
                 -DPYTHON_ABI=${PYTHON_ABI} \
-                 -DBUILD_PYTHON3=YES \
+                 -DBUILD_PYTHON3=NO \
                 -DPython3_SITE_DIR=${PYTHON_SITEPACKAGES_DIR} \
                 "
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
deleted file mode 100644
index 0cabed963..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 6a704ab7bf69cd5d6970b3a7d3ae7798b26027c1 Mon Sep 17 00:00:00 2001
-From: Paulo Neves <ptsneves@gmail.com>
-Date: Thu, 28 Jul 2022 11:28:41 +0200
-Subject: [PATCH] CMakeLists.txt Do not use private makefile $< target
-$< is a private detail from the Makefile generated by CMakefile and
-are not under control or to be used at the CMakeLists level. In 3.20
-that private generation changed pre-requisite targets[1] and now logs
-contain the path compiler_depend.ts instead of the actual file.
-Upstream-Status: Pending [https://github.com/fluent/fluent-bit/issues/5492]
---
- CMakeLists.txt              | 6 +-----
- lib/chunkio/CMakeLists.txt  | 7 +------
- lib/cmetrics/CMakeLists.txt | 7 +------
- 3 files changed, 3 insertions(+), 17 deletions(-)
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,11 +46,7 @@ else()
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
- endif()
- 
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
-else()
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
-endif()
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
- 
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
-   set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic")
--- a/lib/chunkio/CMakeLists.txt
-+++ b/lib/chunkio/CMakeLists.txt
-@@ -14,12 +14,7 @@ else()
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall ")
- endif()
- 
-# Set __FILENAME__
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
-else()
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
-endif()
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
- 
- include(cmake/macros.cmake)
- 
--- a/lib/cmetrics/CMakeLists.txt
-+++ b/lib/cmetrics/CMakeLists.txt
-@@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR  3)
- set(CMT_VERSION_PATCH  7)
- set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
- 
-# Define __CMT_FILENAME__ consistently across Operating Systems
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
-else()
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
-endif()
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
- 
- # Configuration options
- option(CMT_DEV                       "Enable development mode"                   No)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch
deleted file mode 100644
index 8d89e4df3..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f645128082117a0152a95b3dccd869a184b7513f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 10 Aug 2022 01:23:48 -0700
-Subject: [PATCH 1/2] Use posix strerror_r with musl
-Default with glibc is GNU extention of strerror_r
-where as musl uses posix variant, call that out
-Upstream-Status: Inappropriate [Need wider porting beyond linux/musl/glibc]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/flb_network.c | 5 +++++
- 1 file changed, 5 insertions(+)
-diff --git a/src/flb_network.c b/src/flb_network.c
-index 992eb1d..5d7a337 100644
--- a/src/flb_network.c
-+++ b/src/flb_network.c
-@@ -506,7 +506,12 @@ static int net_connect_async(int fd,
-             }
- 
-             /* Connection is broken, not much to do here */
-+#ifdef __GLIBC__
-             str = strerror_r(error, so_error_buf, sizeof(so_error_buf));
-+#else
-+            strerror_r(error, so_error_buf, sizeof(so_error_buf));
-+           str = so_error_buf;
-+#endif
-             flb_error("[net] TCP connection failed: %s:%i (%s)",
-                       u->tcp_host, u->tcp_port, str);
-             return -1;
-- 
-2.37.1
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
new file mode 100644
index 000000000..233e8c4e3
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
@@ -0,0 +1,106 @@
+From 940a4e270bb8879a78c0eac4daf997cb77e25b4b Mon Sep 17 00:00:00 2001
+From: Niko Mauno <niko.mauno@vaisala.com>
+Date: Sun, 29 Sep 2024 12:00:00 +0000
+Subject: [PATCH] lib: Do not use private makefile targets in CMakelists.txt
+By extending the scope of changes introduced in commit
+fc325524d50fe179b76f127243ab9e03ddbdaaa4
+("build: CMakeLists.txt Do not use private makefile targets (#5819)")
+we mitigate the following error produced by BitBake in Yocto
+  ERROR: fluentbit-3.1.9-r0 do_package_qa: QA Issue: File /usr/bin/fluent-bit in package fluentbit contains reference to TMPDIR [buildpaths]
+  ERROR: fluentbit-3.1.9-r0 do_package_qa: Fatal QA errors were found, failing task.
+stemming from
+  $ strings packages-split/fluentbit/usr/bin/fluent-bit
+  ...
+  $(subst /yocto/upstream/build/tmp/work/cortexa57-poky-linux/fluentbit/3.1.9/git/,,$(abspath $<))
+  ...
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/9450]
+---
+ lib/cfl/CMakeLists.txt      | 8 ++------
+ lib/cmetrics/CMakeLists.txt | 8 ++------
+ lib/ctraces/CMakeLists.txt  | 8 ++------
+ lib/monkey/CMakeLists.txt   | 4 ----
+ 4 files changed, 6 insertions(+), 22 deletions(-)
+diff --git a/lib/cfl/CMakeLists.txt b/lib/cfl/CMakeLists.txt
+index 2193cb29c..e2a5cba37 100644
+--- a/lib/cfl/CMakeLists.txt
+++ b/lib/cfl/CMakeLists.txt
+@@ -40,12 +40,8 @@ if(NOT MSVC)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ endif()
+ 
+-# Define __FILENAME__ consistently across Operating Systems
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+-endif()
+# Define __FILENAME__
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ 
+ 
+ 
+diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt
+index 4f2989106..9c40dadf4 100644
+--- a/lib/cmetrics/CMakeLists.txt
+++ b/lib/cmetrics/CMakeLists.txt
+@@ -60,12 +60,8 @@ if(NOT MSVC)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ endif()
+ 
+-# Define __CMT_FILENAME__ consistently across Operating Systems
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
+-endif()
+# Define __CMT_FILENAME__
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
+ 
+ # Configuration options
+ option(CMT_DEV                       "Enable development mode"                   No)
+diff --git a/lib/ctraces/CMakeLists.txt b/lib/ctraces/CMakeLists.txt
+index e92834e06..5cebb3b73 100644
+--- a/lib/ctraces/CMakeLists.txt
+++ b/lib/ctraces/CMakeLists.txt
+@@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR  5)
+ set(CTR_VERSION_PATCH  6)
+ set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}")
+ 
+-# Define __FILENAME__ consistently across Operating Systems
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+-endif()
+# Define __FILENAME__
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ 
+ # Configuration options
+ option(CTR_DEV             "Enable development mode"                   No)
+diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt
+index 95d8cc1e6..8c66887da 100644
+--- a/lib/monkey/CMakeLists.txt
+++ b/lib/monkey/CMakeLists.txt
+@@ -15,10 +15,8 @@ include(GNUInstallDirs)
+ # Set default compiler options
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath \$$<))\"'")
+-else()
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ endif()
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ 
+ # Monkey Version
+ set(MK_VERSION_MAJOR  1)
+-- 
+2.39.2
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch
deleted file mode 100644
index e70664031..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0d22024c5defba7007e3e633753790e20209c6f6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 09:59:41 -0700
-Subject: [PATCH 1/5] monkey: Define _GNU_SOURCE for memmem API check
-This define is necessary to get this API on glibc based systems
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- lib/monkey/mk_core/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/lib/monkey/mk_core/CMakeLists.txt b/lib/monkey/mk_core/CMakeLists.txt
-index 0e74f8d..739fff3 100644
--- a/lib/monkey/mk_core/CMakeLists.txt
-+++ b/lib/monkey/mk_core/CMakeLists.txt
-@@ -62,6 +62,7 @@ set(src "${src}"
-   )
- 
- check_c_source_compiles("
-+  #define _GNU_SOURCE
-   #include <string.h>
-   int main() {
-      char  haystack[] = \"1234\";
-- 
-2.37.1
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch
deleted file mode 100644
index d911420df..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c7b969d1a2a6b61bd179214ee2516b7b6cd55b27 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:21:57 -0700
-Subject: [PATCH 2/5] mbedtls: Remove unused variable
-Fixes
-library/bignum.c:1395:29: error: variable 't' set but not used [-Werror,-Wunused-but-set-variable]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- lib/mbedtls-2.28.0/library/bignum.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/lib/mbedtls-2.28.0/library/bignum.c b/lib/mbedtls-2.28.0/library/bignum.c
-index 62e7f76..9c256ae 100644
--- a/lib/mbedtls-2.28.0/library/bignum.c
-+++ b/lib/mbedtls-2.28.0/library/bignum.c
-@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i,
-                   mbedtls_mpi_uint *d,
-                   mbedtls_mpi_uint b )
- {
-    mbedtls_mpi_uint c = 0, t = 0;
-+    mbedtls_mpi_uint c = 0;
- 
- #if defined(MULADDC_HUIT)
-     for( ; i >= 8; i -= 8 )
-@@ -1443,8 +1443,6 @@ void mpi_mul_hlp( size_t i,
-     }
- #endif /* MULADDC_HUIT */
- 
-    t++;
-
-     while( c != 0 )
-     {
-         *d += c; c = ( *d < c ); d++;
-- 
-2.37.1
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
new file mode 100644
index 000000000..5105444dc
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
@@ -0,0 +1,41 @@
+From c9969cc46e5e4d58db28c89b22bebe42d9f96962 Mon Sep 17 00:00:00 2001
+From: Niko Mauno <niko.mauno@vaisala.com>
+Date: Mon, 21 Oct 2024 16:02:46 +0000
+Subject: [PATCH] CMakeLists.txt: Revise init manager deduction
+The init manager deduction is not cross-compile friendly, so replace
+the host specific condition checks with placeholders that can be
+replaced in Yocto recipe.
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+Upstream-Status: Inappropriate [configuration]
+---
+ src/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 084f2c57d..f0f35f00b 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -532,7 +532,7 @@ if(FLB_BINARY)
+     set(SYSTEMD_UNITDIR  /lib/systemd/system)
+   endif()
+ 
+-  if(SYSTEMD_UNITDIR)
+  if(@INIT_MANAGER_IS_SYSTEMD@)
+     set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
+     configure_file(
+       "${PROJECT_SOURCE_DIR}/init/systemd.in"
+@@ -540,7 +540,7 @@ if(FLB_BINARY)
+       )
+     install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
+     install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
+-  elseif(IS_DIRECTORY /usr/share/upstart)
+  elseif(@INIT_MANAGER_IS_UPSTART@)
+     set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
+     configure_file(
+       "${PROJECT_SOURCE_DIR}/init/upstart.in"
+-- 
+2.39.2
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch
deleted file mode 100644
index 473ebaf7d..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2d12629f768d2459b1fc8a8ca0c38024d84bc195 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:32:12 -0700
-Subject: [PATCH 3/5] mbedtls: Disable documentation warning as error with
- clang
-There are shortcomings with doxygen info which clang-15+ flags, dont
-treat them as errors
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- lib/mbedtls-2.28.0/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/lib/mbedtls-2.28.0/CMakeLists.txt b/lib/mbedtls-2.28.0/CMakeLists.txt
-index b33c088..c5f886f 100644
--- a/lib/mbedtls-2.28.0/CMakeLists.txt
-+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
-@@ -212,7 +212,7 @@ if(CMAKE_COMPILER_IS_GNU)
- endif(CMAKE_COMPILER_IS_GNU)
- 
- if(CMAKE_COMPILER_IS_CLANG)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
-+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wno-error=documentation")
-     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
-     set(CMAKE_C_FLAGS_ASAN        "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
-     set(CMAKE_C_FLAGS_ASANDBG     "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
-- 
-2.37.1
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
deleted file mode 100644
index 158857ae2..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8486b912281ae85db0c9fc05bb546f16872e114c Mon Sep 17 00:00:00 2001
-From: Paulo Neves <ptsneves@gmail.com>
-Date: Thu, 28 Jul 2022 14:37:18 +0200
-Subject: [PATCH] mbedtls: Do not overwrite CFLAGS
-bitbake passes CFLAGS that are often in conflict with the ones set
-in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
-FORTIFY_SOURCE=2 except in release mode
-Upstream-Status: Inappropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.]
---
- lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
--- a/lib/mbedtls-2.28.0/CMakeLists.txt
-+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
-@@ -204,8 +204,6 @@ if(CMAKE_COMPILER_IS_GNU)
-     if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0)
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation")
-     endif()
-    set(CMAKE_C_FLAGS_RELEASE     "-O2")
-    set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")
-     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
-     set(CMAKE_C_FLAGS_ASAN        "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
-     set(CMAKE_C_FLAGS_ASANDBG     "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
-@@ -215,8 +213,6 @@ endif(CMAKE_COMPILER_IS_GNU)
- 
- if(CMAKE_COMPILER_IS_CLANG)
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
-    set(CMAKE_C_FLAGS_RELEASE     "-O2")
-    set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")
-     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
-     set(CMAKE_C_FLAGS_ASAN        "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
-     set(CMAKE_C_FLAGS_ASANDBG     "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch
deleted file mode 100644
index bd4276193..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a797b79483940ed4adcaa5fe2c40dd0487c7c2c7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:39:08 -0700
-Subject: [PATCH 4/5] Use correct type to store return from flb_kv_item_create
-Fix
-error: incompatible pointer to integer conversion assigning to 'int' from 'struct flb_kv *'
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- plugins/out_stackdriver/stackdriver_conf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/plugins/out_stackdriver/stackdriver_conf.c b/plugins/out_stackdriver/stackdriver_conf.c
-index a9a8eb0..e4f969e 100644
--- a/plugins/out_stackdriver/stackdriver_conf.c
-+++ b/plugins/out_stackdriver/stackdriver_conf.c
-@@ -176,12 +176,12 @@ static int read_credentials_file(const char *cred_file, struct flb_stackdriver *
- 
- static int parse_configuration_labels(struct flb_stackdriver *ctx)
- {
-    int ret;
-     char *p;
-     flb_sds_t key;
-     flb_sds_t val;
-     struct mk_list *head;
-     struct flb_slist_entry *entry;
-+    struct flb_kv *ret;
-     msgpack_object_kv *kv = NULL;
- 
-     if (ctx->labels) {
-@@ -216,7 +216,7 @@ static int parse_configuration_labels(struct flb_stackdriver *ctx)
-             flb_sds_destroy(key);
-             flb_sds_destroy(val);
- 
-            if (ret == -1) {
-+            if (!ret) {
-                 return -1;
-             }
-         }
-- 
-2.37.1
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch
deleted file mode 100644
index f6e3dce2f..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7a792624925d46690c1f07fe4b194b5f4c510db6 Mon Sep 17 00:00:00 2001
-From: Paulo Neves <ptsneves@gmail.com>
-Date: Tue, 2 Aug 2022 09:57:05 +0200
-Subject: [PATCH 1/1] build: Make systemd init systemd detection contingent on
- pkgconfig
-Use pkg-config to get systemd.pc variables and systemdunitdir. Those
-variable ensure that .service files are installed in the correct paths
-and only when systemd is detected.
-Upstream-Status: Pending [https://github.com/fluent/fluent-bit/pull/5818]
---
- cmake/FindJournald.cmake | 4 ++++
- src/CMakeLists.txt       | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-diff --git a/cmake/FindJournald.cmake b/cmake/FindJournald.cmake
-index f5a3a832b..9e6657a29 100644
--- a/cmake/FindJournald.cmake
-+++ b/cmake/FindJournald.cmake
-@@ -5,6 +5,8 @@
- #  JOURNALD_INCLUDE_DIR - the Journald include directory
- #  JOURNALD_LIBRARIES - Link these to use Journald
- #  JOURNALD_DEFINITIONS - Compiler switches required for using Journald
-+#  SYSTEMD_UNITDIR - The systemd units' directory
-+#
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- #
-@@ -16,7 +18,9 @@
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PC_JOURNALD QUIET systemd)
-+pkg_get_variable(PC_SYSTEMD_UNITDIR systemd "systemdsystemunitdir")
- 
-+set(SYSTEMD_UNITDIR ${PC_SYSTEMD_UNITDIR})
- set(JOURNALD_FOUND ${PC_JOURNALD_FOUND})
- set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER})
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 522bbf9bd..30743d8d6 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -480,13 +480,13 @@ if(FLB_BINARY)
-   endif()
- 
-   # Detect init system, install upstart, systemd or init.d script
-  if(IS_DIRECTORY /lib/systemd/system)
-+  if(DEFINED SYSTEMD_UNITDIR)
-     set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
-     configure_file(
-       "${PROJECT_SOURCE_DIR}/init/systemd.in"
-       ${FLB_SYSTEMD_SCRIPT}
-       )
-    install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION /lib/systemd/system)
-+    install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
-     install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
-   elseif(IS_DIRECTORY /usr/share/upstart)
-     set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
-- 
-2.25.1
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
index bdcc53496..d1c39d89c 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
@@ -1,7 +1,7 @@
 From 63dbbad5978e5f5b0e7d42614999cb6b4ebcce10 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 10 Aug 2022 01:27:16 -0700
-Subject: [PATCH 2/2] chunkio: Link with fts library with musl
+Subject: [PATCH] chunkio: Link with fts library with musl
 Fixes
 cio_utils.c:(.text+0x64): undefined reference to `fts_read'
@@ -27,4 +27,3 @@ index a4fc2d3..4244eb8 100644
   set(src
 -- 
 2.37.1
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-wasm-avoid-cmake-try_run-when-cross-compiling.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-wasm-avoid-cmake-try_run-when-cross-compiling.patch
new file mode 100644
index 000000000..419e85903
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-wasm-avoid-cmake-try_run-when-cross-compiling.patch
@@ -0,0 +1,42 @@
+From 5b6d274664f92a6c6083f4d27a1b1604a326f22c Mon Sep 17 00:00:00 2001
+From: Patrick Wicki <patrick.wicki@siemens.com>
+Date: Sat, 5 Oct 2024 21:36:12 +0200
+Subject: [PATCH] wasm: avoid cmake try_run when cross-compiling for x86
+This fixes building the wasm micro runtime used when enabling wasm
+support in fluentbit.
+cmake try_run does not work when cross-compiling because the test program
+cannot be executed:
+| CMake Error: try_run() invoked in cross-compiling mode, please set the following cache variables appropriately:
+|    TEST_WRGSBASE_RESULT (advanced)
+| For details see .../fluentbit/3.1.9/build/TryRunResults.cmake
+|      Write linear memory base addr to x86 GS register disabled
+| -- Configuring incomplete, errors occurred!
+Since we cannot run the test program, assume that the instruction is not
+available and disable the option.
+This patch is no longer needed once fluentbit updates WAMR, as it's been
+fixed in https://github.com/bytecodealliance/wasm-micro-runtime/pull/3066.
+Upstream-Status: Pending [https://github.com/fluent/fluent-bit/pull/8744]
+Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com>
+---
+ .../build-scripts/config_common.cmake                           | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake b/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake
+index e73ebc85f..c2504e007 100644
+--- a/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake
+++ b/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake
+@@ -408,7 +408,7 @@ if (WAMR_BUILD_STATIC_PGO EQUAL 1)
+   add_definitions (-DWASM_ENABLE_STATIC_PGO=1)
+   message ("     AOT static PGO enabled")
+ endif ()
+-if (WAMR_DISABLE_WRITE_GS_BASE EQUAL 1)
+if (WAMR_DISABLE_WRITE_GS_BASE EQUAL 1 OR CMAKE_CROSSCOMPILING)
+   add_definitions (-DWASM_DISABLE_WRITE_GS_BASE=1)
+   message ("     Write linear memory base addr to x86 GS register disabled")
+ elseif (WAMR_BUILD_TARGET STREQUAL "X86_64"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch
new file mode 100644
index 000000000..bcce32803
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch
@@ -0,0 +1,28 @@
+From f645128082117a0152a95b3dccd869a184b7513f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 10 Aug 2022 01:23:48 -0700
+Subject: [PATCH] Use posix strerror_r with musl
+Default with glibc is GNU extention of strerror_r
+where as musl uses posix variant, call that out
+Upstream-Status: Inappropriate [Need wider porting beyond linux/musl/glibc]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Resolved conflicts while upgrading recipe from v1.9.9 to v3.1.9.
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+diff --git a/src/flb_network.c b/src/flb_network.c
+index d183209fd..41e0281b5 100644
+--- a/src/flb_network.c
+++ b/src/flb_network.c
+@@ -553,7 +553,7 @@ static int net_connect_async(int fd,
+             /* Connection is broken, not much to do here */
+ #if ((defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) ||    \
+      (defined(_XOPEN_SOURCE) || _XOPEN_SOURCE - 0L >= 600L)) &&     \
+-  (!defined(_GNU_SOURCE))
+  (!defined(_GNU_SOURCE)) || (!defined(__GLIBC__))
+             ret = strerror_r(error, so_error_buf, sizeof(so_error_buf));
+             if (ret == 0) {
+                 str = so_error_buf;
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch
deleted file mode 100644
index f023ab573..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27f0bd5a3339612e03112e6b490900a9fabc3337 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:44:25 -0700
-Subject: [PATCH 5/5] stackdriver: Fix return type mismatch
-Fix
-error: incompatible integer to pointer conversion returning 'int' from a function with result type 'flb_sds_t' (aka 'char *') [-Wint-conversion]
-            return -1;
-                   ^~
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- plugins/out_stackdriver/stackdriver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/plugins/out_stackdriver/stackdriver.c b/plugins/out_stackdriver/stackdriver.c
-index ae66bf2..e01755c 100644
--- a/plugins/out_stackdriver/stackdriver.c
-+++ b/plugins/out_stackdriver/stackdriver.c
-@@ -2033,7 +2033,7 @@ static flb_sds_t stackdriver_format(struct flb_stackdriver *ctx,
-             flb_sds_destroy(operation_producer);
-             msgpack_unpacked_destroy(&result);
-             msgpack_sbuffer_destroy(&mp_sbuf);
-            return -1;
-+            return NULL; 
-         }
- 
-         /* Number of parsed labels */
-- 
-2.37.1
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch
deleted file mode 100644
index c3f2574d2..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f88d9b82e8bd8ae38fba666b5825ffb41769f81a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 12:25:22 -0700
-Subject: [PATCH] monkey: Fix TLS detection testcase
-Clang15 errors out on compiling the check and disables TLS
-Fixes errors like
-error: call to undeclared function '__tls_get_addr'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-         __tls_get_addr(0);
-         ^
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- lib/monkey/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt
-index 15e62e8..96ac2bd 100644
--- a/lib/monkey/CMakeLists.txt
-+++ b/lib/monkey/CMakeLists.txt
-@@ -178,6 +178,8 @@ endif()
- # Use old Pthread TLS
- if(NOT MK_PTHREAD_TLS)
-   check_c_source_compiles("
-+     #include <sys/types.h>
-+     extern void *__tls_get_addr(size_t *v);
-      __thread int a;
-      int main() {
-          __tls_get_addr(0);
-- 
-2.37.1
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch
deleted file mode 100644
index 71bdd34ee..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c41653e856d05ed430d22f8b311714ff756a0e0b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 23 Mar 2023 18:05:27 -0700
-Subject: [PATCH] cmake: Do not check for upstart on build host
-Some ubuntu distros might have this directory /usr/share/upstart around
-and yocto based distros not using systemd will process this piece of
-code and falsely assume that target supports upstart, which may not be
-true in case of cross-compilation.
-This also can end up in configure errors e.g.
-| CMake Error at src/CMakeLists.txt:496 (install):
-|   install DIRECTORY given unknown argument "/etc/td-agent-bit/".
-|
-|
-| -- Configuring incomplete, errors occurred!
-Upstream-Status: Inappropriate [ Cross-compile Specific ]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bb30b2a..c63b6d8 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -486,14 +486,6 @@ if(FLB_BINARY)
-       )
-     install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
-     install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
-  elseif(IS_DIRECTORY /usr/share/upstart)
-    set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
-    configure_file(
-      "${PROJECT_SOURCE_DIR}/init/upstart.in"
-      ${FLB_UPSTART_SCRIPT}
-      )
-    install(FILES ${FLB_UPSTART_SCRIPT} COMPONENT binary DESTINATION /etc/init)
-    install(DIRECTORY DESTINATION COMPONENT binary ${FLB_INSTALL_CONFDIR})
-   else()
-     # FIXME: should we support Sysv init script ?
-   endif()
-- 
-2.40.0
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb
deleted file mode 100644
index 660a3a63e..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb
+++ /dev/null
@@ -1,97 +0,0 @@
-SUMMARY = "Fast Log processor and Forwarder"
-DESCRIPTION = "Fluent Bit is a data collector, processor and  \
-forwarder for Linux. It supports several input sources and \
-backends (destinations) for your data. \
-"
-HOMEPAGE = "http://fluentbit.io"
-BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
-SECTION = "net"
-SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-bit-${PV};downloadfilename=${BPN}-${PV}.tar.gz \
-           file://0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch \
-           file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \
-           file://0003-mbedtls-Do-not-overwrite-CFLAGS.patch \
-           file://0004-build-Make-systemd-init-systemd-detection-contingent.patch \
-           file://0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch \
-           file://0002-mbedtls-Remove-unused-variable.patch \
-           file://0003-mbedtls-Disable-documentation-warning-as-error-with-.patch \
-           file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \
-           file://0005-stackdriver-Fix-return-type-mismatch.patch \
-           file://0006-monkey-Fix-TLS-detection-testcase.patch \
-           file://0007-cmake-Do-not-check-for-upstart-on-build-host.patch \
-           "
-SRC_URI:remove:x86 = "file://0002-mbedtls-Remove-unused-variable.patch"
-SRC_URI:append:libc-musl = "\
-           file://0001-Use-posix-strerror_r-with-musl.patch \
-           file://0002-chunkio-Link-with-fts-library-with-musl.patch \
-           "
-SRC_URI[sha256sum] = "3f6cd4bd1894cda16b465aef6ffec7e920d54c4209b3e2320fcffe7ae345700e"
-S = "${WORKDIR}/fluent-bit-${PV}"
-DEPENDS = "zlib bison-native flex-native openssl"
-DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-PACKAGECONFIG[yaml] = "-DFLB_CONFIG_YAML=On,-DFLB_CONFIG_YAML=Off,libyaml"
-PACKAGECONFIG[kafka] = "-DFLB_OUT_KAFKA=On,-DFLB_OUT_KAFKA=Off,librdkafka"
-PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=On,-DFLB_EXAMPLES=Off"
-PACKAGECONFIG[jemalloc] = "-DFLB_JEMALLOC=On,-DFLB_JEMALLOC=Off,jemalloc"
-#TODO add more fluentbit options to PACKAGECONFIG[]
-DEPENDS:append:libc-musl = " fts "
-# flex hardcodes the input file in #line directives leading to TMPDIR contamination of debug sources.
-do_compile:append() {
-    find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|${TARGET_DBGSRC_DIR}/|g'
-}
-PACKAGECONFIG ?= "yaml"
-LTO = ""
-# Use CMake 'Unix Makefiles' generator
-OECMAKE_GENERATOR ?= "Unix Makefiles"
-# Fluent Bit build options
-# ========================
-# Host related setup
-EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_TD=1"
-# Disable LuaJIT and filter_lua support
-EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off "
-# Disable Library and examples
-EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off"
-# Enable systemd iff systemd is in DISTRO_FEATURES
-EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','-DFLB_SYSTEMD=Off',d)}"
-# Enable release builds
-EXTRA_OECMAKE += "-DFLB_RELEASE=On"
-# musl needs these options
-EXTRA_OECMAKE:append:libc-musl = ' -DFLB_JEMALLOC_OPTIONS="--with-jemalloc-prefix=je_ --with-lg-quantum=3" -DFLB_CORO_STACK_SIZE=24576'
-EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:powerpc = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2"
-# Fixes build with GCC-14
-CFLAGS += "-Wno-error=incompatible-pointer-types"
-inherit cmake systemd pkgconfig
-SYSTEMD_SERVICE:${PN} = "td-agent-bit.service"
-EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/"
-TARGET_CC_ARCH += " ${SELECTED_OPTIMIZATION}"
-SKIP_RECIPE[fluentbit] ?= "It is not reproducible. QA Issue: File /usr/bin/.debug/td-agent-bit in package fluentbit-dbg contains reference to TMPDIR [buildpaths]"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_3.1.9.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_3.1.9.bb
new file mode 100644
index 000000000..9eea8d6da
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_3.1.9.bb
@@ -0,0 +1,134 @@
+SUMMARY = "Fast Log Processor and Forwarder"
+DESCRIPTION = "Fluent Bit allows to collect log events or metrics from \
+different sources, process them and deliver them to different backends \
+such as Fluentd, Elasticsearch, Splunk, DataDog, Kafka, New Relic, Azure \
+services, AWS services, Google services, NATS, InfluxDB or any custom \
+HTTP end-point."
+HOMEPAGE = "http://fluentbit.io"
+BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
+SECTION = "net"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
+DEPENDS = "\
+    bison-native \
+    flex-native \
+    openssl \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+DEPENDS:append:libc-musl = " fts"
+SRCREV = "431fa79ae27edaef8d050a7af6f038f4400193a1"
+SRC_URI = "\
+    git://github.com/fluent/fluent-bit.git;branch=3.1;protocol=https \
+    file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \
+    file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \
+    file://0003-CMakeLists.txt-Revise-init-manager-deduction.patch \
+    file://0004-wasm-avoid-cmake-try_run-when-cross-compiling.patch \
+"
+SRC_URI:append:libc-musl = "\
+    file://0004-chunkio-Link-with-fts-library-with-musl.patch \
+    file://0005-Use-posix-strerror_r-with-musl.patch \
+"
+S = "${WORKDIR}/git"
+PACKAGECONFIG ??= "\
+    aws \
+    binary \
+    config-yaml \
+    custom-calyptia \
+    http-server \
+    inotify \
+    ipo \
+    metrics \
+    parser \
+    proxy-go \
+    record-accessor \
+    regex \
+    release \
+    signv4 \
+    sqldb \
+    stream-processor \
+    tls \
+    utf8-encoder \
+"
+# See https://github.com/fluent/fluent-bit/issues/7248#issuecomment-1631280496
+PACKAGECONFIG:remove:toolchain-clang = "ipo"
+PACKAGECONFIG[all] = "-DFLB_ALL=Yes,-DFLB_ALL=No"
+PACKAGECONFIG[arrow] = "-DFLB_ARROW=Yes,-DFLB_ARROW=No"
+PACKAGECONFIG[avro-encoder] = "-DFLB_AVRO_ENCODER=Yes,-DFLB_AVRO_ENCODER=No"
+PACKAGECONFIG[aws-error-reporter] = "-DFLB_AWS_ERROR_REPORTER=Yes,-DFLB_AWS_ERROR_REPORTER=No"
+PACKAGECONFIG[aws] = "-DFLB_AWS=Yes,-DFLB_AWS=No"
+PACKAGECONFIG[backtrace] = "-DFLB_BACKTRACE=Yes,-DFLB_BACKTRACE=No"
+PACKAGECONFIG[binary] = "-DFLB_BINARY=Yes,-DFLB_BINARY=No"
+PACKAGECONFIG[chunk-trace] = "-DFLB_CHUNK_TRACE=Yes,-DFLB_CHUNK_TRACE=No"
+PACKAGECONFIG[config-yaml] = "-DFLB_CONFIG_YAML=Yes,-DFLB_CONFIG_YAML=No,libyaml"
+PACKAGECONFIG[coverage] = "-DFLB_COVERAGE=Yes,-DFLB_COVERAGE=No"
+PACKAGECONFIG[custom-calyptia] = "-DFLB_CUSTOM_CALYPTIA=Yes,-DFLB_CUSTOM_CALYPTIA=No"
+PACKAGECONFIG[debug] = "-DFLB_DEBUG=Yes,-DFLB_DEBUG=No"
+PACKAGECONFIG[enforce-alignment] = "-DFLB_ENFORCE_ALIGNMENT=Yes,-DFLB_ENFORCE_ALIGNMENT=No"
+PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=Yes,-DFLB_EXAMPLES=No"
+PACKAGECONFIG[http-client-debug] = "-DFLB_HTTP_CLIENT_DEBUG=Yes,-DFLB_HTTP_CLIENT_DEBUG=No"
+PACKAGECONFIG[http-server] = "-DFLB_HTTP_SERVER=Yes,-DFLB_HTTP_SERVER=No"
+PACKAGECONFIG[inotify] = "-DFLB_INOTIFY=Yes,-DFLB_INOTIFY=No"
+PACKAGECONFIG[ipo] = "-DFLB_IPO=Yes,-DFLB_IPO=no"
+PACKAGECONFIG[jemalloc] = "-DFLB_JEMALLOC=Yes,-DFLB_JEMALLOC=No,jemalloc"
+PACKAGECONFIG[luajit] = "-DFLB_LUAJIT=Yes,-DFLB_LUAJIT=No"
+PACKAGECONFIG[metrics] = "-DFLB_METRICS=Yes,-DFLB_METRICS=No"
+PACKAGECONFIG[mtrace] = "-DFLB_MTRACE=Yes,-DFLB_MTRACE=No"
+PACKAGECONFIG[parser] = "-DFLB_PARSER=Yes,-DFLB_PARSER=No"
+PACKAGECONFIG[posix-tls] = "-DFLB_POSIX_TLS=Yes,-DFLB_POSIX_TLS=No"
+PACKAGECONFIG[proxy-go] = "-DFLB_PROXY_GO=Yes,-DFLB_PROXY_GO=No"
+PACKAGECONFIG[record-accessor] = "-DFLB_RECORD_ACCESSOR=Yes,-DFLB_RECORD_ACCESSOR=No"
+PACKAGECONFIG[regex] = "-DFLB_REGEX=Yes,-DFLB_REGEX=No"
+PACKAGECONFIG[release] = "-DFLB_RELEASE=Yes,-DFLB_RELEASE=No"
+PACKAGECONFIG[run-ldconfig] = "-DFLB_RUN_LDCONFIG=Yes,-DFLB_RUN_LDCONFIG=No"
+PACKAGECONFIG[shared-lib] = "-DFLB_SHARED_LIB=Yes,-DFLB_SHARED_LIB=No"
+PACKAGECONFIG[signv4] = "-DFLB_SIGNV4=Yes,-DFLB_SIGNV4=No"
+PACKAGECONFIG[small] = "-DFLB_SMALL=Yes,-DFLB_SMALL=No"
+PACKAGECONFIG[sqldb] = "-DFLB_SQLDB=Yes,-DFLB_SQLDB=No"
+PACKAGECONFIG[stream-processor] = "-DFLB_STREAM_PROCESSOR=Yes,-DFLB_STREAM_PROCESSOR=No"
+PACKAGECONFIG[tests-runtime] = "-DFLB_TESTS_RUNTIME=Yes,-DFLB_TESTS_RUNTIME=No"
+PACKAGECONFIG[tls] = "-DFLB_TLS=Yes,-DFLB_TLS=No"
+PACKAGECONFIG[trace] = "-DFLB_TRACE=Yes,-DFLB_TRACE=No"
+PACKAGECONFIG[utf8-encoder] = "-DFLB_UTF8_ENCODER=Yes,-DFLB_UTF8_ENCODER=No"
+PACKAGECONFIG[valgrind] = "-DFLB_VALGRIND=Yes,-DFLB_VALGRIND=No"
+PACKAGECONFIG[wamrc] = "-DFLB_WAMRC=Yes,-DFLB_WAMRC=No"
+PACKAGECONFIG[wasm-stack-protect] = "-DFLB_WASM_STACK_PROTECT=Yes,-DFLB_WASM_STACK_PROTECT=No"
+PACKAGECONFIG[wasm] = "-DFLB_WASM=Yes,-DFLB_WASM=No"
+PACKAGECONFIG[windows-defaults] = "-DFLB_WINDOWS_DEFAULTS=Yes,-DFLB_WINDOWS_DEFAULTS=No"
+# Option to disable all Fluent Bit plugins by default. See cmake/plugins_options.cmake which
+# individual plugins then to enable (e.g. using EXTRA_OECMAKE:append = " -DFLB_FOOBAR=ON")
+PACKAGECONFIG[minimal] = "-DFLB_MINIMAL=Yes,-DFLB_MINIMAL=No"
+# Without zstd dependency, kafka plugin build fails at link attempt against native libzstd.so
+PACKAGECONFIG[in-kafka] = "-DFLB_IN_KAFKA=ON,-DFLB_IN_KAFKA=OFF,librdkafka zstd"
+PACKAGECONFIG[out-kafka] = "-DFLB_OUT_KAFKA=ON,-DFLB_OUT_KAFKA=OFF,librdkafka zstd"
+SYSTEMD_SERVICE:${PN} = "fluent-bit.service"
+inherit cmake systemd pkgconfig
+FULL_OPTIMIZATION:remove = "${@'-O2' if bb.data.inherits_class('clang', d) else ''}"
+TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}"
+TARGET_CC_ARCH:remove = "-D_FORTIFY_SOURCE=2"
+EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/"
+EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
+EXTRA_OECMAKE:append:powerpc = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
+EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
+EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
+EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
+do_configure:prepend() {
+    sed -i \
+        -e 's#@INIT_MANAGER_IS_SYSTEMD@#'${@'TRUE' if d.getVar('INIT_MANAGER') == 'systemd' else 'FALSE'}'#' \
+        -e 's#@INIT_MANAGER_IS_UPSTART@#'${@'TRUE' if d.getVar('INIT_MANAGER') == 'upstart' else 'FALSE'}'#' \
+        ${S}/src/CMakeLists.txt
+}
+# flex hardcodes the input file in #line directives leading to TMPDIR contamination of debug sources.
+do_compile:append() {
+    find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|${TARGET_DBGSRC_DIR}/|g'
+}
diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.19.bb
index 97c354aba..ba897cc71 100644
--- a/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb
+++ b/meta-oe/recipes-extended/haveged/haveged_1.9.19.bb
@@ -6,8 +6,7 @@ HOMEPAGE = "https://www.issihosts.com/haveged/index.html"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-# v1.9.17
+SRCREV = "0ef7dd915ee8be4ca2bb10b5cc2bee92b8ede61d"
-SRCREV = "80ee9289569bc13efff4e0b5db3661cb513802b2"
 SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \
 "
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch b/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch
index bafe218f0..ecc9c441c 100644
--- a/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch
+++ b/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch
@@ -1,4 +1,4 @@
-From 5d40c0c49f9acde83ba71b6f59094cdbd12e1b78 Mon Sep 17 00:00:00 2001
+From b06541a75043c9a8213187fca942a0270783bd0e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 17 Sep 2024 18:22:36 +0000
 Subject: [PATCH] Add cmake check for deducing 32bit or 64bit RISCV
@@ -7,52 +7,49 @@ Currently its only compilable for RV64 when RVV is
 enabled, this will extend it to build for RV32 with
 RVV as well
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/google/highway/pull/2330]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- CMakeLists.txt | 36 ++++++++++++++++++++++++++++++++++--
+ CMakeLists.txt | 38 +++++++++++++++++++++++++++++++++++---
- 1 file changed, 34 insertions(+), 2 deletions(-)
+ 1 file changed, 35 insertions(+), 3 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea8b330c..cd824787 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -65,6 +65,34 @@ if (NOT CMAKE_BUILD_TYPE)
+@@ -59,6 +59,33 @@ if(CHECK_PIE_SUPPORTED)
-   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+   endif()
 endif()
 
-+include(CheckCSourceCompiles)
+if (CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "RISCV32|RISCV64|RISCV128" OR CMAKE_SYSTEM_PROCESSOR MATCHES "riscv32|riscv64|riscv128")
+  include(CheckCSourceCompiles)
+  check_c_source_compiles("
+  #if __riscv_xlen == 64
+  int main() { return 0; }
+  #else
+  #error Not RISCV-64
+  #endif
+  " IS_RISCV_XLEN_64)
 +
-+check_c_source_compiles("
+  check_c_source_compiles("
-+#if __riscv_xlen == 64
+  #if __riscv_xlen == 32
-+int main() { return 0; }
+  int main() { return 0; }
-+#else
+  #else
-+#error Not RISCV-64
+  #error Not RISCV-32
-+#endif
+  #endif
-+" IS_RISCV_XLEN_64)
+  " IS_RISCV_XLEN_32)
 +
-+check_c_source_compiles("
+  if(IS_RISCV_XLEN_32)
-+#if __riscv_xlen == 32
+    set(RISCV_XLEN 32)
-+int main() { return 0; }
+  elseif(IS_RISCV_XLEN_64)
-+#else
+    set(RISCV_XLEN 64)
-+#error Not RISCV-32
+  else()
-+#endif
+    message(WARNING "Unable to determine RISC-V XLEN")
-+" IS_RISCV_XLEN_32)
+  endif()
-+
-+if(IS_RISCV_XLEN_32)
-+  set(RISCV_XLEN 32)
-+elseif(IS_RISCV_XLEN_64)
-+  set(RISCV_XLEN 64)
-+else()
-+  message(WARNING "Unable to determine RISC-V XLEN")
 +endif()
 +
-+message(STATUS "RISC-V XLEN: ${RISCV_XLEN}")
+ include(GNUInstallDirs)
-+
- # The following is only required with GCC < 6.1.0 or CLANG < 16.0
- set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4)?")
 
-@@ -72,7 +100,7 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4
+ if (NOT CMAKE_BUILD_TYPE)
+@@ -72,7 +99,7 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set c
 # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard.
 set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?")
 
@@ -61,15 +58,17 @@ index ea8b330c..cd824787 100644
 set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?")
 
 # Unconditionally adding -Werror risks breaking the build when new warnings
-@@ -378,7 +406,11 @@ else()
+@@ -378,7 +405,13 @@ else()
     # we add the gcv compiler flag, which then requires the CPU (now when using
     # either compiler) to support V.
     if(HWY_CMAKE_RVV)
 -      list(APPEND HWY_FLAGS -march=rv64gcv1p0)
 +      if(RISCV_XLEN EQUAL 64)
 +        list(APPEND HWY_FLAGS -march=rv64gcv1p0)
+        add_link_options(-march=rv64gcv1p0)
 +      elseif(RISCV_XLEN EQUAL 32)
 +        list(APPEND HWY_FLAGS -march=rv32gcv1p0)
+        add_link_options(-march=rv32gcv1p0)
 +      endif()
       if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
         list(APPEND HWY_FLAGS -menable-experimental-extensions)
diff --git a/meta-oe/recipes-extended/highway/highway_1.2.0.bb b/meta-oe/recipes-extended/highway/highway_1.2.0.bb
index d226cd82c..e7dfc706b 100644
--- a/meta-oe/recipes-extended/highway/highway_1.2.0.bb
+++ b/meta-oe/recipes-extended/highway/highway_1.2.0.bb
@@ -17,5 +17,3 @@ EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
 CXXFLAGS:append:arm = " -mfp16-format=ieee"
 # Option not supported with clang and its default format for __fp16 anyway with clang
 CXXFLAGS:remove:toolchain-clang = "-mfp16-format=ieee"
-TOOLCHAIN = "gcc"
diff --git a/meta-oe/recipes-extended/jansson/jansson/0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch b/meta-oe/recipes-extended/jansson/jansson/0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch
new file mode 100644
index 000000000..5298cfbef
--- /dev/null
+++ b/meta-oe/recipes-extended/jansson/jansson/0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch
@@ -0,0 +1,51 @@
+From 521d37abc0ed1178a39298d06d80d8d0e2a43e28 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Tue, 10 Sep 2024 00:48:00 -0700
+Subject: [PATCH] add back JSON_INTEGER_IS_LONG_LONG for cmake
+For autotools, JSON_INTEGER_IS_LONG_LONG is defined, but for
+cmake, it's not. This means such macro, which is also documented,
+is not consistent across different build systems. This is not
+good, so add it for cmake.
+This patch refers 8b975abca1055d40637c90b1dc4585af1d7df76c and is
+part of it. So the upstream-status is marked as 'oe specific'.
+Upstream-Status: Inappropriate [OE Specific]
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ CMakeLists.txt               | 1 +
+ cmake/jansson_config.h.cmake | 4 +---
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 39b9ad3..0e95a94 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -193,6 +193,7 @@ endif ()
+ # detect what to use for the 64 bit type.
+ # Note: I will prefer long long if I can get it, as that is what the automake system aimed for.
+ if (NOT DEFINED JSON_INT_T)
+   set (JSON_INTEGER_IS_LONG_LONG 1)
+    if (HAVE_LONG_LONG_INT AND (LONG_LONG_INT EQUAL 8))
+       set (JSON_INT_T "long long")
+    elseif (HAVE_INT64_T)
+diff --git a/cmake/jansson_config.h.cmake b/cmake/jansson_config.h.cmake
+index 2f248cb..bec64da 100644
+--- a/cmake/jansson_config.h.cmake
+++ b/cmake/jansson_config.h.cmake
+@@ -21,9 +21,7 @@
+ #define JANSSON_USING_CMAKE
+ #endif
+ 
+-/* Note: when using cmake, JSON_INTEGER_IS_LONG_LONG is not defined nor used,
+- * as we will also check for __int64 etc types.
+- * (the definition was used in the automake system) */
+#cmakedefine JSON_INTEGER_IS_LONG_LONG 1
+ 
+ /* Bring in the cmake-detected defines */
+ #cmakedefine HAVE_STDINT_H 1
+-- 
+2.42.0
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.14.bb b/meta-oe/recipes-extended/jansson/jansson_2.14.bb
index fb42509f3..9f5cdcf4c 100644
--- a/meta-oe/recipes-extended/jansson/jansson_2.14.bb
+++ b/meta-oe/recipes-extended/jansson/jansson_2.14.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf"
 SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \
           file://0001-Fix-overwriting-linker-flags.patch \
           file://0001-Honour-multilib-paths.patch \
+           file://0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch \
           "
 SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9"
diff --git a/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch b/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch
deleted file mode 100644
index 8129c1e2a..000000000
--- a/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 3aad8d471201da4125bd03d7a6921707461fe182 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Fri, 7 Jun 2024 10:06:22 +0200
-Subject: [PATCH 1/3] fs: Ignore unused-parameter warning in the FS plugin
-There are some unused parameters in the libext2fs header which
-together with Wall and Werror means the plugin compilation fails.
-As a workaround we'll disable the unused-parameter warning for
-now.
-Fixes: #1026
-Taken from Fedora
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/plugins/fs/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am
-index 7d4849c0..00474d5a 100644
--- a/src/plugins/fs/Makefile.am
-+++ b/src/plugins/fs/Makefile.am
-@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
- 
- lib_LTLIBRARIES = libbd_fs.la
- 
-libbd_fs_la_CFLAGS   = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror
-+libbd_fs_la_CFLAGS   = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter
- libbd_fs_la_LIBADD   = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS)
- libbd_fs_la_LDFLAGS     = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*'
- libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../
-- 
-2.45.2
-From da5c14f3e2f83c8c40203897154ee2b788782792 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Fri, 7 Jun 2024 15:21:09 +0200
-Subject: [PATCH 2/3] fs: Ignore shift-count-overflow warning in FS plugin
-The warning happens in the libext2fs header.
---
- src/plugins/fs/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am
-index 00474d5a..42e1c777 100644
--- a/src/plugins/fs/Makefile.am
-+++ b/src/plugins/fs/Makefile.am
-@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
- 
- lib_LTLIBRARIES = libbd_fs.la
- 
-libbd_fs_la_CFLAGS   = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter
-+libbd_fs_la_CFLAGS   = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow
- libbd_fs_la_LIBADD   = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS)
- libbd_fs_la_LDFLAGS     = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*'
- libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../
-- 
-2.45.2
-From 90ceb4b52fbda34673fe5303da84b9a902187503 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Wed, 12 Jun 2024 15:34:02 +0200
-Subject: [PATCH 3/3] fs: Fix ignoring errors from libext2fs
-Follow-up for #1028, we still want to show the warning and not
-completely supress it.
---
- src/plugins/fs/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am
-index 42e1c777..1ee256f0 100644
--- a/src/plugins/fs/Makefile.am
-+++ b/src/plugins/fs/Makefile.am
-@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
- 
- lib_LTLIBRARIES = libbd_fs.la
- 
-libbd_fs_la_CFLAGS   = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow
-+libbd_fs_la_CFLAGS   = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-error=unused-parameter -Wno-error=shift-count-overflow
- libbd_fs_la_LIBADD   = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS)
- libbd_fs_la_LDFLAGS     = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*'
- libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../
-- 
-2.45.2
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.0.bb
index a42e09d33..baf2acca5 100644
--- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb
+++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.0.bb
@@ -12,19 +12,18 @@ inherit autotools gobject-introspection pkgconfig lib_package
 DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme"
-SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \
+SRC_URI = "git://github.com/storaged-project/libblockdev;branch=master;protocol=https \
           file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \
-           file://0001-libext2fs-unused-parameters-fix.patch \
           "
-SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050"
+SRCREV = "27881cb6e57eb0146c51d032ea72fbb3cd6bda7e"
 S = "${WORKDIR}/git"
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
-PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools"
+PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools smart smartmontools"
 PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3"
-PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2"
+PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools libyaml, lvm2"
-PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2"
+PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools libyaml, lvm2"
 PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2"
 PACKAGECONFIG[parted] = "--with-part, --without-part, parted"
 PACKAGECONFIG[fs] = "--with-fs, --without-fs, e2fsprogs util-linux"
@@ -36,5 +35,7 @@ PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup keyutils nss
 PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize"
 PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2"
 PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper"
+PACKAGECONFIG[smart] = "--with-smart,--without-smart,libatasmart"
+PACKAGECONFIG[smartmontools] = "--with-smartmontools,--without-smartmontools,json-glib,smartmontools"
 export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs"
diff --git a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb b/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb
index 599416cb2..22155e534 100644
--- a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb
+++ b/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb
@@ -22,7 +22,7 @@ S = "${WORKDIR}/git"
 inherit cmake pkgconfig
 # default config is for RaspberryPi API, use the Linux 4.10+ API by default
-PLATFORM_CMAKE_FLAGS ?= "-DHAVE_LINUX_API=1 -DHAVE_RPI_API=0"
+PLATFORM_CMAKE_FLAGS ?= "-DHAVE_LINUX_API=1 -DHAVE_RPI_API=0 -DSKIP_PYTHON_WRAPPER=1"
 EXTRA_OECMAKE += "${PLATFORM_CMAKE_FLAGS}"
 # Put client examples into separate packages
diff --git a/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch b/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch
deleted file mode 100644
index 1dbf2955c..000000000
--- a/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 66c1646a3f12836846a054ebd2c427e30c93d3a5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 2 Apr 2023 10:37:15 -0700
-Subject: [PATCH] largefile.m4: Sync with latest gnulib
-This ensures it can work with latest autoconf 2.72 release ( upcoming )
-Upstream-Status: Backport [it will be not needed with 1.42 release]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- gl/m4/largefile.m4 | 330 ++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 263 insertions(+), 67 deletions(-)
-diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4
-index 3e8b5e3..7fb81b8 100644
--- a/gl/m4/largefile.m4
-+++ b/gl/m4/largefile.m4
-@@ -1,7 +1,7 @@
- # Enable large files on systems where this is not the default.
- # Enable support for files on Linux file systems with 64-bit inode numbers.
- 
-# Copyright 1992-1996, 1998-2022 Free Software Foundation, Inc.
-+# Copyright 1992-1996, 1998-2023 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,8 +10,9 @@
- # It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this
- # setting of _LARGEFILE_SOURCE is needed so that <stdio.h> declares fseeko
- # and ftello in C++ mode as well.
-+# Fixed in Autoconf 2.72, which has AC_SYS_YEAR2038.
- AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
-[
-+ m4_ifndef([AC_SYS_YEAR2038], [[
-   AC_REQUIRE([AC_CANONICAL_HOST])
-   AC_FUNC_FSEEKO
-   case "$host_os" in
-@@ -20,10 +21,10 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
-         [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).])
-       ;;
-   esac
-])
-+ ]])
-+)
- 
-# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+
-# with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
-+# Work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
- # or configures them incorrectly in some cases.
- m4_version_prereq([2.70], [], [
-@@ -43,33 +44,258 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
- ])
- ])# m4_version_prereq 2.70
- 
-+# Support AC_SYS_YEAR2038, even if Autoconf 2.71 or earlier.
-+# This code is taken from Autoconf master.
-+m4_ifndef([AC_SYS_YEAR2038], [
-+
-+# _AC_SYS_YEAR2038_TEST_CODE
-+# --------------------------
-+# C code used to probe for time_t that can represent time points more
-+# than 2**31 - 1 seconds after the epoch.  With the usual Unix epoch,
-+# these correspond to dates after 2038-01-18 22:14:07 +0000 (Gregorian),
-+# hence the name.
-+AC_DEFUN([_AC_SYS_YEAR2038_TEST_CODE],
-+[[
-+  #include <time.h>
-+  /* Check that time_t can represent 2**32 - 1 correctly.  */
-+  #define LARGE_TIME_T \\
-+    ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30)))
-+  int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535
-+                           && LARGE_TIME_T % 65537 == 0)
-+                          ? 1 : -1];
-+]])
-+
-+# _AC_SYS_YEAR2038_OPTIONS
-+# ------------------------
-+# List of known ways to enable support for large time_t.  If you change
-+# this list you probably also need to change the AS_CASE at the end of
-+# _AC_SYS_YEAR2038_PROBE.
-+m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize(
-+    ["none needed"]                   dnl 64-bit and newer 32-bit Unix
-+    ["-D_TIME_BITS=64"]               dnl glibc 2.34 with some 32-bit ABIs
-+    ["-D__MINGW_USE_VC2005_COMPAT"]   dnl 32-bit MinGW
-+    ["-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"]
-+                                      dnl 32-bit MinGW (misconfiguration)
-+))
-+
-+# _AC_SYS_YEAR2038_PROBE([IF-NOT-DETECTED])
-+# -----------------------------------------
-+# Subroutine of AC_SYS_YEAR2038.  Probe for time_t that can represent
-+# time points more than 2**31 - 1 seconds after the epoch (dates after
-+# 2038-01-18, see above) and set the cache variable ac_cv_sys_year2038_opts
-+# to one of the values in the _AC_SYS_YEAR2038_OPTIONS list, or to
-+# "support not detected" if none of them worked.  Then, set compilation
-+# options and #defines as necessary to enable large time_t support.
-+#
-+# Note that we do not test whether mktime, localtime, etc. handle
-+# large values of time_t correctly, as that would require use of
-+# AC_TRY_RUN.  Note also that some systems only support large time_t
-+# together with large off_t.
-+#
-+# If support is not detected, the behavior depends on which of the
-+# top-level AC_SYS_YEAR2038 macros was used (see below).
-+#
-+# If you change this macro you may also need to change
-+# _AC_SYS_YEAR2038_OPTIONS.
-+AC_DEFUN([_AC_SYS_YEAR2038_PROBE],
-+[AC_CACHE_CHECK([for $CC option to enable timestamps after Jan 2038],
-+  [ac_cv_sys_year2038_opts],
-+  [ac_save_CPPFLAGS="$CPPFLAGS"
-+  ac_opt_found=no
-+  for ac_opt in _AC_SYS_YEAR2038_OPTIONS; do
-+    AS_IF([test x"$ac_opt" != x"none needed"],
-+      [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"])
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_YEAR2038_TEST_CODE])],
-+      [ac_cv_sys_year2038_opts="$ac_opt"
-+      ac_opt_found=yes])
-+    test $ac_opt_found = no || break
-+  done
-+  CPPFLAGS="$ac_save_CPPFLAGS"
-+  test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected"])
-+
-+ac_have_year2038=yes
-+AS_CASE([$ac_cv_sys_year2038_opts],
-+  ["none needed"], [],
-+  ["support not detected"],
-+    [ac_have_year2038=no
-+     AS_CASE([$enable_year2038],
-+      [yes],
-+        [# If we're not cross compiling and 'touch' works with a large
-+        # timestamp, then we can presume the system supports wider time_t
-+        # *somehow* and we just weren't able to detect it.  One common
-+        # case that we deliberately *don't* probe for is a system that
-+        # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers
-+        # wide time_t.  (It would be inappropriate for us to override an
-+        # intentional use of -m32.)  Error out, demanding use of
-+        # --disable-year2038 if this is intentional.
-+        AS_IF([test $cross_compiling = no],
-+          [AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null],
-+            [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`],
-+              [*'Feb  7  2106'* | *'Feb  7 17:10'*],
-+              [AC_MSG_FAILURE(m4_text_wrap(
-+      [this system appears to support timestamps after January 2038,
-+       but no mechanism for enabling wide 'time_t' was detected.
-+       Did you mean to build a 64-bit binary? (e.g. 'CC="${CC} -m64"'.)
-+       To proceed with 32-bit time_t, configure with '--disable-year2038'.],
-+      [], [], [55]))])])])])],
-+
-+  ["-D_TIME_BITS=64"],
-+    [AC_DEFINE([_TIME_BITS], [64],
-+      [Number of bits in time_t, on hosts where this is settable.])],
-+
-+  ["-D__MINGW_USE_VC2005_COMPAT=1"],
-+    [AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1],
-+      [Define to 1 on platforms where this makes time_t a 64-bit type.])],
- 
-# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
-#                               CACHE-VAR,
-#                               DESCRIPTION,
-#                               PROLOGUE, [FUNCTION-BODY])
-# --------------------------------------------------------
-m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE],
-[AC_CACHE_CHECK([for $1 value needed for large files], [$3],
-[while :; do
-  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
-    [AC_LANG_PROGRAM([$5], [$6])],
-    [$3=no; break])
-  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
-    [AC_LANG_PROGRAM([#undef $1
-#define $1 $2
-$5], [$6])],
-    [$3=$2; break])
-  $3=unknown
-  break
-done])
-case $$3 in #(
-  no | unknown) ;;
-  *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);;
-esac
-rm -rf conftest*[]dnl
-])# _AC_SYS_LARGEFILE_MACRO_VALUE
-+  ["-U_USE_32_BIT_TIME_T"*],
-+    [AC_MSG_FAILURE(m4_text_wrap(
-+      [the 'time_t' type is currently forced to be 32-bit.
-+       It will stop working after January 2038.
-+       Remove _USE_32BIT_TIME_T from the compiler flags.],
-+      [], [], [55]))],
-+
-+  [AC_MSG_ERROR(
-+    [internal error: bad value for \$ac_cv_sys_year2038_opts])])
-+])
-+
-+# _AC_SYS_YEAR2038_ENABLE
-+# -----------------------
-+# Subroutine of AC_SYS_YEAR2038 and _AC_SYS_YEAR2038_OPT_IN.
-+# Depending on which of the YEAR2038 macros was used, add either an
-+# --enable-year2038, or a --disable-year2038, or no option at all to
-+# the configure script.  Note that this is expanded very late and
-+# therefore there cannot be any code in the AC_ARG_ENABLE.  The
-+# default value for enable_year2038 is emitted unconditionally
-+# because the generated code always looks at this variable.
-+m4_define([_AC_SYS_YEAR2038_ENABLE],
-+[m4_divert_text([DEFAULTS],
-+  m4_provide_if([AC_SYS_YEAR2038],
-+    [enable_year2038=yes],
-+    [enable_year2038=no]))]dnl
-+[AC_ARG_ENABLE([year2038],
-+  m4_provide_if([AC_SYS_YEAR2038],
-+    [AS_HELP_STRING([--disable-year2038],
-+      [do not support timestamps after 2038])],
-+    [AS_HELP_STRING([--enable-year2038],
-+      [support timestamps after 2038])]))])
-+
-+# _AC_SYS_YEAR2038_OPT_IN
-+# -----------------------
-+# If the --enable-year2038 option is given to configure, attempt to
-+# detect and activate support for large time_t on 32-bit systems.
-+# This macro is automatically invoked by AC_SYS_LARGEFILE when large
-+# *file* support is detected.  It does not AC_REQUIRE AC_SYS_LARGEFILE
-+# to avoid a dependency loop, and is therefore unsafe to expose as a
-+# documented macro.
-+AC_DEFUN([_AC_SYS_YEAR2038_OPT_IN],
-+[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl
-+  AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE])
-+  AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])
-+])])
-+
-+# AC_SYS_YEAR2038
-+# ---------------
-+# Attempt to detect and activate support for large time_t.
-+# On systems where time_t is not always 64 bits, this probe can be
-+# skipped by passing the --disable-year2038 option to configure.
-+AC_DEFUN([AC_SYS_YEAR2038],
-+[AC_REQUIRE([AC_SYS_LARGEFILE])]dnl
-+[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl
-+  AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE])
-+  AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])
-+])])
-+
-+# _AC_SYS_LARGEFILE_TEST_CODE
-+# ---------------------------
-+# C code used to probe for large file support.
-+m4_define([_AC_SYS_LARGEFILE_TEST_CODE],
-+[@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-+  int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721
-+                      && LARGE_OFF_T % 2147483647 == 1)
-+                     ? 1 : -1]];[]dnl
-+])
-+
-+# _AC_SYS_LARGEFILE_OPTIONS
-+# -------------------------
-+# List of known ways to enable support for large files.  If you change
-+# this list you probably also need to change the AS_CASE at the end of
-+# _AC_SYS_LARGEFILE_PROBE.
-+m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize(
-+    ["none needed"]                   dnl Most current systems
-+    ["-D_FILE_OFFSET_BITS=64"]        dnl X/Open LFS spec
-+    ["-D_LARGE_FILES=1"]              dnl AIX (which versions?)
-+    ["-n32"]                          dnl Irix 6.2 w/ SGI compiler
-+))
-+
-+# _AC_SYS_LARGEFILE_PROBE
-+# -----------------------
-+# Subroutine of AC_SYS_LARGEFILE. Probe for large file support and set
-+# the cache variable ac_cv_sys_largefile_opts to one of the values in
-+# the _AC_SYS_LARGEFILE_OPTIONS list, or to "support not detected" if
-+# none of the options in that list worked.  Then, set compilation
-+# options and #defines as necessary to enable large file support.
-+#
-+# If large file support is not detected, the behavior depends on which of
-+# the top-level AC_SYS_LARGEFILE macros was used (see below).
-+#
-+# If you change this macro you may also need to change
-+# _AC_SYS_LARGEFILE_OPTIONS.
-+AC_DEFUN([_AC_SYS_LARGEFILE_PROBE],
-+[AC_CACHE_CHECK([for $CC option to enable large file support],
-+  [ac_cv_sys_largefile_opts],
-+  [ac_save_CC="$CC"
-+  ac_opt_found=no
-+  for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do
-+    AS_IF([test x"$ac_opt" != x"none needed"],
-+      [CC="$ac_save_CC $ac_opt"])
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])],
-+      [ac_cv_sys_largefile_opts="$ac_opt"
-+      ac_opt_found=yes])
-+    test $ac_opt_found = no || break
-+  done
-+  CC="$ac_save_CC"
-+  test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected"])
-+
-+ac_have_largefile=yes
-+AS_CASE([$ac_cv_sys_largefile_opts],
-+  ["none needed"], [],
-+  ["support not detected"],
-+    [ac_have_largefile=no],
-+
-+  ["-D_FILE_OFFSET_BITS=64"],
-+    [AC_DEFINE([_FILE_OFFSET_BITS], [64],
-+      [Number of bits in a file offset, on hosts where this is settable.])],
-+
-+  ["-D_LARGE_FILES=1"],
-+    [AC_DEFINE([_LARGE_FILES], [1],
-+      [Define to 1 on platforms where this makes off_t a 64-bit type.])],
-+
-+  ["-n32"],
-+    [CC="$CC -n32"],
-+
-+  [AC_MSG_ERROR(
-+    [internal error: bad value for \$ac_cv_sys_largefile_opts])])
-+
-+_AC_SYS_YEAR2038_OPT_IN
-+])
- 
-+# _AC_SYS_LARGEFILE_ENABLE
-+# ------------------------
-+# Subroutine of AC_SYS_LARGEFILE.  Note that this
-+# is expanded very late and therefore there cannot be any code in the
-+# AC_ARG_ENABLE.  The default value for enable_largefile is emitted
-+# unconditionally because the generated shell code always looks at
-+# this variable.
-+m4_define([_AC_SYS_LARGEFILE_ENABLE],
-+[m4_divert_text([DEFAULTS],
-+  enable_largefile=yes)]dnl
-+[AC_ARG_ENABLE([largefile],
-+  [AS_HELP_STRING([--disable-largefile], [omit support for large files])])])
- 
- # AC_SYS_LARGEFILE
- # ----------------
-@@ -80,44 +306,14 @@ rm -rf conftest*[]dnl
- # Additionally, on Linux file systems with 64-bit inodes a file that happens
- # to have a 64-bit inode number cannot be accessed by 32-bit applications on
- # Linux x86/x86_64.  This can occur with file systems such as XFS and NFS.
-+# This macro allows configuration to continue if the system doesn't support
-+# large files.
- AC_DEFUN([AC_SYS_LARGEFILE],
-[AC_ARG_ENABLE(largefile,
-               [  --disable-largefile     omit support for large files])
-AS_IF([test "$enable_largefile" != no],
- [AC_CACHE_CHECK([for special C compiler options needed for large files],
-    ac_cv_sys_largefile_CC,
-    [ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-         # IRIX 6.2 and later do not support large files by default,
-         # so use the C compiler's -n32 option if that helps.
-         AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
-         AC_COMPILE_IFELSE([], [break])
-         CC="$CC -n32"
-         AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
-         break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi])
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
-    ac_cv_sys_file_offset_bits,
-    [Number of bits in a file offset, on hosts where this is settable.],
-    [_AC_SYS_LARGEFILE_TEST_INCLUDES])
-  AS_CASE([$ac_cv_sys_file_offset_bits],
-    [unknown],
-      [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1],
-         [ac_cv_sys_large_files],
-         [Define for large files, on AIX-style hosts.],
-         [_AC_SYS_LARGEFILE_TEST_INCLUDES])],
-    [64],
-      [gl_YEAR2038_BODY([])])])
-])# AC_SYS_LARGEFILE
-+[m4_provide_if([_AC_SYS_LARGEFILE_PROBE], [], [dnl
-+  AS_IF([test "$enable_largefile" != no], [_AC_SYS_LARGEFILE_PROBE])
-+  AC_CONFIG_COMMANDS_PRE([_AC_SYS_LARGEFILE_ENABLE])
-+])])
-+])# m4_ifndef AC_SYS_YEAR2038
- 
- # Enable large files on systems where this is implemented by Gnulib, not by the
- # system headers.
-- 
-2.40.0
diff --git a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
index 46938bccf..bb45c8724 100644
--- a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
+++ b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
@@ -1,9 +1,20 @@
+From e75f27cb1d70052fe2bb6cae5846b68f8ea7fa65 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Sun, 29 Sep 2024 18:38:05 +0800
+Subject: [PATCH] dont depend on help2man
 Upstream-Status: Inappropriate [disable feature]
 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
--- libidn-1.41.orig/doc/Makefile.am
+---
-+++ libidn-1.41/doc/Makefile.am
+ doc/Makefile.am | 9 +--------
-@@ -73,16 +73,9 @@ BUILT_SOURCES = example.txt example2.txt
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d63cafa..ba9aab4 100644
+--- a/doc/Makefile.am
+++ b/doc/Makefile.am
+@@ -70,16 +70,9 @@ BUILT_SOURCES = example.txt example2.txt example3.txt example4.txt example5.txt
 
 # Man pages.
 
diff --git a/meta-oe/recipes-extended/libidn/libidn_1.41.bb b/meta-oe/recipes-extended/libidn/libidn_1.42.bb
index 17ffc6cdc..453a21f57 100644
--- a/meta-oe/recipes-extended/libidn/libidn_1.41.bb
+++ b/meta-oe/recipes-extended/libidn/libidn_1.42.bb
@@ -8,22 +8,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f95a3dc99fecfa9a0c4e726d4b5d822f \
                    file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
                    file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                    file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \
-                    file://lib/idna.h;endline=21;md5=176de4fe1d98e59d743d3b12a850e4cb \
+                    file://lib/idna.h;endline=28;md5=bff92cd5c90908728225a065d6908289 \
-                    file://src/idn.c;endline=20;md5=dd17b9093355bf669e2ea108d2defbd0 \
+                    file://src/idn.c;endline=19;md5=dc51ec9ffae14c4f96fb7db4a3d96b2d \
                   "
-                   
 DEPENDS = "virtual/libiconv autoconf-archive"
 inherit pkgconfig autotools gettext texinfo gtk-doc
 SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
           file://dont-depend-on-help2man.patch \
-           file://0001-largefile.m4-Sync-with-latest-gnulib.patch \
           "
-#SRC_URI[md5sum] = "813c7b268d1051ca02c3610986126f38"
+SRC_URI[sha256sum] = "d6c199dcd806e4fe279360cb4b08349a0d39560ed548ffd1ccadda8cdecb4723"
-#SRC_URI[sha256sum] = "14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038"
-SRC_URI[sha256sum] = "884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945"
 # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3
 # so package command into a separate package
@@ -40,4 +37,3 @@ do_install:append() {
 }
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/libzip/libzip_1.10.1.bb b/meta-oe/recipes-extended/libzip/libzip_1.11.1.bb
index a314efc12..b1a0dd66c 100644
--- a/meta-oe/recipes-extended/libzip/libzip_1.10.1.bb
+++ b/meta-oe/recipes-extended/libzip/libzip_1.11.1.bb
@@ -21,6 +21,6 @@ inherit cmake
 SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz"
-SRC_URI[sha256sum] = "dc3c8d5b4c8bbd09626864f6bcf93de701540f761d76b85d7c7d710f4bd90318"
+SRC_URI[sha256sum] = "721e0e4e851073b508c243fd75eda04e4c5006158a900441de10ce274cc3b633"
 BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb
index fca8d9e75..6f5cd4911 100644
--- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb
+++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb
@@ -97,6 +97,11 @@ EXTRA_OECMAKE = " \
                "
 PACKAGECONFIG ??= "civetweb libarchive rocksdb expression-language"
+# rocksdb is not compatible with libc-musl:powerpc & armv5
+PACKAGECONFIG:remove:libc-musl:powerpc = "rocksdb"
+PACKAGECONFIG:remove:armv5 = "rocksdb"
 PACKAGECONFIG[civetweb] = "-DDISABLE_CIVET=OFF,-DDISABLE_CIVET=ON"
 PACKAGECONFIG[openwsman] = "-DENABLE_OPENWSMAN=ON,-DENABLE_OPENWSMAN=OFF,libxml2"
 PACKAGECONFIG[libarchive] = "-DDISABLE_LIBARCHIVE=OFF,-DDISABLE_LIBARCHIVE=ON,libarchive"
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-115_115.16.1.bb
index f25c5a8f9..d235b252a 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs-115_115.16.1.bb
@@ -19,7 +19,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire
           file://1849070.patch \ 
           file://1894423.patch \
           "
-SRC_URI[sha256sum] = "16be46f16a356a2b8bd3541805a24c8a2acf6f077cf8a65859689685c26025e0"
+SRC_URI[sha256sum] = "c3bb5a210738ca0f8cd26aa53fc4a07560db079c06cd0421cf35af4035029367"
 UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs115"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb
index 4d3baf6ca..df487bd76 100644
--- a/meta-oe/recipes-extended/mraa/mraa_git.bb
+++ b/meta-oe/recipes-extended/mraa/mraa_git.bb
@@ -41,11 +41,11 @@ FILES:${PN}-utils = "${bindir}/"
 # will result in only the python bindings being built/packaged.
 # Note: 'nodejs' is disabled by default because the bindings
 # generation currently fails with nodejs (>v7.x).
-BINDINGS ??= "python"
+BINDINGS ??= ""
 # nodejs isn't available for armv4/armv5 architectures
-BINDINGS:armv4 ??= "python"
+BINDINGS:armv4 ??= ""
-BINDINGS:armv5 ??= "python"
+BINDINGS:armv5 ??= ""
 PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \
 ${@bb.utils.contains('PACKAGES', 'python3-${PN}', 'python', '', d)}"
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
deleted file mode 100644
index df43d25ac..000000000
--- a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Set of CLI tools for Openlmi providers"
-DESCRIPTION = "openlmi-tools is a set of command line tools for Openlmi providers."
-HOMEPAGE = "http://www.openlmi.org/"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://../COPYING;md5=75859989545e37968a99b631ef42722e"
-SECTION = "System/Management"
-inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)}
-SKIP_RECIPE[openlmi-tools] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}"
-DEPENDS = "python-native python-pywbem-native python-m2crypto python-pywbem"
-SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
-          "
-SRC_URI[md5sum] = "e156246cb7b49753db82f4ddf7f03e50"
-SRC_URI[sha256sum] = "292b8f5f2250655a4add8183c529b73358bc980bd4f23cfa484a940953fce9e4"
-S = "${WORKDIR}/${BP}/cli"
-do_configure:prepend() {
-    sed 's/@@VERSION@@/$(VERSION)/g' ${S}/setup.py.skel > ${S}/setup.py
-}
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
diff --git a/meta-oe/recipes-extended/ostree/ostree_2024.7.bb b/meta-oe/recipes-extended/ostree/ostree_2024.8.bb
index 8cecf5334..4fd7a1417 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2024.7.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2024.8.bb
@@ -22,7 +22,7 @@ GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases"
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \
           file://run-ptest \
           "
-SRC_URI[sha256sum] = "72451efffe5a10acb4cfdd6eb849db97fa9e61a81e4113fc656eece77eb93355"
+SRC_URI[sha256sum] = "e2136e116669f114ff7349f12e299f63c0bece733451649414a8dcd85b863c3f"
 S = "${WORKDIR}/libostree-${PV}"
@@ -45,7 +45,7 @@ BUILD_OPTIMIZATION:append = " -O2"
 PACKAGECONFIG ??= " \
    ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'soup3', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'soup3 static', '', d)} \
    glib \
    gpgme \
    curl \
diff --git a/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb b/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb
index 2e32e3e78..fc227734d 100644
--- a/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb
+++ b/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb
@@ -8,7 +8,7 @@ SRC_URI = " \
        file://run-ptest \
 "
-SRCREV = "cf639f7f4ee125f68e1ccfba8d99ebc0de57b9fe"
+SRCREV = "be527327653e94b02e711f7eff59285ad13e1db0"
 inherit cmake ptest
diff --git a/meta-oe/recipes-extended/polkit/files/meson-build-Support-openembedded-OS-for-PAM-config.patch b/meta-oe/recipes-extended/polkit/files/meson-build-Support-openembedded-OS-for-PAM-config.patch
index cc396dfa3..445f2fbdb 100644
--- a/meta-oe/recipes-extended/polkit/files/meson-build-Support-openembedded-OS-for-PAM-config.patch
+++ b/meta-oe/recipes-extended/polkit/files/meson-build-Support-openembedded-OS-for-PAM-config.patch
@@ -14,7 +14,7 @@ NB: This is also the same config as Debian but its not mentioned in the
 code.
 Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
-Upstream-Status: Submitted [https://github.com/polkit-org/polkit/pull/497]
+Upstream-Status: Backport [https://github.com/polkit-org/polkit/commit/1d4f7f4d9f3d74fb2649c96faa8677416c1aefc2]
 ---
 meson.build       | 2 +-
 meson_options.txt | 2 +-
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0001-hiredis-use-default-CC-if-it-is-set.patch
index 7785acca5..63bf40341 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -1,4 +1,4 @@
-From 41efa2f0cf08c91ff935bbb2d16ab233df7f5811 Mon Sep 17 00:00:00 2001
+From af4fc632c03b2a68be4206b4896f27fc4bb865ae Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 17:39:52 -0600
 Subject: [PATCH] hiredis: use default CC if it is set
@@ -9,6 +9,8 @@ Content-Transfer-Encoding: 8bit
 Instead of trying to automagically figure out CC, which breaks with OE
 as CC has spaces in it, just skip it if one was already passed in.
+Upstream-Status: Pending
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 Update to work with 4.0.8
@@ -16,10 +18,7 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
 Reworked for 6.0.4
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
-Upstream-Status: Pending
 deps/hiredis/Makefile | 2 --
 1 file changed, 2 deletions(-)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0002-lua-update-Makefile-to-use-environment-build-setting.patch
index 20708eda1..46330f506 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0002-lua-update-Makefile-to-use-environment-build-setting.patch
@@ -1,4 +1,4 @@
-From aa3d31355f3cc140b1dc2f4fcff8e3c0aa261549 Mon Sep 17 00:00:00 2001
+From 45ae5eb5c3482054073e06ab1a78e0aa9b96447f Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 20:22:19 -0600
 Subject: [PATCH] lua: update Makefile to use environment build settings
@@ -6,6 +6,8 @@ Subject: [PATCH] lua: update Makefile to use environment build settings
 OE-specific parameters, instead of overriding all of these simply use
 the ones that are already passed in. Also configure for only Linux...
+Upstream-Status: Pending
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 Updated to work with 3.0.x
@@ -14,8 +16,6 @@ Signed-off-by: Armin Kuster <akust808@gmail.com>
 updated to work wtih 6.2.1
 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
-Upstream-Status: Pending
 ---
 deps/Makefile         |  1 -
 deps/lua/Makefile     |  1 -
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0003-hack-to-force-use-of-libc-malloc.patch
index 7b601e02a..1f97f9783 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0003-hack-to-force-use-of-libc-malloc.patch
@@ -1,4 +1,4 @@
-From 38a5f403b033d03cdac3ff814687d83f61527d8e Mon Sep 17 00:00:00 2001
+From 7a98e3ac480413ce7db3a5edd5dc70458b921b29 Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Wed, 6 Feb 2013 20:51:02 -0600
 Subject: [PATCH] hack to force use of libc malloc
@@ -9,14 +9,13 @@ removed in favor of magic.
 Note that this of course doesn't allow tcmalloc and jemalloc, however
 jemalloc wasn't building correctly.
+Upstream-Status: Pending
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 Update to work with 4.0.8
 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
 ---
-Upstream-Status: Pending
 src/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0004-src-Do-not-reset-FINAL_LIBS.patch
index 01e53e3f2..974cf5169 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -1,4 +1,4 @@
-From d9d1f9a501ef7caa80d1e6595218898e9989ec2b Mon Sep 17 00:00:00 2001
+From 50fc46a12f6cf97e7b927d3ea29eecc9ebdea34d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 10 Sep 2019 20:04:26 -0700
 Subject: [PATCH] src: Do not reset FINAL_LIBS
@@ -9,8 +9,8 @@ environment to get it going
 e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
 Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
new file mode 100644
index 000000000..8e5f30993
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
@@ -0,0 +1,29 @@
+From acd832d76002a1916b3128ac05bc0296425aea6d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 21 Dec 2019 12:09:51 -0800
+Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
+Fixes
+| zmalloc.c:87:37: error: 'PTHREAD_MUTEX_DEFAULT' undeclared here (not in a function)
+|    87 | pthread_mutex_t used_memory_mutex = PTHREAD_MUTEX_INITIALIZER;
+|       |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/zmalloc.c | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/src/zmalloc.c b/src/zmalloc.c
+index bbfa386..93e07ff 100644
+--- a/src/zmalloc.c
+++ b/src/zmalloc.c
+@@ -32,6 +32,7 @@
+ #include "config.h"
+ #include "solarisfixes.h"
+ 
+#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdint.h>
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.2.6/0006-Define-correct-gregs-for-RISCV32.patch
index 93c359526..700904817 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.6/0006-Define-correct-gregs-for-RISCV32.patch
@@ -1,14 +1,14 @@
-From 634f62be6c135ece93cb4e44a69ce3cb66f394ca Mon Sep 17 00:00:00 2001
+From dd3ecb07bbf80b986b8f2c656ea11d1346e212f6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 26 Oct 2020 21:32:22 -0700
 Subject: [PATCH] Define correct gregs for RISCV32
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Updated patch for 6.2.8
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
 src/debug.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/init-redis-server b/meta-oe/recipes-extended/redis/redis-7.2.6/init-redis-server
index c5f335f57..c5f335f57 100755..100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/init-redis-server
+++ b/meta-oe/recipes-extended/redis/redis-7.2.6/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/redis.conf b/meta-oe/recipes-extended/redis/redis-7.2.6/redis.conf
index 75037d6dc..75037d6dc 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/redis.conf
+++ b/meta-oe/recipes-extended/redis/redis-7.2.6/redis.conf
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/redis.service b/meta-oe/recipes-extended/redis/redis-7.2.6/redis.service
index b7791d0df..b7791d0df 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/redis.service
+++ b/meta-oe/recipes-extended/redis/redis-7.2.6/redis.service
diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
index d2a1b45e6..51a6e9c95 100644
--- a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -1,11 +1,16 @@
-From dc745a33f3875cc72d41bd34ed490b352e546352 Mon Sep 17 00:00:00 2001
+From 67990f216f2fbbc8a6699c700dfc089aa617905f Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 17:39:52 -0600
 Subject: [PATCH] hiredis: use default CC if it is set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 Instead of trying to automagically figure out CC, which breaks with OE
 as CC has spaces in it, just skip it if one was already passed in.
+Upstream-Status: Pending
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 Update to work with 4.0.8
@@ -14,13 +19,11 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
 Reworked for 6.0.4
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
-Upstream-Status: Pending
 deps/hiredis/Makefile | 2 --
 1 file changed, 2 deletions(-)
 diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
-index 25ac154..569f82b 100644
+index 7e41c97..54717e3 100644
 --- a/deps/hiredis/Makefile
 +++ b/deps/hiredis/Makefile
 @@ -42,8 +42,6 @@ endef
@@ -32,6 +35,3 @@ index 25ac154..569f82b 100644
 OPTIMIZATION?=-O3
 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
 DEBUG_FLAGS?= -g -ggdb
-- 
-2.21.3
diff --git a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
index aade7afd0..17b533669 100644
--- a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
@@ -1,4 +1,4 @@
-From 097a2b259cb266c2c861dc74fa6f80712d6138c5 Mon Sep 17 00:00:00 2001
+From ef989aab052510bfda32b2b325a5f80b76c42677 Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 20:22:19 -0600
 Subject: [PATCH] lua: update Makefile to use environment build settings
@@ -6,6 +6,8 @@ Subject: [PATCH] lua: update Makefile to use environment build settings
 OE-specific parameters, instead of overriding all of these simply use
 the ones that are already passed in. Also configure for only Linux...
+Upstream-Status: Pending
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 Updated to work with 3.0.x
@@ -15,18 +17,16 @@ Signed-off-by: Armin Kuster <akust808@gmail.com>
 updated to work wtih 6.2.1
 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
 ---
-Upstream-Status: Pending
 deps/Makefile         |  1 -
 deps/lua/Makefile     |  1 -
 deps/lua/src/Makefile | 16 ++++++----------
 3 files changed, 6 insertions(+), 12 deletions(-)
 diff --git a/deps/Makefile b/deps/Makefile
-index ff16ee9..d8d64aa 100644
+index cbe3aef..76bc222 100644
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -74,7 +74,6 @@ LUA_LDFLAGS+= $(LDFLAGS)
+@@ -81,7 +81,6 @@ endif
 # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
 # challenging to cross-compile lua (and redis).  These defines make it easier
 # to fit redis into cross-compilation environments, which typically set AR.
diff --git a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
index e76bdbc26..f1021eef6 100644
--- a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch
+++ b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
@@ -1,4 +1,4 @@
-From 1fa047162983d4a7e0576f0837a73a6027a783bd Mon Sep 17 00:00:00 2001
+From b9586abcb803747301f6cc4ff93c7642bef693ea Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Wed, 6 Feb 2013 20:51:02 -0600
 Subject: [PATCH] hack to force use of libc malloc
@@ -9,19 +9,18 @@ removed in favor of magic.
 Note that this of course doesn't allow tcmalloc and jemalloc, however
 jemalloc wasn't building correctly.
+Upstream-Status: Pending
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 Update to work with 4.0.8
 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
 ---
-Upstream-Status: Pending
 src/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/src/Makefile b/src/Makefile
-index ecd6929..c7f43c5 100644
+index 7d75c83..35dd314 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -13,7 +13,8 @@
diff --git a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
index 66ab0ee33..958106e26 100644
--- a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -1,4 +1,4 @@
-From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001
+From a4d87aca1c00c53b386ee7490223971e00873add Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 10 Sep 2019 20:04:26 -0700
 Subject: [PATCH] src: Do not reset FINAL_LIBS
@@ -9,17 +9,17 @@ environment to get it going
 e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
 Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/Makefile b/src/Makefile
-index 5564351..83ccd76 100644
+index 35dd314..3770f96 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -91,7 +91,7 @@ endif
+@@ -93,7 +93,7 @@ endif
 
 FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
 FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
diff --git a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
index 20f689bd0..d73c66c9d 100644
--- a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch
+++ b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
@@ -1,4 +1,4 @@
-From 98d526f76049be21bf3d77158236b2189419a78e Mon Sep 17 00:00:00 2001
+From 2e6311c9c7cd85bf63eab8fe92c08ec1ec01b6fc Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 Dec 2019 12:09:51 -0800
 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
@@ -9,6 +9,7 @@ Fixes
 |       |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 src/zmalloc.c | 1 +
@@ -26,6 +27,3 @@ index 1f33d09..5e182d1 100644
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-- 
-2.25.1
diff --git a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
index 9d7e50271..bb3f5c607 100644
--- a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
+++ b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
@@ -1,9 +1,10 @@
-From 26bd72f3b8de22e5036d86e6c79f815853b83473 Mon Sep 17 00:00:00 2001
+From 6149911f7a6fbaef3ed418408e2b501fa9479ffa Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 26 Oct 2020 21:32:22 -0700
 Subject: [PATCH] Define correct gregs for RISCV32
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Updated patch for 6.2.1
@@ -13,10 +14,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
 1 file changed, 24 insertions(+), 2 deletions(-)
 diff --git a/src/debug.c b/src/debug.c
-index 5318c14..8c21b47 100644
+index bb76c5d..55a0696 100644
 --- a/src/debug.c
 +++ b/src/debug.c
-@@ -1055,7 +1055,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
+@@ -1067,7 +1067,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
     #endif
 #elif defined(__linux__)
     /* Linux */
@@ -27,7 +28,7 @@ index 5318c14..8c21b47 100644
     GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip);
     #elif defined(__X86_64__) || defined(__x86_64__)
     GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip);
-@@ -1222,8 +1224,28 @@ void logRegisters(ucontext_t *uc) {
+@@ -1234,8 +1236,28 @@ void logRegisters(ucontext_t *uc) {
     #endif
 /* Linux */
 #elif defined(__linux__)
@@ -57,6 +58,3 @@ index 5318c14..8c21b47 100644
     serverLog(LL_WARNING,
     "\n"
     "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n"
-- 
-2.25.1
diff --git a/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-oe/recipes-extended/redis/redis/init-redis-server
index c5f335f57..c5f335f57 100755..100644
--- a/meta-oe/recipes-extended/redis/redis/init-redis-server
+++ b/meta-oe/recipes-extended/redis/redis/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.14.bb b/meta-oe/recipes-extended/redis/redis_6.2.16.bb
index 2433abba5..40473461a 100644
--- a/meta-oe/recipes-extended/redis/redis_6.2.14.bb
+++ b/meta-oe/recipes-extended/redis/redis_6.2.16.bb
@@ -10,19 +10,20 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
           file://redis.conf \
           file://init-redis-server \
           file://redis.service \
-           file://hiredis-use-default-CC-if-it-is-set.patch \
+           file://0001-hiredis-use-default-CC-if-it-is-set.patch \
-           file://lua-update-Makefile-to-use-environment-build-setting.patch \
+           file://0002-lua-update-Makefile-to-use-environment-build-setting.patch \
-           file://oe-use-libc-malloc.patch \
+           file://0003-hack-to-force-use-of-libc-malloc.patch \
-           file://0001-src-Do-not-reset-FINAL_LIBS.patch \
+           file://0004-src-Do-not-reset-FINAL_LIBS.patch \
-           file://GNU_SOURCE.patch \
+           file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
           file://0006-Define-correct-gregs-for-RISCV32.patch \
-           "
+          "
-SRC_URI[sha256sum] = "34e74856cbd66fdb3a684fb349d93961d8c7aa668b06f81fd93ff267d09bc277"
+SRC_URI[sha256sum] = "846bff83c26d827d49f8cc8114ea9d1e72eea1169f7de36b8135ea2cec104e7d"
 inherit autotools-brokensep update-rc.d systemd useradd
 FINAL_LIBS:x86:toolchain-clang = "-latomic"
-FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
+FINAL_LIBS:riscv32 = "-latomic"
 FINAL_LIBS:mips = "-latomic"
 FINAL_LIBS:arm = "-latomic"
 FINAL_LIBS:powerpc = "-latomic"
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.5.bb b/meta-oe/recipes-extended/redis/redis_7.2.6.bb
index 930c1cd9a..dcfd532cf 100644
--- a/meta-oe/recipes-extended/redis/redis_7.2.5.bb
+++ b/meta-oe/recipes-extended/redis/redis_7.2.6.bb
@@ -10,19 +10,20 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
           file://redis.conf \
           file://init-redis-server \
           file://redis.service \
-           file://hiredis-use-default-CC-if-it-is-set.patch \
+           file://0001-hiredis-use-default-CC-if-it-is-set.patch \
-           file://lua-update-Makefile-to-use-environment-build-setting.patch \
+           file://0002-lua-update-Makefile-to-use-environment-build-setting.patch \
-           file://oe-use-libc-malloc.patch \
+           file://0003-hack-to-force-use-of-libc-malloc.patch \
-           file://0001-src-Do-not-reset-FINAL_LIBS.patch \
+           file://0004-src-Do-not-reset-FINAL_LIBS.patch \
-           file://GNU_SOURCE-7.patch \
+           file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
           file://0006-Define-correct-gregs-for-RISCV32.patch \
-           "
+          "
-SRC_URI[sha256sum] = "5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d"
+SRC_URI[sha256sum] = "fb10d67a2fe2b4556f6cb840064dd6e6e3175ce8ca035f0726990ec2da9f3d0e"
 inherit autotools-brokensep pkgconfig update-rc.d systemd useradd
 FINAL_LIBS:x86:toolchain-clang = "-latomic"
-FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
+FINAL_LIBS:riscv32 = "-latomic"
 FINAL_LIBS:mips = "-latomic"
 FINAL_LIBS:arm = "-latomic"
 FINAL_LIBS:powerpc = "-latomic"
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb
index 41e396358..cf833de22 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb
@@ -39,11 +39,12 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 inherit autotools pkgconfig systemd update-rc.d ptest
-EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes"
+EXTRA_OECONF += "--enable-imfile-tests ${ATOMICS}"
-EXTRA_OECONF += "--enable-imfile-tests"
+ATOMICS = "ap_cv_atomic_builtins_64=yes ap_cv_atomic_builtins=yes"
-EXTRA_OECONF:remove:mipsarch = "ap_cv_atomic_builtins=yes"
+ATOMICS:mipsarch = ""
-EXTRA_OECONF:remove:powerpc = "ap_cv_atomic_builtins=yes"
+ATOMICS:powerpc = ""
-EXTRA_OECONF:remove:riscv32 = "ap_cv_atomic_builtins=yes"
+ATOMICS:riscv32 = ""
+ATOMICS:armv5 = ""
 # first line is default yes in configure
 PACKAGECONFIG ??= " \
diff --git a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
index 45556afa8..a051f90c4 100644
--- a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
+++ b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
@@ -18,7 +18,7 @@ index 4802f35..e0e468f 100644
 # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
 SR_PKG_CHECK([python3], [SRD_PKGLIBS],
 -       [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
-+       [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
+       [python-3.13-embed], [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
 AS_IF([test "x$sr_have_python3" = xno],
        [AC_MSG_ERROR([Cannot find Python 3 development headers.])])
 
diff --git a/meta-oe/recipes-extended/tmux/tmux_3.4.bb b/meta-oe/recipes-extended/tmux/tmux_3.5.bb
index 4360edf4b..33f709681 100644
--- a/meta-oe/recipes-extended/tmux/tmux_3.4.bb
+++ b/meta-oe/recipes-extended/tmux/tmux_3.5.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf
 DEPENDS = "ncurses libevent bison-native"
 SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz"
-SRC_URI[sha256sum] = "551ab8dea0bf505c0ad6b7bb35ef567cdde0ccb84357df142c254f35a23e19aa"
+SRC_URI[sha256sum] = "2fe01942e7e7d93f524a22f2c883822c06bc258a4d61dba4b407353d7081950f"
 UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch
new file mode 100644
index 000000000..ab2265bdb
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch
@@ -0,0 +1,33 @@
+From b4cf6e677cec75a0d2b57dcb2960ad1e16908c82 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 10 Sep 2019 20:04:26 -0700
+Subject: [PATCH] src: Do not reset FINAL_LIBS
+This helps case where additional libraries are needed to be passed from
+environment to get it going
+e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/Makefile b/src/Makefile
+index e0b1d2722..48988e271 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -145,7 +145,7 @@ ifeq ($(SERVER_TEST),yes)
+        FINAL_CFLAGS +=-DSERVER_TEST=1
+ endif
+ FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(SERVER_LDFLAGS) $(DEBUG)
+-FINAL_LIBS=-lm
+FINAL_LIBS+=-lm
+ DEBUG=-g -ggdb
+ 
+ # Linux ARM32 needs -latomic at linking time
+-- 
+2.39.5
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch b/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch
index 6e07c25c6..fa11d058f 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch
+++ b/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch
@@ -1,4 +1,4 @@
-From a22512ac1cbd6de1f5646219722e49752d1f60ac Mon Sep 17 00:00:00 2001
+From f3dd59789e4a8b06777be2725c6c3e36050fd6ec Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 Dec 2019 12:09:51 -0800
 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
@@ -10,18 +10,18 @@ Fixes
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
 ---
 src/zmalloc.c | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/src/zmalloc.c b/src/zmalloc.c
-index ba03685..322304f 100644
+index 7b19107b6..bd365c11c 100644
 --- a/src/zmalloc.c
 +++ b/src/zmalloc.c
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
- #include "config.h"
 #include "solarisfixes.h"
+ #include "serverassert.h"
 
 +#define _GNU_SOURCE
 #include <stdio.h>
diff --git a/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch
new file mode 100644
index 000000000..3168c5860
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch
@@ -0,0 +1,41 @@
+From 5e6c3052930f1d831d3479cb59533c08277700ff Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Fri, 8 Feb 2013 17:39:52 -0600
+Subject: [PATCH] hiredis: use default CC if it is set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Instead of trying to automagically figure out CC, which breaks with OE
+as CC has spaces in it, just skip it if one was already passed in.
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+Update to work with 4.0.8
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Reworked for 6.0.4
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Reworked for 8.0.0
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+---
+Upstream-Status: Pending
+ deps/hiredis/Makefile | 2 --
+ 1 file changed, 2 deletions(-)
+diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
+index 4a3de1f6e..49bb525cd 100644
+--- a/deps/hiredis/Makefile
+++ b/deps/hiredis/Makefile
+@@ -36,8 +36,6 @@ endef
+ export REDIS_TEST_CONFIG
+ 
+ # Fallback to gcc when $CC is not in $PATH.
+-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+ OPTIMIZATION?=-O3
+ WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+ DEBUG_FLAGS?= -g -ggdb
diff --git a/meta-oe/recipes-extended/valkey/valkey/init-valkey-server b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server
new file mode 100755
index 000000000..873179574
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          valkey-server
+# Required-Start:    $network
+# Required-Stop:     $network
+# Default-Start:     S 2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Redis, a key-value store
+# Description:       Redis is an open source, advanced key-value store.
+#                    http://valkey.io
+### END INIT INFO
+test -f /usr/bin/valkey-server || exit 0
+ARGS="/etc/valkey/valkey.conf"
+case "$1" in
+    start)
+        echo "Starting valkey-server..."
+        start-stop-daemon --start --quiet --exec /usr/bin/valkey-server -- $ARGS
+        ;;
+    stop)
+        echo "Stopping valkey-server..."
+        start-stop-daemon --stop --quiet --exec /usr/bin/valkey-server
+        ;;
+    restart)
+        echo "Stopping valkey-server..."
+        start-stop-daemon --stop --quiet --exec /usr/bin/valkey-server
+        # Since busybox implementation ignores --retry arguments repeatedly check
+        # if the process is still running and try another signal after a timeout,
+        # efectively simulating a stop with --retry=TERM/5/KILL/5 schedule.
+        waitAfterTerm=5000000 # us / 5000 ms / 5 s
+        waitAfterKill=5000000 # us / 5000 ms / 5 s
+        waitStep=100000 # us / 100 ms / 0.1 s
+        waited=0
+        start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+        processOff=$?
+        while [ $processOff -eq 0 ] && [ $waited -le $waitAfterTerm ] ; do
+            usleep ${waitStep}
+            ((waited+=${waitStep}))
+            start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+            processOff=$?
+        done
+        if [ $processOff -eq 0 ] ; then
+            start-stop-daemon --stop --signal KILL --exec /usr/bin/valkey-server
+            start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+            processOff=$?
+        fi
+        waited=0
+        while [ $processOff -eq 0 ] && [ $waited -le $waitAfterKill ] ; do
+            usleep ${waitStep}
+            ((waited+=${waitStep}))
+            start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+            processOff=$?
+        done
+        # Here $processOff will indicate if waiting and retrying according to
+        # the schedule ended in a successfull stop or not.
+        echo "Starting valkey-server..."
+        start-stop-daemon --start --quiet --exec /usr/bin/valkey-server -- $ARGS
+        ;;
+    *)
+        echo "Usage: /etc/init.d/valkey-server {start|stop|restart}"
+        exit 1
+        ;;
+esac
+exit 0
diff --git a/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch
new file mode 100644
index 000000000..1c3762638
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch
@@ -0,0 +1,78 @@
+From 892225f5101b1131434d323c55e79a93dc189609 Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Fri, 8 Feb 2013 20:22:19 -0600
+Subject: [PATCH] lua: update Makefile to use environment build settings
+OE-specific parameters, instead of overriding all of these simply use
+the ones that are already passed in. Also configure for only Linux...
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+Updated to work with 3.0.x
+Signed-off-by: Armin Kuster <akust808@gmail.com>
+updated to work wtih 6.2.1
+Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+---
+Upstream-Status: Pending
+ deps/Makefile         |  1 -
+ deps/lua/Makefile     |  1 -
+ deps/lua/src/Makefile | 16 ++++++----------
+ 3 files changed, 6 insertions(+), 12 deletions(-)
+diff --git a/deps/Makefile b/deps/Makefile
+index f1e4bd6ce..b9e50d049 100644
+--- a/deps/Makefile
+++ b/deps/Makefile
+@@ -94,7 +94,6 @@ endif
+ # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
+ # challenging to cross-compile lua (and redis).  These defines make it easier
+ # to fit redis into cross-compilation environments, which typically set AR.
+-AR=ar
+ ARFLAGS=rc
+ 
+ lua: .make-prerequisites
+diff --git a/deps/lua/Makefile b/deps/lua/Makefile
+index 209a13244..72f4b2bf2 100644
+--- a/deps/lua/Makefile
+++ b/deps/lua/Makefile
+@@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644
+ 
+ # Utilities.
+ MKDIR= mkdir -p
+-RANLIB= ranlib
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile
+index f3bba2f81..1555ec028 100644
+--- a/deps/lua/src/Makefile
+++ b/deps/lua/src/Makefile
+@@ -5,18 +5,14 @@
+ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
+ 
+ # Your platform. See PLATS for possible values.
+-PLAT= none
+PLAT= linux
+ 
+-CC?= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
+-AR= ar rcu
+-RANLIB= ranlib
+-RM= rm -f
+-LIBS= -lm $(MYLIBS)
+-
+-MYCFLAGS=
+MYCFLAGS=-DLUA_USE_LINUX
+ MYLDFLAGS=
+-MYLIBS=
+MYLIBS=-Wl,-E -ldl -lreadline -lhistory -lncurses
+
+CFLAGS += $(MYCFLAGS)
+LIBS += -lm $(MYLIBS)
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
diff --git a/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch
new file mode 100644
index 000000000..3bab01e3f
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch
@@ -0,0 +1,39 @@
+From ad79a81d6582555e580bdba42c959477e7d35ae7 Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Wed, 6 Feb 2013 20:51:02 -0600
+Subject: [PATCH] hack to force use of libc malloc
+Hack to force libc usage as it seems the option to pass it in has been
+removed in favor of magic.
+Note that this of course doesn't allow tcmalloc and jemalloc, however
+jemalloc wasn't building correctly.
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+Update to work with 4.0.8
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Update to work with 8.0.0
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+---
+Upstream-Status: Pending
+ src/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/src/Makefile b/src/Makefile
+index 13fa1c027..e0b1d2722 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -13,7 +13,8 @@
+ # Just use 'make dep', but this is only needed by developers.
+ 
+ release_hdr := $(shell sh -c './mkreleasehdr.sh')
+-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+# use fake uname option to force use of generic libc
+uname_S := "USE_LIBC_MALLOC"
+ uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
+ CLANG := $(findstring clang,$(shell sh -c '$(CC) --version | head -1'))
+ 
diff --git a/meta-oe/recipes-extended/valkey/valkey/valkey.conf b/meta-oe/recipes-extended/valkey/valkey/valkey.conf
new file mode 100644
index 000000000..5efff8fd4
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/valkey.conf
@@ -0,0 +1,1314 @@
+# Redis configuration file example.
+#
+# Note that in order to read the configuration file, Redis must be
+# started with the file path as first argument:
+#
+# ./valkey-server /path/to/valkey.conf
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+################################## INCLUDES ###################################
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+################################## MODULES #####################################
+# Load modules at startup. If the server is not able to load modules
+# it will abort. It is possible to use multiple loadmodule directives.
+#
+# loadmodule /path/to/my_module.so
+# loadmodule /path/to/other_module.so
+################################## NETWORK #####################################
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 6379
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+# unixsocket /tmp/valkey.sock
+# unixsocketperm 700
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 300
+################################# GENERAL #####################################
+# OE: run as a daemon.
+daemonize yes
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/valkey.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+# When running daemonized, Redis writes a pid file in /var/run/valkey.pid by
+# default. You can specify a custom pid file location here.
+pidfile /var/run/valkey.pid
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile ""
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+syslog-enabled yes
+# Specify the syslog identity.
+syslog-ident valkey
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+# By default Redis shows an ASCII art logo only when started to log to the
+# standard output and if the standard output is a TTY. Basically this means
+# that normally a logo is displayed only in interactive sessions.
+#
+# However it is possible to force the pre-4.0 behavior and always show a
+# ASCII art logo in startup logs by setting the following option to yes.
+always-show-logo yes
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+#save 900 1
+#save 300 10
+#save 60 10000
+# OE: tune for a small embedded system with a limited # of keys.
+save 120 1
+save 60 100
+save 30 1000
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+# The filename where to dump the DB
+dbfilename dump.rdb
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir /var/lib/valkey/
+################################# REPLICATION #################################
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only yes
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# Note that slaves never free the backlog for timeout, since they may be
+# promoted to masters later, and should be able to correctly "partially
+# resynchronize" with the slaves: hence they should always accumulate backlog.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+# A Redis master is able to list the address and port of the attached
+# slaves in different ways. For example the "INFO replication" section
+# offers this information, which is used, among other tools, by
+# Redis Sentinel in order to discover slave instances.
+# Another place where this info is available is in the output of the
+# "ROLE" command of a master.
+#
+# The listed IP and address normally reported by a slave is obtained
+# in the following way:
+#
+#   IP: The address is auto detected by checking the peer address
+#   of the socket used by the slave to connect with the master.
+#
+#   Port: The port is communicated by the slave during the replication
+#   handshake, and is normally the port that the slave is using to
+#   list for connections.
+#
+# However when port forwarding or Network Address Translation (NAT) is
+# used, the slave may be actually reachable via different IP and port
+# pairs. The following two options can be used by a slave in order to
+# report to its master a specific set of IP and port, so that both INFO
+# and ROLE will report those values.
+#
+# There is no need to use both the options if you need to override just
+# the port or the IP address.
+#
+# slave-announce-ip 5.5.5.5
+# slave-announce-port 1234
+################################## SECURITY ###################################
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running valkey-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+################################### CLIENTS ####################################
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+############################## MEMORY MANAGEMENT ################################
+# Set a memory usage limit to the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU or LFU cache, or to
+# set a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> Evict using approximated LRU among the keys with an expire set.
+# allkeys-lru -> Evict any key using approximated LRU.
+# volatile-lfu -> Evict using approximated LFU among the keys with an expire set.
+# allkeys-lfu -> Evict any key using approximated LFU.
+# volatile-random -> Remove a random key among the ones with an expire set.
+# allkeys-random -> Remove a random key, any key.
+# volatile-ttl -> Remove the key with the nearest expire time (minor TTL)
+# noeviction -> Don't evict anything, just return an error on write operations.
+#
+# LRU means Least Recently Used
+# LFU means Least Frequently Used
+#
+# Both LRU, LFU and volatile-ttl are implemented using approximated
+# randomized algorithms.
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+# LRU, LFU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs more CPU. 3 is faster but not very accurate.
+#
+# maxmemory-samples 5
+############################# LAZY FREEING ####################################
+# Redis has two primitives to delete keys. One is called DEL and is a blocking
+# deletion of the object. It means that the server stops processing new commands
+# in order to reclaim all the memory associated with an object in a synchronous
+# way. If the key deleted is associated with a small object, the time needed
+# in order to execute the DEL command is very small and comparable to most other
+# O(1) or O(log_N) commands in Redis. However if the key is associated with an
+# aggregated value containing millions of elements, the server can block for
+# a long time (even seconds) in order to complete the operation.
+#
+# For the above reasons Redis also offers non blocking deletion primitives
+# such as UNLINK (non blocking DEL) and the ASYNC option of FLUSHALL and
+# FLUSHDB commands, in order to reclaim memory in background. Those commands
+# are executed in constant time. Another thread will incrementally free the
+# object in the background as fast as possible.
+#
+# DEL, UNLINK and ASYNC option of FLUSHALL and FLUSHDB are user-controlled.
+# It's up to the design of the application to understand when it is a good
+# idea to use one or the other. However the Redis server sometimes has to
+# delete keys or flush the whole database as a side effect of other operations.
+# Specifically Redis deletes objects independently of a user call in the
+# following scenarios:
+#
+# 1) On eviction, because of the maxmemory and maxmemory policy configurations,
+#    in order to make room for new data, without going over the specified
+#    memory limit.
+# 2) Because of expire: when a key with an associated time to live (see the
+#    EXPIRE command) must be deleted from memory.
+# 3) Because of a side effect of a command that stores data on a key that may
+#    already exist. For example the RENAME command may delete the old key
+#    content when it is replaced with another one. Similarly SUNIONSTORE
+#    or SORT with STORE option may delete existing keys. The SET command
+#    itself removes any old content of the specified key in order to replace
+#    it with the specified string.
+# 4) During replication, when a slave performs a full resynchronization with
+#    its master, the content of the whole database is removed in order to
+#    load the RDB file just transfered.
+#
+# In all the above cases the default is to delete objects in a blocking way,
+# like if DEL was called. However you can configure each case specifically
+# in order to instead release memory in a non-blocking way like if UNLINK
+# was called, using the following configuration directives:
+lazyfree-lazy-eviction no
+lazyfree-lazy-expire no
+lazyfree-lazy-server-del no
+slave-lazy-flush no
+############################## APPEND ONLY MODE ###############################
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://valkey.io/topics/persistence for more information.
+# OE: changed default to enable this
+appendonly yes
+# The name of the append only file (default: "appendonly.aof")
+appendfilename "appendonly.aof"
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/valkey-persistence-demystified.html
+#
+# If unsure, use "everysec".
+# appendfsync always
+appendfsync everysec
+# appendfsync no
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+no-appendfsync-on-rewrite no
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "valkey-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+# When rewriting the AOF file, Redis is able to use an RDB preamble in the
+# AOF file for faster rewrites and recoveries. When this option is turned
+# on the rewritten AOF file is composed of two different stanzas:
+#
+#   [RDB file][AOF tail]
+#
+# When loading Redis recognizes that the AOF file starts with the "REDIS"
+# string and loads the prefixed RDB file, and continues loading the AOF
+# tail.
+#
+# This is currently turned off by default in order to avoid the surprise
+# of a format change, but will at some point be used as the default.
+aof-use-rdb-preamble no
+################################ LUA SCRIPTING  ###############################
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+# cluster-enabled yes
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+# cluster-config-file nodes-6379.conf
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have an exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+# In order to setup your cluster make sure to read the documentation
+# available at http://valkey.io web site.
+########################## CLUSTER DOCKER/NAT support  ########################
+# In certain deployments, Redis Cluster nodes address discovery fails, because
+# addresses are NAT-ted or because ports are forwarded (the typical case is
+# Docker and other containers).
+#
+# In order to make Redis Cluster working in such environments, a static
+# configuration where each node knows its public address is needed. The
+# following two options are used for this scope, and are:
+#
+# * cluster-announce-ip
+# * cluster-announce-port
+# * cluster-announce-bus-port
+#
+# Each instruct the node about its address, client port, and cluster message
+# bus port. The information is then published in the header of the bus packets
+# so that other nodes will be able to correctly map the address of the node
+# publishing the information.
+#
+# If the above options are not used, the normal Redis Cluster auto-detection
+# will be used instead.
+#
+# Note that when remapped, the bus port may not be at the fixed offset of
+# clients port + 10000, so you can specify any port and bus-port depending
+# on how they get remapped. If the bus-port is not set, a fixed offset of
+# 10000 will be used as usually.
+#
+# Example:
+#
+# cluster-announce-ip 10.1.1.5
+# cluster-announce-port 6379
+# cluster-announce-bus-port 6380
+################################## SLOW LOG ###################################
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+################################ LATENCY MONITOR ##############################
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+############################# EVENT NOTIFICATION ##############################
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://valkey.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  of zero or multiple characters. The empty string means that notifications
+#  are disabled.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+############################### ADVANCED CONFIG ###############################
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+# Client query buffers accumulate new commands. They are limited to a fixed
+# amount by default in order to avoid that a protocol desynchronization (for
+# instance due to a bug in the client) will lead to unbound memory usage in
+# the query buffer. However you can configure it here if you have very special
+# needs, such us huge multi/exec requests or alike.
+#
+# client-query-buffer-limit 1gb
+# In the Redis protocol, bulk requests, that are, elements representing single
+# strings, are normally limited ot 512 mb. However you can change this limit
+# here.
+#
+# proto-max-bulk-len 512mb
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
+# Redis LFU eviction (see maxmemory setting) can be tuned. However it is a good
+# idea to start with the default settings and only change them after investigating
+# how to improve the performances and how the keys LFU change over time, which
+# is possible to inspect via the OBJECT FREQ command.
+#
+# There are two tunable parameters in the Redis LFU implementation: the
+# counter logarithm factor and the counter decay time. It is important to
+# understand what the two parameters mean before changing them.
+#
+# The LFU counter is just 8 bits per key, it's maximum value is 255, so Redis
+# uses a probabilistic increment with logarithmic behavior. Given the value
+# of the old counter, when a key is accessed, the counter is incremented in
+# this way:
+#
+# 1. A random number R between 0 and 1 is extracted.
+# 2. A probability P is calculated as 1/(old_value*lfu_log_factor+1).
+# 3. The counter is incremented only if R < P.
+#
+# The default lfu-log-factor is 10. This is a table of how the frequency
+# counter changes with a different number of accesses with different
+# logarithmic factors:
+#
+# +--------+------------+------------+------------+------------+------------+
+# | factor | 100 hits   | 1000 hits  | 100K hits  | 1M hits    | 10M hits   |
+# +--------+------------+------------+------------+------------+------------+
+# | 0      | 104        | 255        | 255        | 255        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+# | 1      | 18         | 49         | 255        | 255        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+# | 10     | 10         | 18         | 142        | 255        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+# | 100    | 8          | 11         | 49         | 143        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+#
+# NOTE: The above table was obtained by running the following commands:
+#
+#   valkey-benchmark -n 1000000 incr foo
+#   valkey-cli object freq foo
+#
+# NOTE 2: The counter initial value is 5 in order to give new objects a chance
+# to accumulate hits.
+#
+# The counter decay time is the time, in minutes, that must elapse in order
+# for the key counter to be divided by two (or decremented if it has a value
+# less <= 10).
+#
+# The default value for the lfu-decay-time is 1. A Special value of 0 means to
+# decay the counter every time it happens to be scanned.
+#
+# lfu-log-factor 10
+# lfu-decay-time 1
+########################### ACTIVE DEFRAGMENTATION #######################
+#
+# WARNING THIS FEATURE IS EXPERIMENTAL. However it was stress tested
+# even in production and manually tested by multiple engineers for some
+# time.
+#
+# What is active defragmentation?
+# -------------------------------
+#
+# Active (online) defragmentation allows a Redis server to compact the
+# spaces left between small allocations and deallocations of data in memory,
+# thus allowing to reclaim back memory.
+#
+# Fragmentation is a natural process that happens with every allocator (but
+# less so with Jemalloc, fortunately) and certain workloads. Normally a server
+# restart is needed in order to lower the fragmentation, or at least to flush
+# away all the data and create it again. However thanks to this feature
+# implemented by Oran Agra for Redis 4.0 this process can happen at runtime
+# in an "hot" way, while the server is running.
+#
+# Basically when the fragmentation is over a certain level (see the
+# configuration options below) Redis will start to create new copies of the
+# values in contiguous memory regions by exploiting certain specific Jemalloc
+# features (in order to understand if an allocation is causing fragmentation
+# and to allocate it in a better place), and at the same time, will release the
+# old copies of the data. This process, repeated incrementally for all the keys
+# will cause the fragmentation to drop back to normal values.
+#
+# Important things to understand:
+#
+# 1. This feature is disabled by default, and only works if you compiled Redis
+#    to use the copy of Jemalloc we ship with the source code of Redis.
+#    This is the default with Linux builds.
+#
+# 2. You never need to enable this feature if you don't have fragmentation
+#    issues.
+#
+# 3. Once you experience fragmentation, you can enable this feature when
+#    needed with the command "CONFIG SET activedefrag yes".
+#
+# The configuration parameters are able to fine tune the behavior of the
+# defragmentation process. If you are not sure about what they mean it is
+# a good idea to leave the defaults untouched.
+# Enabled active defragmentation
+# activedefrag yes
+# Minimum amount of fragmentation waste to start active defrag
+# active-defrag-ignore-bytes 100mb
+# Minimum percentage of fragmentation to start active defrag
+# active-defrag-threshold-lower 10
+# Maximum percentage of fragmentation at which we use maximum effort
+# active-defrag-threshold-upper 100
+# Minimal effort for defrag in CPU percentage
+# active-defrag-cycle-min 25
+# Maximal effort for defrag in CPU percentage
+# active-defrag-cycle-max 75
diff --git a/meta-oe/recipes-extended/valkey/valkey/valkey.service b/meta-oe/recipes-extended/valkey/valkey/valkey.service
new file mode 100644
index 000000000..5c6aa5b17
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/valkey.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Valkey: an open source, in-memory data store
+After=network.target
+[Service]
+User=valkey
+Group=valkey
+ExecStart=/usr/bin/valkey-server /etc/valkey/valkey.conf
+ExecStop=/usr/bin/valkey-cli shutdown
+Restart=always
+LimitNOFILE=10032
+StateDirectory=valkey
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-extended/valkey/valkey_8.0.1.bb b/meta-oe/recipes-extended/valkey/valkey_8.0.1.bb
new file mode 100644
index 000000000..a62abebfb
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey_8.0.1.bb
@@ -0,0 +1,74 @@
+SUMMARY = "Valkey key-value store"
+DESCRIPTION = "A flexible distributed key-value datastore that supports both caching and beyond caching workloads."
+HOMEPAGE = "http://valkey.io"
+SECTION = "libs"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f924153a31f3091d2c9c500317d53425"
+DEPENDS = "readline lua ncurses"
+SRC_URI = " \
+        git://github.com/valkey-io/valkey.git;branch=8.0;protocol=https \
+        file://valkey.conf \
+        file://init-valkey-server \
+        file://valkey.service \
+        file://hiredis-use-default-CC-if-it-is-set.patch \
+        file://lua-update-Makefile-to-use-environment-build-setting.patch \
+        file://oe-use-libc-malloc.patch \
+        file://0001-src-Do-not-reset-FINAL_LIBS.patch \
+        file://GNU_SOURCE-7.patch \
+"
+SRCREV = "4fbab5740bfef66918d6c2950dd2b3b4e07815a2"
+S = "${WORKDIR}/git"
+inherit autotools-brokensep pkgconfig update-rc.d systemd useradd
+FINAL_LIBS:x86:toolchain-clang = "-latomic"
+FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
+FINAL_LIBS:mips = "-latomic"
+FINAL_LIBS:arm = "-latomic"
+FINAL_LIBS:powerpc = "-latomic"
+export FINAL_LIBS
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN}  = "--system --home-dir /var/lib/valkey -g valkey --shell /bin/false valkey"
+GROUPADD_PARAM:${PN} = "--system valkey"
+PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
+EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
+do_compile:prepend() {
+    (cd deps && oe_runmake hiredis lua linenoise)
+}
+do_install() {
+    export PREFIX=${D}/${prefix}
+    oe_runmake install
+    install -d ${D}/${sysconfdir}/valkey
+    install -m 0644 ${UNPACKDIR}/valkey.conf ${D}/${sysconfdir}/valkey/valkey.conf
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${UNPACKDIR}/init-valkey-server ${D}/${sysconfdir}/init.d/valkey-server
+    install -d ${D}/var/lib/valkey/
+    chown valkey.valkey ${D}/var/lib/valkey/
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/valkey.service ${D}${systemd_system_unitdir}
+    sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/valkey.service
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/valkey/valkey.conf
+        sed -i 's!supervised no!supervised systemd!' ${D}/${sysconfdir}/valkey/valkey.conf
+    fi
+}
+CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf"
+INITSCRIPT_NAME = "valkey-server"
+INITSCRIPT_PARAMS = "defaults 87"
+SYSTEMD_SERVICE:${PN} = "valkey.service"
+CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows."
diff --git a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
index 1a7592227..948d8a281 100644
--- a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
+++ b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
@@ -9,7 +9,7 @@ SECTION = "utils"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
-SRC_URI = "${GENTOO_MIRROR}/${BP}.tar.gz \
+SRC_URI = "${GENTOO_MIRROR}/37/${BP}.tar.gz \
       file://disable_vlockrc.patch \
       file://vlock_pam_tally2_reset.patch \
       file://vlock-no_tally.patch \
diff --git a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
index 7fb31f208..d4a8b49e1 100644
--- a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
+++ b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
@@ -33,3 +33,4 @@ do_install:append () {
 FILES:${PN} += " ${systemd_system_unitdir} "
 FILES:${PN} += " ${libdir} "
 FILES:${PN} += " ${nonarch_libdir}/tmpfiles.d/* "
+FILES:${PN} += " ${base_libdir}/security/*.so "
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch
deleted file mode 100644
index 52f444933..000000000
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 72c3b7324f00047e6dc5d8380ed2f6ff2494a6f9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 18 Dec 2022 14:51:34 -0800
-Subject: [PATCH] locale: Avoid using glibc specific defines on musl
-musl does not provide some glibc-only enum members e.g. _NL_ADDRESS_LANG_NAME
-Upstream-Status: Submitted [https://github.com/wxWidgets/wxWidgets/pull/23050]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/unix/uilocale.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/unix/uilocale.cpp b/src/unix/uilocale.cpp
-index 57773e17f5..86816ba896 100644
--- a/src/unix/uilocale.cpp
-+++ b/src/unix/uilocale.cpp
-@@ -619,7 +619,7 @@ wxString
- wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const
- {
-     wxString str;
-#if defined(HAVE_LANGINFO_H) && defined(__LINUX__)
-+#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) && defined(__GLIBC__)
-     switch (name)
-     {
-         case wxLOCALE_NAME_LOCALE:
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
index b3b9e79c5..a3b8d0c0e 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
@@ -1,4 +1,4 @@
-From a071243763f4b06fc7e71f541c49cecf380b6f27 Mon Sep 17 00:00:00 2001
+From 8f582c0ea40ccdb2d439b7614459d752f3606e15 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 11 Oct 2020 22:16:55 +0200
 Subject: [PATCH] wx-config.in: Disable cross magic - it does not work for us
@@ -18,10 +18,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/wx-config.in b/wx-config.in
-index d132e3182f..d0d162e8a3 100755
+index 4df8571d28..1173d89685 100755
 --- a/wx-config.in
 +++ b/wx-config.in
-@@ -396,7 +396,7 @@ get_mask()
+@@ -394,7 +394,7 @@ get_mask()
 }
 
 # Returns true if this script is for a cross compiled config.
@@ -31,5 +31,5 @@ index d132e3182f..d0d162e8a3 100755
 
 # Determine the base directories we require.
 -- 
-2.26.2
+2.25.1
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
index ea204ed3b..b599f3887 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
@@ -1,12 +1,18 @@
-wxWidgets hardcodes libdir with 'lib' and does not support multilib which will
+From 9487fe5cd271a4bee96ab590509ef38f6972887a Mon Sep 17 00:00:00 2001
-change it. Respect variable wxPLATFORM_LIB_DIR to support libdir be configurable.
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] fix libdir for multilib
+wxWidgets hardcodes libdir with 'lib' and does not support multilib
+which will change it. Respect variable wxPLATFORM_LIB_DIR to support
+libdir be configurable.
 Upstream-Status: Pending
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
-Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX in this
+Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX
-patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
+in this patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
@@ -17,36 +23,36 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
 4 files changed, 10 insertions(+), 10 deletions(-)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a49ecd3883..d469471f38 100644
+index f6ae7f6210..2a13e448db 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -45,7 +45,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE)
 # Initialize variables for quick access to wx root dir in sub dirs
 set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
- set(wxBINARY_DIR ${CMAKE_BINARY_DIR})
+ set(wxBINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 -set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib)
 +set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib${LIB_SUFFIX})
 
 # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION
 file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS)
 diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
-index b359560bc0..c59ea60923 100644
+index addd8d6b81..9ec677534b 100644
 --- a/build/cmake/config.cmake
 +++ b/build/cmake/config.cmake
-@@ -76,7 +76,7 @@ function(wx_write_config_inplace)
+@@ -100,7 +100,7 @@ function(wx_write_config_inplace)
     execute_process(
         COMMAND
         "${CMAKE_COMMAND}" -E ${COPY_CMD}
-        "${CMAKE_CURRENT_BINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
+-        "${wxBINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
-+        "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
+        "${wxBINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
-         "${CMAKE_CURRENT_BINARY_DIR}/wx-config"
+         "${wxBINARY_DIR}/wx-config"
         )
 endfunction()
 diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
-index 7182364e5e..55fbebc7ee 100644
+index 72a34f0b4f..81ede7d8ae 100644
 --- a/build/cmake/functions.cmake
 +++ b/build/cmake/functions.cmake
-@@ -435,8 +435,8 @@ macro(wx_add_library name)
+@@ -462,8 +462,8 @@ macro(wx_add_library name)
         endif()
         wx_install(TARGETS ${name}
             EXPORT wxWidgetsTargets
@@ -105,3 +111,6 @@ index 384c6837b8..d3303faabb 100644
 )
 
 # uninstall target
+-- 
+2.25.1
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
index 6eef0b679..dbede0304 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
@@ -1,18 +1,23 @@
+From b86806ef34d4c9171165c1533064bf34ad822e20 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] create links with relative path
 It fails to build python3-wxgtk4 which depends on wxwidgets:
 | ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an
    absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux
-        /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work
+    /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work
-        /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config
+    /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config
    pointing at /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native/3.2.1-r0
-        /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2.
+    /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2.
  Please replace this with a relative link.
 | ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an
    absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
-        /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
+    /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
-        /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc
+    /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc
-        /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2.
+    /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2.
-  Please replace this with a relative link.
+   Please replace this with a relative link.
 Create symlink with relative path to fix the issues.
@@ -50,3 +55,6 @@ index dbed8cc9b3..1dbc3261d3 100644
             \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
             )"
         )
+-- 
+2.25.1
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch
index 6329256b0..e3463ba17 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch
@@ -1,3 +1,8 @@
+From 5e9725c1151e2b029066d61ef5dccf1f3e6cb323 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] don not append system name to lib name
 It appends system name to library names for cross compile. For example, the
 library name is libwx_baseu-3.1-Linux.so rather than libwx_baseu-3.1.so. It is
 not appropriate for oe.
@@ -14,10 +19,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
-index e374d9a273..c6b1908bd6 100644
+index 81ede7d8ae..23eebeb914 100644
 --- a/build/cmake/functions.cmake
 +++ b/build/cmake/functions.cmake
-@@ -219,9 +219,9 @@ function(wx_set_target_properties target_name)
+@@ -243,9 +243,9 @@ function(wx_set_target_properties target_name)
     endif()
 
     set(cross_target)
@@ -30,3 +35,6 @@ index e374d9a273..c6b1908bd6 100644
 
     set(lib_prefix "lib")
     if(MSVC OR (WIN32 AND wxBUILD_SHARED))
+-- 
+2.25.1
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch
index 628f8dee5..b650c5038 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch
@@ -1,8 +1,14 @@
-It sets 'libdir' with path element 'lib' directly which is not suitable for
+From 4230cd84f156f9eb5c9b80ffbc69dd55fa7c7ca7 Mon Sep 17 00:00:00 2001
-multilib. Add an option '--baselib' for wx-config to support multilib when
+From: Kai Kang <kai.kang@windriver.com>
-cross compile. And set default value of baselib with "lib${wxPLATFORM_LIB_DIR}".
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] wx-config: fix libdir for multilib
-Upstream-Status: Pending [oe specific]
+It sets 'libdir' with path element 'lib' directly which is not suitable
+for multilib. Add an option '--baselib' for wx-config to support
+multilib when cross compile. And set default value of baselib with
+"lib${wxPLATFORM_LIB_DIR}".
+Upstream-Status: Inappropriate [oe specific]
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
@@ -15,10 +21,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
 2 files changed, 5 insertions(+), 3 deletions(-)
 diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
-index 52ae69d3f6..28aa733eb0 100644
+index 9ec677534b..ee61cf7572 100644
 --- a/build/cmake/config.cmake
 +++ b/build/cmake/config.cmake
-@@ -86,7 +86,7 @@ function(wx_write_config)
+@@ -110,7 +110,7 @@ function(wx_write_config)
     set(prefix ${CMAKE_INSTALL_PREFIX})
     set(exec_prefix "\${prefix}")
     set(includedir "\${prefix}/include")
@@ -26,9 +32,9 @@ index 52ae69d3f6..28aa733eb0 100644
 +    set(libdir "\${exec_prefix}/\${baselib}")
     set(bindir "\${exec_prefix}/bin")
 
-     find_program(EGREP egrep)
+     if(wxBUILD_MONOLITHIC)
 diff --git a/wx-config.in b/wx-config.in
-index e3f7d115bb..0e78af03c7 100755
+index 1173d89685..8364a33e9d 100755
 --- a/wx-config.in
 +++ b/wx-config.in
 @@ -42,7 +42,8 @@ usage()
@@ -41,7 +47,7 @@ index e3f7d115bb..0e78af03c7 100755
            [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
            [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]]
            [--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR]
-@@ -137,7 +138,7 @@ wxconfig_output_options="prefix exec_prefix
+@@ -133,7 +134,7 @@ wxconfig_output_options="prefix exec_prefix
 
 # Options that permit the user to supply hints that may affect the output.
 # These options all accept arbitrary values, to interpret as they please.
@@ -50,7 +56,7 @@ index e3f7d115bb..0e78af03c7 100755
 
 # Input options that accept only a yes or no argument.
 #
-@@ -404,6 +405,7 @@ is_cross()  { [ "x@cross_compiling@" = "xyes" ]; }
+@@ -400,6 +401,7 @@ is_cross()  { [ "xno" = "xyes" ]; }
 # Determine the base directories we require.
 prefix=${input_option_prefix-${this_prefix:-@prefix@}}
 exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
@@ -58,3 +64,6 @@ index e3f7d115bb..0e78af03c7 100755
 wxconfdir="@libdir@/wx/config"
 
 installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"`
+-- 
+2.25.1
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch
index e4ca6579f..37d61dcb3 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch
@@ -1,8 +1,19 @@
-Upstream-Status: Pending
+From 64d5d7f68cde208c6f8a5e0b71da93f98e4720f7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 12 Oct 2024 20:30:16 +0800
+Subject: [PATCH] Fix locale on musl
 these macro'd away functions don't exist in musl (yet)
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/wx/xlocale.h | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
 diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
-index c433d25..3ab9d84 100644
+index c433d25d05..794cf0b66b 100644
 --- a/include/wx/xlocale.h
 +++ b/include/wx/xlocale.h
 @@ -33,6 +33,26 @@
@@ -32,3 +43,6 @@ index c433d25..3ab9d84 100644
 // The platform-specific locale type
 // If wxXLocale_t is not defined, then only "C" locale support is provided
 #ifdef wxHAS_XLOCALE_SUPPORT
+-- 
+2.25.1
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
index 5160f2e1f..ef94e3551 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
@@ -1,4 +1,4 @@
-From e108aff9d6dae613f486c1b1681f4a3cdf17b845 Mon Sep 17 00:00:00 2001
+From 22f70d5bd039b20bfdad522341412ca001c639db Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 19 Dec 2022 15:07:55 -0800
 Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly
@@ -6,16 +6,17 @@ Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly
 nothing sets this to 0, but for some reason it gets undef'd
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 build/cmake/setup.h.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
-index bce33a73f3..22afb4cfa0 100644
+index fcc282980d..767adbf658 100644
 --- a/build/cmake/setup.h.in
 +++ b/build/cmake/setup.h.in
-@@ -869,8 +869,7 @@
+@@ -867,8 +867,7 @@
 /*
  * Define if large (64 bit file offsets) files are supported.
  */
@@ -26,5 +27,5 @@ index bce33a73f3..22afb4cfa0 100644
  * Use OpenGL
  */
 -- 
-2.39.0
+2.25.1
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
index 91653e285..2ddda142e 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
@@ -20,17 +20,18 @@ DEPENDS += " \
 SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \
           file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
-           file://fix-libdir-for-multilib.patch \
+           file://0002-fix-libdir-for-multilib.patch \
-           file://create-links-with-relative-path.patch \
+           file://0003-create-links-with-relative-path.patch \
-           file://not-append-system-name-to-lib-name.patch \
+           file://0004-don-not-append-system-name-to-lib-name.patch \
-           file://wx-config-fix-libdir-for-multilib.patch \
+           file://0005-wx-config-fix-libdir-for-multilib.patch \
-           file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \
+           file://0006-Fix-locale-on-musl.patch \
-           file://musl-locale-l.patch \
+           file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
-           file://0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
           "
-SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496"
+SRCREV= "5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a"
 S = "${WORKDIR}/git"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 # These can be either 'builtin' or 'sys' and builtin means cloned soures are
 # build. So these cannot be PACKAGECONFIGs and let's use libs where we can (see
 # DEPENDS)
diff --git a/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.3.bb b/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.5.bb
index 1ddc27765..2f1e80abe 100644
--- a/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.3.bb
+++ b/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.5.bb
@@ -11,6 +11,6 @@ inherit meson
 SRC_URI = "git://github.com/lassekongo83/adw-gtk3.git;protocol=https;branch=main"
 S = "${WORKDIR}/git"
-SRCREV = "22a3b9374369640993e4a7ab84f8acc72318e501"
+SRCREV = "385a900628644dc81fa4942ac848a765229be93a"
 FILES:${PN} = "${datadir}/themes"
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc b/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc
index 09a3f675a..13bf64047 100644
--- a/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc
+++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc
@@ -65,8 +65,8 @@ SRC_URI += " \
    crate://crates.io/ppv-lite86/0.2.17 \
    crate://crates.io/proc-macro-error/1.0.4 \
    crate://crates.io/proc-macro-error-attr/1.0.4 \
-    crate://crates.io/proc-macro2/1.0.66 \
+    crate://crates.io/proc-macro2/1.0.85 \
-    crate://crates.io/quote/1.0.33 \
+    crate://crates.io/quote/1.0.36 \
    crate://crates.io/rand/0.7.3 \
    crate://crates.io/rand_chacha/0.2.2 \
    crate://crates.io/rand_core/0.5.1 \
@@ -82,18 +82,18 @@ SRC_URI += " \
    crate://crates.io/ryu/1.0.15 \
    crate://crates.io/same-file/1.0.6 \
    crate://crates.io/scopeguard/1.2.0 \
-    crate://crates.io/serde/1.0.188 \
+    crate://crates.io/serde/1.0.203 \
    crate://crates.io/serde-tuple-vec-map/1.0.1 \
    crate://crates.io/serde_cbor/0.11.2 \
-    crate://crates.io/serde_derive/1.0.188 \
+    crate://crates.io/serde_derive/1.0.203 \
-    crate://crates.io/serde_json/1.0.106 \
+    crate://crates.io/serde_json/1.0.117 \
    crate://crates.io/serde_yaml/0.9.21 \
    crate://crates.io/stderrlog/0.5.4 \
    crate://crates.io/strsim/0.8.0 \
    crate://crates.io/structopt/0.3.26 \
    crate://crates.io/structopt-derive/0.4.18 \
    crate://crates.io/syn/1.0.109 \
-    crate://crates.io/syn/2.0.32 \
+    crate://crates.io/syn/2.0.66 \
    crate://crates.io/tempfile/3.8.0 \
    crate://crates.io/termcolor/1.1.3 \
    crate://crates.io/textwrap/0.11.0 \
@@ -198,8 +198,8 @@ SRC_URI[plotters-svg-0.3.5.sha256sum] = "38f6d39893cca0701371e3c27294f09797214b8
 SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-SRC_URI[proc-macro2-1.0.66.sha256sum] = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+SRC_URI[proc-macro2-1.0.85.sha256sum] = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
-SRC_URI[quote-1.0.33.sha256sum] = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 SRC_URI[rand-0.7.3.sha256sum] = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 SRC_URI[rand_chacha-0.2.2.sha256sum] = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 SRC_URI[rand_core-0.5.1.sha256sum] = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
@@ -215,18 +215,18 @@ SRC_URI[rustix-0.38.13.sha256sum] = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1
 SRC_URI[ryu-1.0.15.sha256sum] = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-SRC_URI[serde-1.0.188.sha256sum] = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+SRC_URI[serde-1.0.203.sha256sum] = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 SRC_URI[serde-tuple-vec-map-1.0.1.sha256sum] = "a04d0ebe0de77d7d445bb729a895dcb0a288854b267ca85f030ce51cdc578c82"
 SRC_URI[serde_cbor-0.11.2.sha256sum] = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-SRC_URI[serde_derive-1.0.188.sha256sum] = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+SRC_URI[serde_derive-1.0.203.sha256sum] = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
-SRC_URI[serde_json-1.0.106.sha256sum] = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2"
+SRC_URI[serde_json-1.0.117.sha256sum] = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 SRC_URI[serde_yaml-0.9.21.sha256sum] = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c"
 SRC_URI[stderrlog-0.5.4.sha256sum] = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b"
 SRC_URI[strsim-0.8.0.sha256sum] = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 SRC_URI[structopt-0.3.26.sha256sum] = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
 SRC_URI[structopt-derive-0.4.18.sha256sum] = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-SRC_URI[syn-2.0.32.sha256sum] = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
+SRC_URI[syn-2.0.66.sha256sum] = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
 SRC_URI[tempfile-3.8.0.sha256sum] = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
 SRC_URI[textwrap-0.11.0.sha256sum] = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch
index e29b78fde..1e2cdacf4 100644
--- a/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch
+++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch
@@ -89,9 +89,9 @@ index 8443695e2bd5..50924576a8e3 100644
 -
 -[[package]]
 -name = "zstd-sys"
-version = "2.0.11+zstd.1.5.6"
+-version = "2.0.10+zstd.1.5.6"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4"
+-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
 -dependencies = [
 - "cc",
 - "pkg-config",
@@ -116,7 +116,7 @@ index e7095267f1cd..ff7bc4f5d025 100644
 +++ b/src/lib.rs
 @@ -63,7 +63,6 @@ use rayon::prelude::*;
 use regex::RegexSet;
- use serde::Deserialize;
+ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 -use std::ffi::OsStr;
 use std::fs::File;
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb b/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.2.bb
index 04de074d2..cf1cafa12 100644
--- a/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb
+++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.2.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = " \
 inherit cargo cargo-update-recipe-crates
 SRC_URI += " \
-    crate://crates.io/deqp-runner/0.20.0 \
+    crate://crates.io/deqp-runner/${PV} \
    file://0001-deqp-runner-drop-zstd-support.patch \
 "
-SRC_URI[deqp-runner-0.20.0.sha256sum] = "a3f4fab1179a01cbbdbe4b93e0a040f74de7b9086498d91976d93844a31439dd"
+SRC_URI[deqp-runner-0.20.2.sha256sum] = "600ea527945ea2d0c5d2987d6adb4d2944731ea95906de2c94eb419148cc398b"
 require deqp-runner-crates.inc
diff --git a/meta-oe/recipes-graphics/drm/drm-info_2.7.0.bb b/meta-oe/recipes-graphics/drm/drm-info_2.7.0.bb
new file mode 100644
index 000000000..9f1cbb47f
--- /dev/null
+++ b/meta-oe/recipes-graphics/drm/drm-info_2.7.0.bb
@@ -0,0 +1,13 @@
+SUMMARY = "Small utility to dump info about DRM devices"
+HOMEPAGE = "https://gitlab.freedesktop.org/emersion/drm_info"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=32fd56d355bd6a61017655d8da26b67c"
+SRC_URI = "git://gitlab.freedesktop.org/emersion/drm_info.git;branch=master;protocol=https"
+SRCREV = "c1f5ca4cf750b26eb26c1d9d5c2ef057acbcfefc"
+S = "${WORKDIR}/git"
+inherit meson pkgconfig
+DEPENDS = "json-c libdrm"
diff --git a/meta-oe/recipes-graphics/glad/glad_2.0.8.bb b/meta-oe/recipes-graphics/glad/glad_2.0.8.bb
new file mode 100644
index 000000000..4065c27e6
--- /dev/null
+++ b/meta-oe/recipes-graphics/glad/glad_2.0.8.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specifications for multiple languages."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae570f26774ac096cff8f992091a223c"
+SRC_URI = "git://github.com/Dav1dde/glad.git;protocol=https;branch=glad2"
+SRCREV = "73db193f853e2ee079bf3ca8a64aa2eaf6459043"
+S = "${WORKDIR}/git"
+inherit python_setuptools_build_meta
+BBCLASSEXTEND = "native nativesdk"
+RDEPENDS:${PN} = "python3 python3-jinja2"
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch
deleted file mode 100644
index 0d3f41270..000000000
--- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 671e0d091b40ef7deb4a9d43e0dbed2a44edbec8 Mon Sep 17 00:00:00 2001
-From: Matthew Fernandez <matthew.fernandez@gmail.com>
-Date: Sat, 9 Sep 2023 01:03:04 -0700
-Subject: [PATCH] Autotools: fix: do not put '$prefix' based paths in
- compilation flags
-This was causing problems with cross-compilation with a dedicated sysroot,
-because compilation would incorrectly use headers and libraries from the
-`--prefix` path. The `--prefix` path is meant to indicate a target path to
-install to, not a path from which to source dependent libraries.
-Gitlab: fixes #2442
-Reported-by: Daniel Klauer
-Suggested-by: Daniel Klauer
-Upstream-Status: Backport [https://gitlab.com/graphviz/graphviz/-/commit/012d250a903e13114bce3ba40995fb957fed7848]
-Signed-off-by: Daniel Klauer <daniel.klauer@gin.de>
---
- CHANGELOG.md | 3 +++
- configure.ac | 8 --------
- 2 files changed, 3 insertions(+), 8 deletions(-)
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index b9b7e8e08..3a15fd256 100644
--- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -39,6 +39,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-   longer fails due to missing PHP files. #2388
- - Syntax for a loop in `gvmap.sh` has been corrected. This was a regression in
-   Graphviz 2.50.0. #2404
-+- The Autotools build system no longer uses headers and libraries from the
-+  `--prefix` path given on the command line. This previously caused
-+  cross-compilation to incorrectly pick up host headers and libraries. #2442
- 
- ## [8.0.5] – 2023-04-30
- 
-diff --git a/configure.ac b/configure.ac
-index 573a3ee5d..7d53346de 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -190,14 +190,6 @@ if test "x${prefix}" = "xNONE"; then
-        AC_SUBST([prefix])
- fi
- 
-# automatically check for other dependencies in $prefix first
-if test "x${prefix}" != "x/usr"; then
-       CPPFLAGS="$CPPFLAGS -I${prefix}/include"
-       LDFLAGS="$LDFLAGS -L${prefix}/lib"
-       PKG_CONFIG_PATH="$prefix/lib/pkgconfig$PATHSEPARATOR$PKG_CONFIG_PATH"
-       export PKG_CONFIG_PATH
-fi
-
- dnl -----------------------------------
- # Static/Shared binaries
- 
-- 
-2.34.1
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
deleted file mode 100644
index 99b53e2e1..000000000
--- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 564901ab78da2b2b1bed92351dc3c102dc0a8154 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 6 Aug 2019 17:51:39 -0700
-Subject: [PATCH] Set use_tcl to be empty string if tcl is disabled
-Upstream-Status: Inappropriate [Cross-compile specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/configure.ac
-+++ b/configure.ac
-@@ -1225,7 +1225,7 @@ AC_ARG_ENABLE(tcl,
-   [], [enable_tcl=yes])
- 
- if test "x$enable_tcl" != "xyes"; then
-  use_tcl="No (disabled)"
-+  use_tcl=""
- fi
- 
- if test "x$use_tcl" = "x"; then
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/gra
- dist_man_MANS = graphviz.7
- 
- # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS
-SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests
-+SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs tests
- 
- .PHONY: doxygen
- doxygen:
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb b/meta-oe/recipes-graphics/graphviz/graphviz_12.1.2.bb
index 7548e976f..36c434c51 100644
--- a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb
+++ b/meta-oe/recipes-graphics/graphviz/graphviz_12.1.2.bb
@@ -19,16 +19,11 @@ DEPENDS:append:class-nativesdk = " ${BPN}-native"
 inherit autotools-brokensep pkgconfig gettext qemu
 SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \
-           file://0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch \
           "
-# Use native mkdefs
-SRC_URI:append:class-target = "\
-           file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \
-"
 SRC_URI:append:class-nativesdk = "\
           file://graphviz-setup.sh \
 "
-SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565"
+SRC_URI[sha256sum] = "cf9e6de9d5949dffbc4dd46f833085ff8e7e55482ffb84641819bbf0d18c5f02"
 UPSTREAM_CHECK_URI = "https://graphviz.org/download/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
@@ -43,6 +38,7 @@ EXTRA_OECONF:class-target = "\
                --with-expatlibdir=${STAGING_LIBDIR} \
                --without-included-ltdl \
                --disable-java \
+                --disable-perl \
                --disable-tcl \
                --disable-r \
                --disable-sharp \
diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.120.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.121.bb
index b7807c885..3f94933e6 100644
--- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.120.bb
+++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.121.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
 SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz"
-SRC_URI[sha256sum] = "5da94863fb2e5d88cc019e2bfdc676022398113894b585d864e11ca8341b24d8"
+SRC_URI[sha256sum] = "54aa45788d6d52afb659c3aef335aafde0ef2c8990a7770f8eaa64e57f227346"
 S = "${WORKDIR}/${BPN}-gtk3-${PV}"
 DEPENDS = " \
@@ -33,12 +33,15 @@ REQUIRED_DISTRO_FEATURES = "wayland x11"
 EXTRA_OECONF = " \
    --enable-gtk3 \
-    --with-tcl=${STAGING_BINDIR_CROSS} \
-    --with-tk=${STAGING_BINDIR_CROSS} \
    --with-tirpc \
    --disable-mime-update \
 "
+PACKAGECONFIG = ""
+PACKAGECONFIG[tcl] = "--with-tcl=${STAGING_BINDIR_CROSS},--disable-tcl,tcl"
+PACKAGECONFIG[tk] = "--with-tk=${STAGING_BINDIR_CROSS},--disable-tcl,tk"
 FILES:${PN} = "${bindir} ${datadir}"
 RDEPENDS:${PN} += "tk-lib"
diff --git a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb b/meta-oe/recipes-graphics/jasper/jasper_4.2.4.bb
index 5281980ec..4796a8519 100644
--- a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb
+++ b/meta-oe/recipes-graphics/jasper/jasper_4.2.4.bb
@@ -3,13 +3,11 @@ HOMEPAGE = "https://jasper-software.github.io/jasper/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a80440d1d8f17d041c71c7271d6e06eb"
-SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=master"
+SRC_URI = "https://github.com/jasper-software/${BPN}/releases/download/version-${PV}/${BP}.tar.gz"
-SRCREV = "917f7708b755d8434f70618108c1a76f1b6a0a82"
+SRC_URI[sha256sum] = "6a597613d8d84c500b5b83bf0eec06cd3707c23d19957f70354ac2394c9914e7"
 CVE_STATUS[CVE-2015-8751] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
-S = "${WORKDIR}/git"
 inherit cmake multilib_header
 do_configure:prepend() {
@@ -31,4 +29,3 @@ do_install:append() {
    chrpath -d ${D}${libdir}/libjasper.so.*
    oe_multilib_header jasper/jas_config.h
 }
diff --git a/meta-oe/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb b/meta-oe/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb
new file mode 100644
index 000000000..0e88e84af
--- /dev/null
+++ b/meta-oe/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Firmware file compiler for the panel-mipi-dbi display driver"
+DESCRIPTION = "The panel-mipi-dbi Linux display driver allows using the same \
+               driver for most MIPI DBI based display panels. \
+               This means many displays attached via SPI, even if the \
+               datasheet does not explicitly mention DBI support. \
+               To do so it uses tiny firmware files that contain \
+               display/controller-specific initialization commands. \
+               The mipi-dbi-cmd tool compiles these firmware files from a \
+               text format to a firmware blob format."
+HOMEPAGE = "https://github.com/notro/panel-mipi-dbi"
+SECTION = "graphics"
+LICENSE = "CC0-1.0"
+LIC_FILES_CHKSUM = "file://mipi-dbi-cmd;beginline=4;endline=13;md5=5e3d3f14cc87aa9e8976d728520cbcae"
+SRCREV = "1cbd40135a8c7f25d7b444a7fac77fd3c3ad471e"
+SRC_URI = "git://github.com/notro/panel-mipi-dbi.git;protocol=https;branch=main"
+S = "${WORKDIR}/git"
+inherit native
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install () {
+    install -D -p -m 0755 ${S}/mipi-dbi-cmd ${D}${bindir}/mipi-dbi-cmd
+}
+RDEPENDS:${PN} += "python3-native"
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch b/meta-oe/recipes-graphics/tigervnc/files/0001-do-not-build-tests-sub-directory.patch
index 5a42e67d0..0d58d2502 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0001-do-not-build-tests-sub-directory.patch
@@ -1,4 +1,4 @@
-From 076d0e12a7be6cd2108e4ca0dcde1cb658918fa5 Mon Sep 17 00:00:00 2001
+From e117ccc2b4ebb116ab63a3aa6097104964ee223b Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 19 Apr 2021 23:02:45 -0700
 Subject: [PATCH] do not build tests sub directory
@@ -12,19 +12,19 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
 1 file changed, 3 deletions(-)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7bf99441..bda80598 100644
+index 468f4b54..c47c9c0e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -304,9 +304,6 @@ if(BUILD_VIEWER)
+@@ -351,9 +351,6 @@ if(BUILD_VIEWER)
   add_subdirectory(media)
 endif()
 
 -add_subdirectory(tests)
 -
 -
- add_subdirectory(release)
+ if(BUILD_VIEWER)
- 
+   add_subdirectory(release)
- # uninstall
+ endif()
 -- 
-2.30.2
+2.25.1
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
index cfb84ac14..56bed4bbf 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
@@ -1,7 +1,7 @@
-From 6369a5be2af2ed1fa443f40f48deaf318d22713e Mon Sep 17 00:00:00 2001
+From 7ca0b0a4f8a37f9dbe461e28a731364b9aaa60bb Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 20 Jul 2017 05:06:00 -0400
-Subject: [PATCH 3/4] add missing dynamic library to FLTK_LIBRARIES
+Subject: [PATCH] add missing dynamic library to FLTK_LIBRARIES
 Upstream-Status: Pending
@@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 1 file changed, 2 insertions(+)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb72a00..5732dc8 100644
+index c47c9c0e..f4b576a0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -246,6 +246,8 @@ if(UNIX AND NOT APPLE)
+@@ -270,6 +270,8 @@ if(BUILD_VIEWER)
   endif()
 endif()
 
@@ -24,5 +24,5 @@ index fb72a00..5732dc8 100644
 option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON)
 if(ENABLE_GNUTLS)
 -- 
-2.7.4
+2.25.1
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch b/meta-oe/recipes-graphics/tigervnc/files/0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
index 5f14665b8..c292df4a5 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
@@ -1,4 +1,4 @@
-From 7f8acd59bb2e54f9be25a98dd71534700a9e355a Mon Sep 17 00:00:00 2001
+From 36bf37cb638cd87d7f8eb96afaf69c2d95177614 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 19 Apr 2021 23:14:28 -0700
 Subject: [PATCH] tigervnc: add fPIC option to COMPILE_FLAGS
@@ -18,35 +18,35 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
 3 files changed, 3 insertions(+)
 diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
-index d00ca452..e84e0290 100644
+index f08eaa31..85c05951 100644
 --- a/common/network/CMakeLists.txt
 +++ b/common/network/CMakeLists.txt
-@@ -16,4 +16,5 @@ endif()
+@@ -15,4 +15,5 @@ endif()
 
 if(UNIX)
   libtool_create_control_file(network)
 +  set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC)
 endif()
 diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
-index 989ba2f4..20f6489d 100644
+index 30c2403a..94e1ff98 100644
 --- a/common/rdr/CMakeLists.txt
 +++ b/common/rdr/CMakeLists.txt
-@@ -27,4 +27,5 @@ target_link_libraries(rdr ${RDR_LIBRARIES})
+@@ -35,4 +35,5 @@ endif()
 
 if(UNIX)
   libtool_create_control_file(rdr)
 +  set_target_properties(rdr PROPERTIES COMPILE_FLAGS -fPIC)
 endif()
 diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
-index fc5a37bf..7f5ce131 100644
+index 360434a9..28566e90 100644
 --- a/common/rfb/CMakeLists.txt
 +++ b/common/rfb/CMakeLists.txt
-@@ -99,4 +99,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES})
+@@ -116,4 +116,5 @@ endif()
 
 if(UNIX)
   libtool_create_control_file(rfb)
 +  set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC)
 endif()
 -- 
-2.30.2
+2.25.1
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.0.bb
index 668ca79dd..c5268fd2b 100644
--- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb
+++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.14.0.bb
@@ -15,21 +15,20 @@ REQUIRED_DISTRO_FEATURES = "x11 pam"
 B = "${S}"
-SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca"
+SRCREV = "4a09a96661624dff14662d6e9849e06a6c70ae03"
-SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch;protocol=https \
+SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.14-branch;protocol=https \
-           file://0002-do-not-build-tests-sub-directory.patch \
+           file://0001-do-not-build-tests-sub-directory.patch \
-           file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
+           file://0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
-           file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
+           file://0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
 "
 # Keep sync with xorg-server in oe-core
 XORG_PN ?= "xorg-server"
-XORG_PV ?= "1.20.6"
+XORG_PV ?= "21.1.13"
-SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg"
+SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.xz;name=xorg"
 XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}"
-SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b"
+SRC_URI[xorg.sha256sum] = "b45a02d5943f72236a360d3cc97e75134aa4f63039ff88c04686b508a3dc740c"
-SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1"
 # It is the directory containing the Xorg source for the
 # machine on which you are building TigerVNC.
@@ -37,16 +36,13 @@ XSERVER_SOURCE_DIR="${S}/unix/xserver"
 do_patch[postfuncs] += "do_patch_xserver"
 do_patch_xserver () {
-    for subdir in Xext xkb GL hw/xquartz/bundle hw/xfree86/common; do
+    subdirs="Xext xkb GL hw/xquartz/bundle hw/xfree86/common man doc"
-        install -d ${XSERVER_SOURCE_DIR}/$subdir
+    for i in ${subdirs}; do
-    done
+        install -d ${XSERVER_SOURCE_DIR}/$i
-    for subdir in hw/dmx/doc man doc hw/dmx/doxygen; do
-        install -d ${XSERVER_SOURCE_DIR}/$subdir
    done
    sources="hw/xquartz/bundle/cpprules.in man/Xserver.man doc/smartsched \
-             hw/dmx/doxygen/doxygen.conf.in xserver.ent.in xkb/README.compiled \
+             xserver.ent.in xkb/README.compiled \
             hw/xfree86/xorgconf.cpp hw/xfree86/Xorg.sh.in"
    for i in ${sources}; do
        install -m 0644 ${XORG_S}/$i ${XSERVER_SOURCE_DIR}/$i;
@@ -57,7 +53,7 @@ do_patch_xserver () {
    xargs tar cf - | (cd ${XSERVER_SOURCE_DIR} && tar xf -)
    cd ${XSERVER_SOURCE_DIR}
-    xserverpatch="${S}/unix/xserver120.patch"
+    xserverpatch="${S}/unix/xserver21.patch"
    echo "Apply $xserverpatch"
    patch -p1 -b --suffix .vnc < $xserverpatch
 }
@@ -127,6 +123,7 @@ do_install:append() {
 FILES:${PN} += " \
    ${libdir}/xorg/modules/extensions \
    ${datadir}/icons \
+    ${datadir}/metainfo \
    ${systemd_unitdir} \
 "
diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb b/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb
index 33e4e0998..ba1fbdbe0 100644
--- a/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb
+++ b/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb
@@ -12,7 +12,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "https://github.com/jordansissel/${BPN}/releases/download/v${PV}/${BP}.tar.gz"
 SRC_URI[sha256sum] = "96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada"
-EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLLIB=${libdir} INSTALLMAN=${mandir}"
+EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLLIB=${libdir} INSTALLMAN=${mandir} WITHOUT_RPATH_FIX=1"
 UPSTREAM_CHECK_URI="https://github.com/jordansissel/xdotool/tags"
 UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+\.\d{8}\.\d+)"
diff --git a/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.7.bb
index e866bed01..9b8c655ac 100644
--- a/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.7.bb
@@ -9,5 +9,5 @@ DEPENDS += "libxkbfile"
 BBCLASSEXTEND = "native"
-SRC_URI[sha256sum] = "99cc9404f7b90289ae04944c0d98a208cc8b158492ad6481386e31d4d09aa7b0"
+SRC_URI[sha256sum] = "1c4f49c030329e0defd8c7bc3739e60f2aa1d2aabe0e2d7e63740ab629aa59cc"
 SRC_URI_EXT = "xz"
diff --git a/meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb b/meta-oe/recipes-graphics/xorg-app/xmag_1.0.8.bb
index f3dac5345..1589f9ae6 100644
--- a/meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xmag_1.0.8.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3413fe6832380b44b69b172d2d1b2387"
 DEPENDS += " libxaw libxt"
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "009936cc5a2706084079127b26cf55c713767650a34cb69e5682d60e33ce7461"
+SRC_URI[sha256sum] = "326d3c583d795bb53ac609d144e7f7fb1499baba7eaec14b8e6cd232ea069532"
diff --git a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.7.bb
index 1be0b5cd7..27138f23f 100644
--- a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.7.bb
@@ -9,4 +9,4 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=31e8892c80b7a0c1c5f37c8e8ae6d794"
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "64048cd15eba3cd9a3d2e3280650391259ebf6b529f2101d1a20f441038c1afe"
+SRC_URI[sha256sum] = "e55cbedab36d7a5f671abf8e594888afc48caa116d51d429ea53ea317ec0c61e"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.1.0.bb
index 34b3e4cde..5ad64eede 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.1.0.bb
@@ -11,7 +11,7 @@ DEPENDS += "virtual/libx11 libpciaccess"
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
 XORG_DRIVER_COMPRESSOR = ".tar.xz"
-SRC_URI[sha256sum] = "27a33b70837965bb4a5f27fd260be085ca5bba837a4e62907f093c2f205603ab"
+SRC_URI[sha256sum] = "7bf85dbf4efa17b7cdd483be8f61cf11fd73d0310514b6ae10d89358de63ab73"
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
 PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri"
diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-oe/recipes-kernel/cpupower/cpupower.bb
index 18e363805..453ebe8c7 100644
--- a/meta-oe/recipes-kernel/cpupower/cpupower.bb
+++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb
@@ -7,7 +7,7 @@ PROVIDES = "virtual/cpupower"
 inherit kernelsrc kernel-arch bash-completion
-do_populate_lic[depends] += "virtual/kernel:do_patch"
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
 EXTRA_OEMAKE = "-C ${S}/tools/power/cpupower O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}"
diff --git a/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.27.bb b/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.29.bb
index 10d7c6ffd..91f026277 100644
--- a/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.27.bb
+++ b/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.29.bb
@@ -6,7 +6,7 @@ LICENSE = " LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7c83d30e99508d6b790eacdd3abab846"
 SRC_URI = "git://github.com/osandov/drgn.git;protocol=https;branch=main"
-SRCREV = "a8dfc9e31f551d4b3c3d4307fa19ab6b3bfafb1c"
+SRCREV = "86b29d041c965030c24e9ab0a6907ff22c2a75fa"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb b/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb
index 23ea0d8aa..3b5866180 100644
--- a/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb
+++ b/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb
@@ -13,7 +13,7 @@ COMPATIBLE_HOST:libc-musl = 'null'
 DEPENDS = "libnl"
-do_populate_lic[depends] += "virtual/kernel:do_patch"
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
 B = "${WORKDIR}/${BPN}-${PV}"
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
index dcd3edaf3..f53150cfa 100644
--- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
@@ -26,6 +26,9 @@ SRC_URI = "git://codeberg.org/ipmitool/ipmitool;protocol=https;branch=master \
           ${IANA_ENTERPRISE_NUMBERS} \
           file://0001-csv-revision-Drop-the-git-revision-info.patch \
           "
+UPSTREAM_CHECK_GITTAGREGEX = "IPMITOOL_(?P<pver>\d+(_\d+)+)"
 IANA_ENTERPRISE_NUMBERS ?= ""
 # Add these via bbappend if this database is needed by the system
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
index 889fe3e22..f83b07dd9 100644
--- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
+++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
@@ -56,7 +56,7 @@ TEST_LIST = "\
 EXTRA_OEMAKE = '\
    CROSS_COMPILE=${TARGET_PREFIX} \
    ARCH=${ARCH} \
-    CC="${CC}" \
+    CC="${CC} ${DEBUG_PREFIX_MAP}" \
    AR="${AR}" \
    LD="${LD}" \
    CLANG="clang -fno-stack-protector -target ${TARGET_ARCH} ${TOOLCHAIN_OPTIONS} -isystem ${S} -D__WORDSIZE=\'64\' -Wno-error=unused-command-line-argument" \
@@ -97,25 +97,13 @@ either install it and add it to HOSTTOOLS, or add clang-native from meta-clang t
    sed -i -e '/mrecord-mcount/d' ${S}/Makefile
    sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile
    sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/scripts/Makefile.*
-    for i in ${TEST_LIST}
+    oe_runmake -C ${S}/tools/testing/selftests TARGETS="${TEST_LIST}"
-    do
-        oe_runmake -C ${S}/tools/testing/selftests/${i}
-    done
 }
 do_install() {
-    for i in ${TEST_LIST}
+    oe_runmake -C ${S}/tools/testing/selftests INSTALL_PATH=${D}/usr/kernel-selftest TARGETS="${TEST_LIST}" install
-    do
-        oe_runmake -C ${S}/tools/testing/selftests/${i} INSTALL_PATH=${D}/usr/kernel-selftest/${i} install
-        # Install kselftest-list.txt that required by kselftest runner.
-        oe_runmake -s --no-print-directory COLLECTION=${i} -C ${S}/tools/testing/selftests/${i} emit_tests \
-            >> ${D}/usr/kernel-selftest/kselftest-list.txt
-    done
-    # Install kselftest runner.
-    install -m 0755 ${S}/tools/testing/selftests/run_kselftest.sh ${D}/usr/kernel-selftest/
-    cp -R --no-dereference --preserve=mode,links -v ${S}/tools/testing/selftests/kselftest ${D}/usr/kernel-selftest/
    if [ -e ${D}/usr/kernel-selftest/bpf/test_offload.py ]; then
-        sed -i -e '1s,#!.*python3,#! /usr/bin/env python3,' ${D}/usr/kernel-selftest/bpf/test_offload.py
+        sed -i -e '1s,#!.*python3,#! /usr/bin/env python3,' ${D}/usr/kernel-selftest/bpf/test_offload.py
    fi
    chown root:root  -R ${D}/usr/kernel-selftest
 }
@@ -161,6 +149,12 @@ RDEPENDS:${PN} += "python3 perl perl-module-io-handle"
 INSANE_SKIP:${PN} += "libdir"
+# A few of the selftests set compile flags that trip up the "ldflags" and
+# "already-stripped" QA checks.  As this is mainly a testing package and
+# not really meant for user level execution, disable these two checks.
+INSANE_SKIP:${PN} += "ldflags"
+INSANE_SKIP:${PN} += "already-stripped"
 SECURITY_CFLAGS = ""
 COMPATIBLE_HOST:libc-musl = 'null'
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
deleted file mode 100644
index 96a996f61..000000000
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 6d16911316cb576db0239f607e60918a222e4436 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Sun, 24 Apr 2022 17:25:33 +0800
-Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
-* Create alias for target such as powerpc as powerpc32
-* Remove hardcode CFLAGS
-* Add CFLAGS_COMMON to instead of CFLAGS so can flexibly
-  customize CFLAGS and not hardcode the CFLAGS as previously
-* Forcibly to link dynamic library as the poky build
-  system doesn't build static library by default
-Upstream-Status: Inappropriate [oe specific]
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-[2021-11-18] Patch updated to use CFLAGS_COMMON for zstd
-Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-Rebase to 1.7.1
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
- Makefile | 40 +++++++++++++++++++++-------------------
- 1 file changed, 21 insertions(+), 19 deletions(-)
-diff --git a/Makefile b/Makefile
-index 71d8548..22acdd5 100644
--- a/Makefile
-+++ b/Makefile
-@@ -8,12 +8,6 @@ ifeq ($(strip $CC),)
- CC     = gcc
- endif
- 
-CFLAGS_BASE := $(CFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
-               -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-CFLAGS      := $(CFLAGS_BASE) -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"'
-CFLAGS_ARCH := $(CFLAGS_BASE)
-# LDFLAGS = -L/usr/local/lib -I/usr/local/include
-
- HOST_ARCH := $(shell uname -m)
- # Use TARGET as the target architecture if specified.
- # Defaults to uname -m
-@@ -24,26 +18,34 @@ endif
- ARCH := $(shell echo ${TARGET}  | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \
-                               -e s/arm.*/arm/ -e s/sa110/arm/ \
-                               -e s/s390x/s390/ -e s/parisc64/parisc/ \
-                              -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/)
-+                              -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \
-+                              -e s/_powerpc_/_powerpc32_/)
- 
- CROSS :=
- ifneq ($(TARGET), $(HOST_ARCH))
- CROSS := -U__$(HOST_ARCH)__
- endif
- 
-CFLAGS += -D__$(ARCH)__ $(CROSS)
- CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS)
- 
-ifeq ($(ARCH), powerpc64)
-CFLAGS += -m64
-+ifeq ($(ARCH), __powerpc64__)
- CFLAGS_ARCH += -m64
- endif
- 
-ifeq ($(ARCH), powerpc32)
-CFLAGS += -m32
-+ifeq ($(ARCH), __powerpc32__)
- CFLAGS_ARCH += -m32
- endif
- 
-+CFLAGS_ARCH += $(CFLAGS) \
-+              -D_FILE_OFFSET_BITS=64 \
-+              -D_LARGEFILE_SOURCE \
-+              -D_LARGEFILE64_SOURCE
-+
-+CFLAGS_COMMON = $(CFLAGS_ARCH) \
-+              -DVERSION='"$(VERSION)"' \
-+              -DRELEASE_DATE='"$(DATE)"'
-+
-+
- SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h
- SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c detect_cycle.c
- OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
-@@ -52,12 +54,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
- 
- LIBS = -ldw -lbz2 -ldl -lelf -lz
- ifneq ($(LINKTYPE), dynamic)
-LIBS := -static $(LIBS) -llzma
-+LIBS := $(LIBS) -llzma
- endif
- 
- ifeq ($(USELZO), on)
- LIBS := -llzo2 $(LIBS)
-CFLAGS += -DUSELZO
-+CFLAGS_COMMON += -DUSELZO
- endif
- 
- ifeq ($(USESNAPPY), on)
-@@ -65,12 +67,12 @@ LIBS := -lsnappy $(LIBS)
- ifneq ($(LINKTYPE), dynamic)
- LIBS := $(LIBS) -lstdc++
- endif
-CFLAGS += -DUSESNAPPY
-+CFLAGS_COMMON += -DUSESNAPPY
- endif
- 
- ifeq ($(USEZSTD), on)
- LIBS := -lzstd $(LIBS)
-CFLAGS += -DUSEZSTD
-+CFLAGS_COMMON += -DUSEZSTD
- endif
- 
- ifeq ($(DEBUG), on)
-@@ -104,14 +106,14 @@ LIBS := $(LIBS) $(call try-run,\
- all: makedumpfile
- 
- $(OBJ_PART): $(SRC_PART)
-       $(CC) $(CFLAGS) -c -o ./$@ $(VPATH)$(@:.o=.c)
-+       $(CC) $(CFLAGS_COMMON) -c -o ./$@ $(VPATH)$(@:.o=.c)
- 
- $(OBJ_ARCH): $(SRC_ARCH)
-        @mkdir -p $(@D)
-        $(CC) $(CFLAGS_ARCH) -c -o ./$@ $(VPATH)$(@:.o=.c)
- 
- makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
-       $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
-+       $(CC) $(CFLAGS_COMMON) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
-        @sed -e "s/@DATE@/$(DATE)/" \
-             -e "s/@VERSION@/$(VERSION)/" \
-             $(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8
-@@ -120,7 +122,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
-             $(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5
- 
- eppic_makedumpfile.so: extension_eppic.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
-+       $(CC) $(CFLAGS_COMMON) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
- 
- clean:
-        rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8 makedumpfile.conf.5
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb
deleted file mode 100644
index 85b44c494..000000000
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY = "VMcore extraction tool"
-DESCRIPTION = "\
-    This program is used to extract a subset of the memory available either \
-    via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \
-    images without extra uneeded information (zero pages, userspace programs, \
-    etc). \
-"
-HOMEPAGE = "https://github.com/makedumpfile/makedumpfile"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-LICENSE = "GPL-2.0-only"
-SRCBRANCH ?= "master"
-SRCREV = "c266469347d49287be38059d45e7aaa454db9cb2"
-DEPENDS = "bzip2 zlib elfutils xz"
-RDEPENDS:${PN}-tools = "perl ${PN}"
-# mips/rv32 would not compile.
-COMPATIBLE_HOST:mipsarcho32 = "null"
-COMPATIBLE_HOST:riscv32 = "null"
-PACKAGES =+ "${PN}-tools"
-FILES:${PN}-tools = "${bindir}/*.pl"
-SRC_URI = "\
-    git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH};protocol=https \
-    file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
-"
-S = "${WORKDIR}/git"
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
-SECTION = "base"
-# If we do not specify TARGET, makedumpfile will build for the host but use the
-# target gcc.
-#
-MAKEDUMPFILE_TARGET ?= "${TARGET_ARCH}"
-MAKEDUMPFILE_TARGET:powerpc = "ppc"
-EXTRA_OEMAKE = "\
-    LINKTYPE=static \
-    TARGET=${MAKEDUMPFILE_TARGET} \
-    ${PACKAGECONFIG_CONFARGS} \
-"
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[lzo] = "USELZO=on,USELZO=off,lzo"
-PACKAGECONFIG[snappy] = "USESNAPPY=on,USESNAPPY=off,snappy"
-PACKAGECONFIG[zstd] = "USEZSTD=on,USEZSTD=off,zstd"
-do_install () {
-    mkdir -p ${D}/usr/bin
-    install -m 755 ${S}/makedumpfile ${D}/usr/bin
-    install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin
-    mkdir -p ${D}/etc/
-    install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample
-}
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
index 56981d96f..e28903d6b 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
@@ -1,4 +1,4 @@
-From 50cea8fd3c07ab27da6edce865a49339f16f3b57 Mon Sep 17 00:00:00 2001
+From 468850b5d39435025633df14dda3d48651d9ec29 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Tue, 18 Jun 2019 17:10:15 +0800
 Subject: [PATCH] Makefile: fix multilib build failure
@@ -6,20 +6,26 @@ Subject: [PATCH] Makefile: fix multilib build failure
 Upstream-Status: Inappropriate [oe specific]
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+Refresh to 5.13
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
- Makefile | 50 +++++++++++++++++++++++++++-----------------------
+ Makefile | 16 ++++++++++------
- 1 file changed, 27 insertions(+), 23 deletions(-)
+ 1 file changed, 10 insertions(+), 6 deletions(-)
 diff --git a/Makefile b/Makefile
-index 8455415..4aa0786 100644
+index 337c53e..58e3779 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,30 +1,34 @@
+@@ -25,6 +25,7 @@ BINDIR ?=     /usr/bin
- # SPDX-License-Identifier: GPL-2.0
+ MANDIR ?=      /usr/share/man
- PREFIX         ?= /usr
+ SHRDIR ?=      /usr/share/pm-graph
- DESTDIR                ?=
+ LIBDIR ?=      /usr/lib
-+BASELIB                ?=
+BASELIB        ?=
 
+ # Toolchain: what tools do we use, and what options do they need:
+ INSTALL = /usr/bin/install
+@@ -33,6 +34,9 @@ INSTALL_DATA  = ${INSTALL} -m 644
 all:
        @echo "Nothing to build"
 
@@ -27,63 +33,34 @@ index 8455415..4aa0786 100644
 +       @echo "Nothing to clean"
 +
 install : uninstall
-       install -d  $(DESTDIR)$(PREFIX)/lib/pm-graph
+        $(INSTALL) -d  $(DESTDIR)$(LIBDIR)/pm-graph
-       install sleepgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph
+        $(INSTALL) sleepgraph.py $(DESTDIR)$(LIBDIR)/pm-graph
-       install bootgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph
+@@ -54,10 +58,10 @@ install : uninstall
-       install -d  $(DESTDIR)$(PREFIX)/lib/pm-graph/config
+        $(INSTALL) -d  $(DESTDIR)$(SHRDIR)
-       install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-       install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-       install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-       install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-       install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-       install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-       install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-       install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-       install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-       install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-       install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-+       install -d  $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
-+       install sleepgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
-+       install bootgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
-+       install -d  $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
 
-        install -d  $(DESTDIR)$(PREFIX)/bin
+        $(INSTALL) -d  $(DESTDIR)$(BINDIR)
-       ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph
+-       ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(BINDIR)/bootgraph
-       ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph
+-       ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(BINDIR)/sleepgraph
-+       ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph
+-       ln -s ../lib/pm-graph/netfix.py $(DESTDIR)$(BINDIR)/netfix
-+       ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph
+-       $(DESTDIR)$(BINDIR)/netfix defconfig > $(DESTDIR)$(SHRDIR)/netfix.cfg
+       ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(BINDIR)/bootgraph
+       ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(BINDIR)/sleepgraph
+       ln -s ../$(BASELIB)/pm-graph/netfix.py $(DESTDIR)$(BINDIR)/netfix
+       #$(DESTDIR)$(BINDIR)/netfix defconfig > $(DESTDIR)$(SHRDIR)/netfix.cfg
 
-        install -d  $(DESTDIR)$(PREFIX)/share/man/man8
+        $(INSTALL) -d  $(DESTDIR)$(MANDIR)/man8
-        install bootgraph.8 $(DESTDIR)$(PREFIX)/share/man/man8
+        $(INSTALL) bootgraph.8 $(DESTDIR)$(MANDIR)/man8
-@@ -37,11 +41,11 @@ uninstall :
+@@ -90,8 +94,8 @@ hwcheck-install :
-        rm -f $(DESTDIR)$(PREFIX)/bin/bootgraph
+        rm -f $(DESTDIR)$(LIBDIR)/pm-graph/hwcheck.py
-        rm -f $(DESTDIR)$(PREFIX)/bin/sleepgraph
+        $(INSTALL) tools/hwcheck.py $(DESTDIR)$(LIBDIR)/pm-graph
+        $(INSTALL) -d  $(DESTDIR)$(BINDIR)
+-       ln -s ../lib/pm-graph/hwcheck.py $(DESTDIR)$(BINDIR)/hwcheck
+-       $(DESTDIR)$(BINDIR)/hwcheck cronon
+       ln -s ../$(BASELIB)/pm-graph/hwcheck.py $(DESTDIR)$(BINDIR)/hwcheck
+       #$(DESTDIR)$(BINDIR)/hwcheck cronon
 
-       rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/config/*
+ hwcheck-uninstall :
-       if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config ] ; then \
+        if [ -e $(DESTDIR)$(BINDIR)/hwcheck ] ; then \
-               rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph/config; \
-+       rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config/*
-+       if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ] ; then \
-+               rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config; \
-        fi;
-       rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/*
-       if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph ] ; then \
-               rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph; \
-+       rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/*
-+       if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ] ; then \
-+               rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph; \
-        fi;
 -- 
-2.17.1
+2.25.1
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch
deleted file mode 100644
index f7f8bc068..000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 47a1db21f6c5d17c94c58c3fe0dcce35c623dbf4 Mon Sep 17 00:00:00 2001
-From: Liwei Song <liwei.song@windriver.com>
-Date: Tue, 23 Jun 2020 04:47:20 +0000
-Subject: [PATCH] sleepgraph: add support for RT kernel ftrace flags
-with PREEMPT_RT enabled in kernel, ftrace have a different
-flags format:
-                   _-----=> irqs-off
-                  / _----=> need-resched
-                 | / _----=> need-resched
-                 || / _---=> hardirq/softirq
-                 ||| / _--=> preempt-depth
-                 ||||/     delay
-TASK-PID   CPU#  |||||   TIMESTAMP  FUNCTION
-   | |       |   |||||      |         |
-add support for this.
-Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/18]
-Signed-off-by: Liwei Song <liwei.song@windriver.com>
---
- sleepgraph.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/sleepgraph.py b/sleepgraph.py
-index cfed8e09e0e6..561f165cf9be 100755
--- a/sleepgraph.py
-+++ b/sleepgraph.py
-@@ -2689,7 +2689,7 @@ class TestProps:
-                '[ +!#\*@$]*(?P<dur>[0-9\.]*) .*\|  (?P<msg>.*)'
-        ftrace_line_fmt_nop = \
-                ' *(?P<proc>.*)-(?P<pid>[0-9]*) *\[(?P<cpu>[0-9]*)\] *'+\
-               '(?P<flags>.{4}) *(?P<time>[0-9\.]*): *'+\
-+               '(?P<flags>.{4,7}) *(?P<time>[0-9\.]*): *'+\
-                '(?P<msg>.*)'
-        def __init__(self):
-                self.stamp = ''
-- 
-2.24.1
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
deleted file mode 100644
index fc5991d46..000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 9bbc991a927722439cad38c892fc9f57207089d3 Mon Sep 17 00:00:00 2001
-From: Liwei Song <liwei.song@windriver.com>
-Date: Mon, 24 May 2021 08:27:28 +0000
-Subject: [PATCH] sleepgraph.py: parse unfished cpu exec line
-exist the below case in ftrace file:
-sleepgraph-6508    [003] .... 18197.824037: tracing_mark_write: ps - xxx..., lock_torture_wr-94 169,lock_torture_wr-95 143,lock_tort
-sleepgraph-6508    [003] .... 18197.824043: tracing_mark_write: ure_wr-96 189,lock_torture_wr-97 174,lock_torture_wr-98 160,lock_torture_st-99 1
-lock_torture_wr-96 was split to different line due to limited buffer
-size(1k) set in kernel, check this case and re-parse the unfinished
-line.
-Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/20]
-Signed-off-by: Liwei Song <liwei.song@windriver.com>
---
- sleepgraph.py | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-diff --git a/sleepgraph.py b/sleepgraph.py
-index e340d5b3f03b..38b4439db8eb 100755
--- a/sleepgraph.py
-+++ b/sleepgraph.py
-@@ -3365,8 +3365,21 @@ def parseTraceLog(live=False):
-                                        val = ps.split()
-                                        if not val:
-                                                continue
-                                       name = val[0].replace('--', '-')
-                                       proclist[name] = int(val[1])
-+                                       if not len(val) < 2:
-+                                               name = val[0].replace('--', '-')
-+                                               proclist[name] = int(val[1])
-+                                       else:
-+                                               proclist = dict()
-+                                               nextline = next(tf)
-+                                               mcont = re.match(tp.ftrace_line_fmt, nextline)
-+                                               n = m.group('ps') + mcont.group('msg').split(': ')[1]
-+                                               for pscont in n.split(','):
-+                                                       val = pscont.split()
-+                                                       if not val:
-+                                                               continue
-+                                                       if not len(val) < 2:
-+                                                               name = val[0].replace('--', '-')
-+                                                               proclist[name] = int(val[1])
-                                data.pstl[t.time] = proclist
-                                continue
-                # find the end of resume
-- 
-2.29.2
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch
deleted file mode 100644
index 25c87093f..000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 22ce65d997f99606a3bb9d2a660ead42eecc234a Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 11 Sep 2019 11:31:07 +0800
-Subject: [PATCH] sleepgraph.py: use python3
-Already compatible with Python 3.
-Same goes for bootgraph.py
-Upstream-Status: Inappropriate [oe specific]
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- bootgraph.py  | 2 +-
- sleepgraph.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/bootgraph.py b/bootgraph.py
-index d3b99a1..efb5714 100755
--- a/bootgraph.py
-+++ b/bootgraph.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/python
-+#!/usr/bin/python3
- # SPDX-License-Identifier: GPL-2.0-only
- #
- # Tool for analyzing boot timing
-diff --git a/sleepgraph.py b/sleepgraph.py
-index 1794c79..cfed8e0 100755
--- a/sleepgraph.py
-+++ b/sleepgraph.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/python
-+#!/usr/bin/python3
- # SPDX-License-Identifier: GPL-2.0-only
- #
- # Tool for analyzing suspend/resume timing
-- 
-2.17.1
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.13.bb
index 6e52a58de..88c70ae82 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.13.bb
@@ -5,12 +5,9 @@ HOMEPAGE = "https://01.org/pm-graph"
 LICENSE  = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
-SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6"
+SRCREV = "0987732b013936ad771334f51cba31c453c8a9c9"
 SRC_URI = "git://github.com/intel/pm-graph.git;branch=master;protocol=https \
           file://0001-Makefile-fix-multilib-build-failure.patch \
-           file://0001-sleepgraph.py-use-python3.patch \
-           file://0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch \
-           file://0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch \
 "
 S = "${WORKDIR}/git"
@@ -23,11 +20,13 @@ S = "${WORKDIR}/git"
 #   - CONFIG_FUNCTION_GRAPH_TRACER=y
 COMPATIBLE_HOST='(i.86|x86_64).*'
-EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}"
+EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} LIBDIR=${libdir} BASELIB=${baselib}"
 do_install() {
-        oe_runmake install
+    oe_runmake install
-        install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py
+    install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py
+    rm -rf ${D}${libdir}/pm-graph/__pycache__
 }
 RDEPENDS:${PN} += "python3-core python3-threading python3-datetime python3-compression"
diff --git a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb
index 2e8c5cbb8..7b87dd28d 100644
--- a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb
+++ b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb
@@ -6,7 +6,7 @@ PROVIDES = "virtual/spidev-test"
 inherit bash-completion kernelsrc kernel-arch
-do_populate_lic[depends] += "virtual/kernel:do_patch"
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
 EXTRA_OEMAKE = "-C ${S}/tools/spi O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}"
diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb
index b68e67a8c..15f324ff4 100644
--- a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb
+++ b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb
@@ -1,22 +1,22 @@
 SUMMARY ="Reusable library for GPU-accelerated video/image rendering primitives"
-LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0 & MIT"
+LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://3rdparty/Vulkan-Headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da"
-                    file://3rdparty/fast_float/LICENSE-APACHE;md5=81db248e90379bcfc0582b578b009bc3 \
-                    file://3rdparty/fast_float/LICENSE-BOOST;md5=2c7a3fa82e66676005cd4ee2608fd7d2 \
-                    file://3rdparty/fast_float/LICENSE-MIT;md5=32b11d50c7d9788d4270f6a83f3e68eb \
-                    file://3rdparty/glad/LICENSE;md5=ae570f26774ac096cff8f992091a223c \
-                    file://3rdparty/jinja/LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462 \
-                    file://3rdparty/jinja/docs/license.rst;md5=5f4c795946979fabc2361be4c70d0a9f \
-                    file://3rdparty/markupsafe/LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75 \
-                    file://3rdparty/markupsafe/docs/license.rst;md5=5f4c795946979fabc2361be4c70d0a9f \
-                    file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da \
-                    file://demos/3rdparty/nuklear/src/LICENSE;md5=6052431ae6cd4f0082276c54996e7770 \
-                    file://demos/LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032"
-SRC_URI = "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master"
+DEPENDS += "fastfloat glad-native python3-mako-native python3-jinja2-native vulkan-headers"
+SRC_URI = "git://code.videolan.org/videolan/libplacebo.git;protocol=https;branch=v7.349"
 SRCREV = "1fd3c7bde7b943fe8985c893310b5269a09b46c5"
 inherit meson pkgconfig
 S = "${WORKDIR}/git"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'vulkan opengl', d)} lcms"
+PACKAGECONFIG[vulkan] =  "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader shaderc spirv-shader-generator"
+PACKAGECONFIG[glslang] = "-Dglslang=enabled,-Dglslang=disabled,glslang"
+PACKAGECONFIG[opengl] = "-Dopengl=enabled,-Dopengl=disabled"
+PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms"
+PACKAGECONFIG[demos] = "-Ddemos=true,-Ddemos=false,ffmpeg libsdl2 libsdl2-image"
+EXTRA_OEMESON = "-Dvulkan-registry=${STAGING_DATADIR}/vulkan/registry/vk.xml"
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch b/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch
deleted file mode 100644
index b96ec5d4c..000000000
--- a/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9878681df9919d28da3e4c6cc706e264abd9df92 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 29 Aug 2024 17:54:15 -0700
-Subject: [PATCH] file2string: Avoid emitting absolute filepaths into generated
- sources
-These sources are bundled into src packages to be distributed and leaking
-buildpaths results in violating reproducibility norms.
-Upstream-Status: Submitted [https://github.com/mpv-player/mpv/pull/14763]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- TOOLS/file2string.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/TOOLS/file2string.py b/TOOLS/file2string.py
-index 5b1c4a95d1..39c1122a35 100755
--- a/TOOLS/file2string.py
-+++ b/TOOLS/file2string.py
-@@ -22,10 +22,10 @@
- # License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
- #
- 
-import sys
-+import os, sys
- 
- def file2string(infilename, infile, outfile):
-    outfile.write("// Generated from %s\n\n" % infilename)
-+    outfile.write("// Generated from %s\n\n" % os.path.basename(infilename))
- 
-     conv = ["\\%03o" % c for c in range(256)]
-     safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/a7efb3e62bbd0af86737f5ecb72d3a8e2a8c3b54.patch b/meta-oe/recipes-multimedia/mplayer/mpv/a7efb3e62bbd0af86737f5ecb72d3a8e2a8c3b54.patch
new file mode 100644
index 000000000..b8fad22c7
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/mpv/a7efb3e62bbd0af86737f5ecb72d3a8e2a8c3b54.patch
@@ -0,0 +1,87 @@
+From a7efb3e62bbd0af86737f5ecb72d3a8e2a8c3b54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
+Date: Sun, 13 Oct 2024 19:18:11 +0200
+Subject: [PATCH] build: fix dynamic generation of mpv.desktop file protocols
+Running cross-compiled binaries may be possible, but the runtime
+environment must be configured correctly. In some configurations, an
+exe_wrapper needs to be used, and in all cases, the library path must be
+set correctly for the given binary. Fortunately, Meson handles all of
+this if cross-compilation is configured correctly.
+Fix this by having Meson run the mpv binary directly, instead of as a
+subprocess of a Python script. This ensures that the environment is
+properly set for running host binaries, if possible.
+Fixes: #15075
+Fixes: 056b03f9ed05607786427da8f336e3ef819b3a1e
+Upstream-Status: Submitted [https://github.com/mpv-player/mpv/pull/15075]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ TOOLS/gen-mpv-desktop.py | 17 +++++++----------
+ meson.build              |  9 +++++++--
+ 2 files changed, 14 insertions(+), 12 deletions(-)
+diff --git a/TOOLS/gen-mpv-desktop.py b/TOOLS/gen-mpv-desktop.py
+index 7bbb33e5be..2c45a7038e 100755
+--- a/TOOLS/gen-mpv-desktop.py
+++ b/TOOLS/gen-mpv-desktop.py
+@@ -21,23 +21,28 @@
+ #
+ 
+ import sys
+-from subprocess import check_output
+ 
+ if __name__ == "__main__":
+-    with open(sys.argv[1], "r", encoding="UTF-8") as f:
+    with open(sys.argv[1], encoding="UTF-8") as f:
+         next(f)
+         mpv_desktop = dict([line.split("=", 1) for line in f])
+ 
+     if not mpv_desktop["X-KDE-Protocols"]:
+         raise ValueError("Missing X-KDE-Protocols entry in mpv.desktop file")
+ 
+-    mpv_protocols = check_output([sys.argv[2], "--no-config", "--list-protocols"], encoding="UTF-8")
+-    mpv_protocols = set(line.strip(" :/") for line in mpv_protocols.splitlines() if "://" in line)
+    with open(sys.argv[2], encoding="UTF-8") as mpv_protocols:
+        mpv_protocols = {
+            line.strip(" :/")
+            for line in mpv_protocols.read().splitlines()
+            if "://" in line
+        }
+
+     if len(mpv_protocols) == 0:
+         raise ValueError("Unable to parse any protocols from mpv '--list-protocols'")
+ 
+     protocol_list = set(mpv_desktop["X-KDE-Protocols"].strip().split(","))
+-    mpv_desktop["X-KDE-Protocols"] = ",".join(sorted(mpv_protocols & protocol_list)) + "\n"
+    compatible_protocols = sorted(mpv_protocols & protocol_list)
+    mpv_desktop["X-KDE-Protocols"] = ",".join(compatible_protocols) + "\n"
+ 
+     with open(sys.argv[3], "w", encoding="UTF-8") as f:
+         f.write("[Desktop Entry]" + "\n")
+diff --git a/meson.build b/meson.build
+index b7bcb1b0ba..c2004b748c 100644
+--- a/meson.build
+++ b/meson.build
+@@ -1830,11 +1830,16 @@ if get_option('cplayer')
+ 
+     if not win32 and not darwin
+         if meson.can_run_host_binaries()
+            mpv_protocols = custom_target('mpv_protocols',
+                output: 'mpv_protocols',
+                command: [mpv, '--no-config','--list-protocols'],
+                capture: true,
+            )
+             mpv_desktop_path = join_paths(source_root, 'etc', 'mpv.desktop')
+             custom_target('mpv.desktop',
+-                depends: mpv,
+                input: mpv_protocols,
+                 output: 'mpv.desktop',
+-                command: [mpv_desktop, mpv_desktop_path, mpv.full_path(), '@OUTPUT@'],
+               command: [mpv_desktop, mpv_desktop_path, '@INPUT@', '@OUTPUT@'],
+                 install: true,
+                 install_dir: join_paths(datadir, 'applications'),
+             )
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb
index 80e0f7ca7..c699e73ef 100644
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb
@@ -15,11 +15,11 @@ DEPENDS = " \
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRCREV_mpv = "02254b92dd237f03aa0a151c2a68778c4ea848f9"
+SRCREV = "a0fba7be57f3822d967b04f0f6b6d6341e7516e7"
-SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.38;protocol=https \
+SRC_URI = " \
-           file://0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch \
+        git://github.com/mpv-player/mpv;name=mpv;branch=release/0.39;protocol=https \
-           "
+        file://a7efb3e62bbd0af86737f5ecb72d3a8e2a8c3b54.patch \
+"
 S = "${WORKDIR}/git"
 inherit meson pkgconfig mime-xdg
@@ -37,22 +37,27 @@ LUA:powerpc  = ""
 # Note: lua is required to get on-screen-display (controls)
 PACKAGECONFIG ??= " \
    ${LUA} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland opengl pipewire pulseaudio vulkan', d)} \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'egl', '', d)} \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'drm gbm', '', d)} \
 "
 PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext"
 PACKAGECONFIG[xv] = "-Dxv=enabled,-Dxv=disabled,libxv"
 PACKAGECONFIG[opengl] = "-Dgl=enabled,-Dgl=disabled,virtual/libgl"
-PACKAGECONFIG[egl] = "-Degl=enabled,-Degl-disabled,virtual/egl"
+PACKAGECONFIG[egl] = "-Degl=enabled,-Degl=disabled,virtual/egl"
 PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm"
 PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm"
-PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,lua luajit"
+PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,luajit"
 PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive"
+PACKAGECONFIG[lcms2] = "-Dlcms2=enabled,-Dlcms2=disabled,lcms"
+PACKAGECONFIG[libmpv] = "-Dlibmpv=true,-Dlibmpv=false"
 PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack"
+PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
+PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
 PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva"
-PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau"
+PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-headers"
+PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau nv-codec-headers"
 PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon"
 python __anonymous() {
@@ -68,40 +73,32 @@ python __anonymous() {
        extras.append(" -Dvaapi-x11=enabled")
    if "vaapi" in packageconfig and "drm" in packageconfig:
        extras.append(" -Dvaapi-drm=enabled")
-    if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig:
-        extras.append(" -Dvaapi-x-egl=enabled")
    if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig:
        extras.append(" -Dvdpau-gl-x11=enabled")
    if "wayland" in packageconfig and "opengl" in packageconfig:
-        extras.append(" -Dgl-wayland=enabled")
+        extras.append(" -Degl-wayland=enabled")
    if "wayland" in packageconfig and "vaapi" in packageconfig:
        extras.append(" -Dvaapi-wayland=enabled")
    if extras:
-        d.appendVar("EXTRA_OECONF", "".join(extras))
+        d.appendVar("EXTRA_OEMESON", "".join(extras))
 }
 #SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}"
-EXTRA_OECONF = " \
+EXTRA_OEMESON = " \
    -Dmanpage-build=disabled \
    -Dlibbluray=disabled \
    -Ddvdnav=disabled \
    -Dcdda=disabled \
    -Duchardet=disabled \
    -Drubberband=disabled \
-    -Dlcms2=disabled \
    -Dvapoursynth=disabled \
-    ${PACKAGECONFIG_CONFARGS} \
+    -Dshaderc=disabled \
 "
 do_configure:append() {
    sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h
 }
-FILES:${PN} += " \
+FILES:${PN} += "${datadir}"
-    ${datadir}/icons \
-    ${datadir}/zsh \
-    ${datadir}/bash-completion \
-    ${datadir}/metainfo \
-    "
 EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}"
diff --git a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
index 87320a98e..508519e4f 100644
--- a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
+++ b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
@@ -11,6 +11,6 @@ inherit autotools gettext
 DEPENDS += "glib-2.0-native"
-SRC_URI = "http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2"
+SRC_URI = "https://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62"
 SRC_URI[sha256sum] = "cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb
index f893ac359..e3b2f8bf6 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb
@@ -27,6 +27,7 @@ CLEANBROKEN = "1"
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} usb"
 PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez5"
 PACKAGECONFIG[qt] = "qt='yes' qt_versioned=5,qt='no',qtbase"
+PACKAGECONFIG[pyserial] = ""
 PACKAGECONFIG[usb] = "usb='true',usb='false',libusb1"
 EXTRA_OESCONS = " \
    sysroot=${STAGING_DIR_TARGET} \
@@ -147,7 +148,7 @@ FILES:python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}
 RDEPENDS:python3-pygps = " \
    python3-core \
    python3-io \
-    python3-pyserial \
+    ${@bb.utils.contains('PACKAGECONFIG', 'pyserial', 'python3-pyserial', '', d)} \
    python3-threading \
    python3-terminal \
    gpsd \
diff --git a/meta-oe/recipes-security/audit/audit_4.0.2.bb b/meta-oe/recipes-security/audit/audit_4.0.2.bb
index d6742c9eb..4f1507923 100644
--- a/meta-oe/recipes-security/audit/audit_4.0.2.bb
+++ b/meta-oe/recipes-security/audit/audit_4.0.2.bb
@@ -93,9 +93,17 @@ do_install:append() {
    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
        install -D -m 0755 ${UNPACKDIR}/auditd ${D}/etc/init.d/auditd
+    fi
+    if ! ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
        rm -rf ${D}${libdir}/systemd
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${B}/init.d/auditd.service      ${D}${systemd_unitdir}/system/
+        install -m 0644 ${B}/init.d/audit-rules.service ${D}${systemd_unitdir}/system/
    fi
    # Create /var/spool/audit directory for audisp-remote
    install -d -m 0700 ${D}${localstatedir}/spool/audit
 }
+CVE_PRODUCT = "linux:audit"
diff --git a/meta-oe/recipes-security/nmap/files/0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch b/meta-oe/recipes-security/nmap/files/0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch
new file mode 100644
index 000000000..bcb04250b
--- /dev/null
+++ b/meta-oe/recipes-security/nmap/files/0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch
@@ -0,0 +1,165 @@
+From 364d089250d1acf459e9e8580161e7bb06268106 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@fujitsu.com>
+Date: Tue, 15 Oct 2024 02:47:38 +0000
+Subject: [PATCH] Fix off-by-one overflow in the IP protocol table.
+Fixes #2896, closes #2897, closes #2900
+Upstream-Status: Backport [https://github.com/nmap/nmap/commit/efa0dc36f2ecade6ba8d2ed25dd4d5fbffdea308]
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+---
+ CHANGELOG     |  3 +++
+ portlist.cc   |  8 ++++----
+ protocols.cc  |  6 +++---
+ protocols.h   |  2 ++
+ scan_lists.cc | 10 +++++-----
+ 5 files changed, 17 insertions(+), 12 deletions(-)
+diff --git a/CHANGELOG b/CHANGELOG
+index f01262c..5b204bd 100644
+--- a/CHANGELOG
+++ b/CHANGELOG
+@@ -1,5 +1,8 @@
+ #Nmap Changelog ($Id: CHANGELOG 38849 2024-04-18 17:16:42Z dmiller $); -*-text-*-
+ 
+o [GH#2900, GH#2896, GH#2897] Nmap is now able to scan IP protocol 255.
+  [nnposter]
+
+ Nmap 7.95 [2024-04-19]
+ 
+ o [Windows] Upgraded Npcap (our Windows raw packet capturing and
+diff --git a/portlist.cc b/portlist.cc
+index 8258853..cd08437 100644
+--- a/portlist.cc
+++ b/portlist.cc
+@@ -480,7 +480,7 @@ void PortList::setPortState(u16 portno, u8 protocol, int state, int *oldstate) {
+       state != PORT_CLOSEDFILTERED)
+     fatal("%s: attempt to add port number %d with illegal state %d\n", __func__, portno, state);
+ 
+-  assert(protocol!=IPPROTO_IP || portno<256);
+  assert(protocol!=IPPROTO_IP || portno<=MAX_IPPROTONUM);
+ 
+   bool created = false;
+   current = createPort(portno, protocol, &created);
+@@ -566,7 +566,7 @@ Port *PortList::nextPort(const Port *cur, Port *next,
+   if (cur) {
+     proto = INPROTO2PORTLISTPROTO(cur->proto);
+     assert(port_map[proto]!=NULL); // Hmm, it's not possible to handle port that doesn't have anything in map
+-    assert(cur->proto!=IPPROTO_IP || cur->portno<256);
+    assert(cur->proto!=IPPROTO_IP || cur->portno<=MAX_IPPROTONUM);
+     mapped_pno = port_map[proto][cur->portno];
+     mapped_pno++; //  we're interested in next port after current
+   } else { // running for the first time
+@@ -615,7 +615,7 @@ void PortList::mapPort(u16 *portno, u8 *protocol) const {
+   mapped_protocol = INPROTO2PORTLISTPROTO(*protocol);
+ 
+   if (*protocol == IPPROTO_IP)
+-    assert(*portno < 256);
+    assert(*portno <= MAX_IPPROTONUM);
+   if(port_map[mapped_protocol]==NULL || port_list[mapped_protocol]==NULL) {
+     fatal("%s(%i,%i): you're trying to access uninitialized protocol", __func__, *portno, *protocol);
+   }
+@@ -713,7 +713,7 @@ int PortList::port_list_count[PORTLIST_PROTO_MAX];
+  * should be sorted. */
+ void PortList::initializePortMap(int protocol, u16 *ports, int portcount) {
+   int i;
+-  int ports_max = (protocol == IPPROTO_IP) ? 256 : 65536;
+  int ports_max = (protocol == IPPROTO_IP) ? MAX_IPPROTONUM + 1 : 65536;
+   int proto = INPROTO2PORTLISTPROTO(protocol);
+ 
+   if (port_map[proto] != NULL || port_map_rev[proto] != NULL)
+diff --git a/protocols.cc b/protocols.cc
+index 76e42c7..85e55e4 100644
+--- a/protocols.cc
+++ b/protocols.cc
+@@ -79,7 +79,7 @@ struct strcmp_comparator {
+ 
+ // IP Protocol number is 8 bits wide
+ // protocol_table[IPPROTO_TCP] == {"tcp", 6}
+-static struct nprotoent *protocol_table[UCHAR_MAX];
+static struct nprotoent *protocol_table[MAX_IPPROTONUM + 1];
+ // proto_map["tcp"] = {"tcp", 6}
+ typedef std::map<const char *, struct nprotoent, strcmp_comparator> ProtoMap;
+ static ProtoMap proto_map;
+@@ -119,7 +119,7 @@ static int nmap_protocols_init() {
+     if (*p == '#' || *p == '\0')
+       continue;
+     res = sscanf(line, "%127s %hu", protocolname, &protno);
+-    if (res !=2 || protno > UCHAR_MAX) {
+    if (res !=2 || protno > MAX_IPPROTONUM) {
+       error("Parse error in protocols file %s line %d", filename, lineno);
+       continue;
+     }
+@@ -191,7 +191,7 @@ const struct nprotoent *nmap_getprotbynum(int num) {
+   if (nmap_protocols_init() == -1)
+     return NULL;
+ 
+-  assert(num >= 0 && num < UCHAR_MAX);
+  assert(num >= 0 && num <= MAX_IPPROTONUM);
+   return protocol_table[num];
+ }
+ 
+diff --git a/protocols.h b/protocols.h
+index 8934284..2de0aa4 100644
+--- a/protocols.h
+++ b/protocols.h
+@@ -79,6 +79,8 @@ int addprotocolsfromservmask(char *mask, u8 *porttbl);
+ const struct nprotoent *nmap_getprotbynum(int num);
+ const struct nprotoent *nmap_getprotbyname(const char *name);
+ 
+#define MAX_IPPROTONUM 255
+
+ #define MAX_IPPROTOSTRLEN 4
+ #define IPPROTO2STR(p)         \
+   ((p)==IPPROTO_TCP ? "tcp" :  \
+diff --git a/scan_lists.cc b/scan_lists.cc
+index f02e279..ebe1357 100644
+--- a/scan_lists.cc
+++ b/scan_lists.cc
+@@ -165,7 +165,7 @@ void getpts(const char *origexpr, struct scan_lists *ports) {
+       ports->udp_count++;
+     if (porttbl[i] & SCAN_SCTP_PORT)
+       ports->sctp_count++;
+-    if (porttbl[i] & SCAN_PROTOCOLS && i < 256)
+    if (porttbl[i] & SCAN_PROTOCOLS && i <= MAX_IPPROTONUM)
+       ports->prot_count++;
+   }
+ 
+@@ -192,7 +192,7 @@ void getpts(const char *origexpr, struct scan_lists *ports) {
+       ports->udp_ports[udpi++] = i;
+     if (porttbl[i] & SCAN_SCTP_PORT)
+       ports->sctp_ports[sctpi++] = i;
+-    if (porttbl[i] & SCAN_PROTOCOLS && i < 256)
+    if (porttbl[i] & SCAN_PROTOCOLS && i <= MAX_IPPROTONUM)
+       ports->prots[proti++] = i;
+   }
+ 
+@@ -388,7 +388,7 @@ static void getpts_aux(const char *origexpr, int nested, u8 *porttbl, int range_
+     } else if (isdigit((int) (unsigned char) *current_range)) {
+       rangestart = strtol(current_range, &endptr, 10);
+       if (range_type & SCAN_PROTOCOLS) {
+-        if (rangestart < 0 || rangestart > 255)
+        if (rangestart < 0 || rangestart > MAX_IPPROTONUM)
+           fatal("Protocols specified must be between 0 and 255 inclusive");
+       } else {
+         if (rangestart < 0 || rangestart > 65535)
+@@ -429,13 +429,13 @@ static void getpts_aux(const char *origexpr, int nested, u8 *porttbl, int range_
+       if (!*current_range || *current_range == ',' || *current_range == ']') {
+         /* Ended with a -, meaning up until the last possible port */
+         if (range_type & SCAN_PROTOCOLS)
+-          rangeend = 255;
+          rangeend = MAX_IPPROTONUM;
+         else
+           rangeend = 65535;
+       } else if (isdigit((int) (unsigned char) *current_range)) {
+         rangeend = strtol(current_range, &endptr, 10);
+         if (range_type & SCAN_PROTOCOLS) {
+-          if (rangeend < 0 || rangeend > 255)
+          if (rangeend < 0 || rangeend > MAX_IPPROTONUM)
+             fatal("Protocols specified must be between 0 and 255 inclusive");
+         } else {
+           if (rangeend < 0 || rangeend > 65535)
+-- 
+2.34.1
diff --git a/meta-oe/recipes-security/nmap/nmap_7.95.bb b/meta-oe/recipes-security/nmap/nmap_7.95.bb
index 79c28e71f..a319be4fb 100644
--- a/meta-oe/recipes-security/nmap/nmap_7.95.bb
+++ b/meta-oe/recipes-security/nmap/nmap_7.95.bb
@@ -10,6 +10,7 @@ SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \
           file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \
           file://0001-Include-time.h-header-to-pass-clang-compilation.patch \
           file://0002-Fix-building-with-libc.patch \
+           file://0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch \
           "
 SRC_URI[sha256sum] = "e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778" 
 inherit autotools-brokensep pkgconfig python3native
diff --git a/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch b/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch
new file mode 100644
index 000000000..6e61aeac3
--- /dev/null
+++ b/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch
@@ -0,0 +1,672 @@
+From 41968e7b742ad59046523a7eeb63514237fb63af Mon Sep 17 00:00:00 2001
+From: Neil Horman <nhorman@openssl.org>
+Date: Fri, 27 Oct 2023 14:57:37 -0400
+Subject: [PATCH] Prevent accessing of global c++ objects once they are deleted
+Fixes (Maybe) #729.
+Reset objects_deleted after reset is called.
+Upstream-Status: Submitted [https://github.com/opendnssec/SoftHSMv2/pull/742]
+---
+ src/lib/SoftHSM.cpp |   5 ++
+ src/lib/main.cpp    | 138 ++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 143 insertions(+)
+diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
+index 02c0f95..95bf208 100644
+--- a/src/lib/SoftHSM.cpp
+++ b/src/lib/SoftHSM.cpp
+@@ -89,6 +89,8 @@
+ 
+ // Initialise the one-and-only instance
+ 
+int objects_deleted = 0;
+
+ #ifdef HAVE_CXX11
+ 
+ std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
+@@ -406,6 +408,8 @@ void SoftHSM::reset()
+ {
+        if (instance.get())
+                instance.reset();
+
+       objects_deleted = 0;
+ }
+ 
+ // Constructor
+@@ -445,6 +449,7 @@ SoftHSM::~SoftHSM()
+ 
+        isInitialised = false;
+ 
+       objects_deleted = 1;
+        resetMutexFactoryCallbacks();
+ }
+ 
+diff --git a/src/lib/main.cpp b/src/lib/main.cpp
+index 2dfd0eb..e89f18c 100644
+--- a/src/lib/main.cpp
+++ b/src/lib/main.cpp
+@@ -49,6 +49,8 @@
+ #define PKCS_API
+ #endif
+ 
+extern int objects_deleted;
+
+ // PKCS #11 function list
+ static CK_FUNCTION_LIST functionList =
+ {
+@@ -130,6 +132,8 @@ PKCS_API CK_RV C_Initialize(CK_VOID_PTR pInitArgs)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Initialize(pInitArgs);
+        }
+        catch (...)
+@@ -145,6 +149,8 @@ PKCS_API CK_RV C_Finalize(CK_VOID_PTR pReserved)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Finalize(pReserved);
+        }
+        catch (...)
+@@ -160,6 +166,8 @@ PKCS_API CK_RV C_GetInfo(CK_INFO_PTR pInfo)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetInfo(pInfo);
+        }
+        catch (...)
+@@ -175,6 +183,8 @@ PKCS_API CK_RV C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                if (ppFunctionList == NULL_PTR) return CKR_ARGUMENTS_BAD;
+ 
+                *ppFunctionList = &functionList;
+@@ -194,6 +204,8 @@ PKCS_API CK_RV C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetSlotList(tokenPresent, pSlotList, pulCount);
+        }
+        catch (...)
+@@ -209,6 +221,8 @@ PKCS_API CK_RV C_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetSlotInfo(slotID, pInfo);
+        }
+        catch (...)
+@@ -224,6 +238,8 @@ PKCS_API CK_RV C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetTokenInfo(slotID, pInfo);
+        }
+        catch (...)
+@@ -239,6 +255,8 @@ PKCS_API CK_RV C_GetMechanismList(CK_SLOT_ID slotID, CK_MECHANISM_TYPE_PTR pMech
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetMechanismList(slotID, pMechanismList, pulCount);
+        }
+        catch (...)
+@@ -254,6 +272,8 @@ PKCS_API CK_RV C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, CK_
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetMechanismInfo(slotID, type, pInfo);
+        }
+        catch (...)
+@@ -269,6 +289,8 @@ PKCS_API CK_RV C_InitToken(CK_SLOT_ID slotID, CK_UTF8CHAR_PTR pPin, CK_ULONG ulP
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_InitToken(slotID, pPin, ulPinLen, pLabel);
+        }
+        catch (...)
+@@ -284,6 +306,8 @@ PKCS_API CK_RV C_InitPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pPin, CK_UL
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_InitPIN(hSession, pPin, ulPinLen);
+        }
+        catch (...)
+@@ -299,6 +323,8 @@ PKCS_API CK_RV C_SetPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pOldPin, CK_
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SetPIN(hSession, pOldPin, ulOldLen, pNewPin, ulNewLen);
+        }
+        catch (...)
+@@ -314,6 +340,8 @@ PKCS_API CK_RV C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApp
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_OpenSession(slotID, flags, pApplication, notify, phSession);
+        }
+        catch (...)
+@@ -329,6 +357,8 @@ PKCS_API CK_RV C_CloseSession(CK_SESSION_HANDLE hSession)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_CloseSession(hSession);
+        }
+        catch (...)
+@@ -344,6 +374,8 @@ PKCS_API CK_RV C_CloseAllSessions(CK_SLOT_ID slotID)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_CloseAllSessions(slotID);
+        }
+        catch (...)
+@@ -359,6 +391,8 @@ PKCS_API CK_RV C_GetSessionInfo(CK_SESSION_HANDLE hSession, CK_SESSION_INFO_PTR
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetSessionInfo(hSession, pInfo);
+        }
+        catch (...)
+@@ -374,6 +408,8 @@ PKCS_API CK_RV C_GetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetOperationState(hSession, pOperationState, pulOperationStateLen);
+        }
+        catch (...)
+@@ -389,6 +425,8 @@ PKCS_API CK_RV C_SetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SetOperationState(hSession, pOperationState, ulOperationStateLen, hEncryptionKey, hAuthenticationKey);
+        }
+        catch (...)
+@@ -404,6 +442,8 @@ PKCS_API CK_RV C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, CK_UTF
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Login(hSession, userType, pPin, ulPinLen);
+        }
+        catch (...)
+@@ -419,6 +459,8 @@ PKCS_API CK_RV C_Logout(CK_SESSION_HANDLE hSession)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Logout(hSession);
+        }
+        catch (...)
+@@ -434,6 +476,8 @@ PKCS_API CK_RV C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemp
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_CreateObject(hSession, pTemplate, ulCount, phObject);
+        }
+        catch (...)
+@@ -449,6 +493,8 @@ PKCS_API CK_RV C_CopyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_CopyObject(hSession, hObject, pTemplate, ulCount, phNewObject);
+        }
+        catch (...)
+@@ -464,6 +510,8 @@ PKCS_API CK_RV C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DestroyObject(hSession, hObject);
+        }
+        catch (...)
+@@ -479,6 +527,8 @@ PKCS_API CK_RV C_GetObjectSize(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetObjectSize(hSession, hObject, pulSize);
+        }
+        catch (...)
+@@ -494,6 +544,8 @@ PKCS_API CK_RV C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetAttributeValue(hSession, hObject, pTemplate, ulCount);
+        }
+        catch (...)
+@@ -509,6 +561,8 @@ PKCS_API CK_RV C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SetAttributeValue(hSession, hObject, pTemplate, ulCount);
+        }
+        catch (...)
+@@ -524,6 +578,8 @@ PKCS_API CK_RV C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pT
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_FindObjectsInit(hSession, pTemplate, ulCount);
+        }
+        catch (...)
+@@ -539,6 +595,8 @@ PKCS_API CK_RV C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR ph
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_FindObjects(hSession, phObject, ulMaxObjectCount, pulObjectCount);
+        }
+        catch (...)
+@@ -554,6 +612,8 @@ PKCS_API CK_RV C_FindObjectsFinal(CK_SESSION_HANDLE hSession)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_FindObjectsFinal(hSession);
+        }
+        catch (...)
+@@ -569,6 +629,8 @@ PKCS_API CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_EncryptInit(hSession, pMechanism, hObject);
+        }
+        catch (...)
+@@ -584,6 +646,8 @@ PKCS_API CK_RV C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Encrypt(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen);
+        }
+        catch (...)
+@@ -599,6 +663,8 @@ PKCS_API CK_RV C_EncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_EncryptUpdate(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen);
+        }
+        catch (...)
+@@ -614,6 +680,8 @@ PKCS_API CK_RV C_EncryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypted
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_EncryptFinal(hSession, pEncryptedData, pulEncryptedDataLen);
+        }
+        catch (...)
+@@ -629,6 +697,8 @@ PKCS_API CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DecryptInit(hSession, pMechanism, hObject);
+        }
+        catch (...)
+@@ -644,6 +714,8 @@ PKCS_API CK_RV C_Decrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncryptedData,
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Decrypt(hSession, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen);
+        }
+        catch (...)
+@@ -659,6 +731,8 @@ PKCS_API CK_RV C_DecryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypte
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DecryptUpdate(hSession, pEncryptedData, ulEncryptedDataLen, pData, pDataLen);
+        }
+        catch (...)
+@@ -674,6 +748,8 @@ PKCS_API CK_RV C_DecryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DecryptFinal(hSession, pData, pDataLen);
+        }
+        catch (...)
+@@ -689,6 +765,8 @@ PKCS_API CK_RV C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DigestInit(hSession, pMechanism);
+        }
+        catch (...)
+@@ -704,6 +782,8 @@ PKCS_API CK_RV C_Digest(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Digest(hSession, pData, ulDataLen, pDigest, pulDigestLen);
+        }
+        catch (...)
+@@ -719,6 +799,8 @@ PKCS_API CK_RV C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DigestUpdate(hSession, pPart, ulPartLen);
+        }
+        catch (...)
+@@ -734,6 +816,8 @@ PKCS_API CK_RV C_DigestKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DigestKey(hSession, hObject);
+        }
+        catch (...)
+@@ -749,6 +833,8 @@ PKCS_API CK_RV C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, CK
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DigestFinal(hSession, pDigest, pulDigestLen);
+        }
+        catch (...)
+@@ -764,6 +850,8 @@ PKCS_API CK_RV C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanis
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignInit(hSession, pMechanism, hKey);
+        }
+        catch (...)
+@@ -779,6 +867,8 @@ PKCS_API CK_RV C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ul
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Sign(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
+        }
+        catch (...)
+@@ -794,6 +884,8 @@ PKCS_API CK_RV C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_UL
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignUpdate(hSession, pPart, ulPartLen);
+        }
+        catch (...)
+@@ -809,6 +901,8 @@ PKCS_API CK_RV C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, C
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignFinal(hSession, pSignature, pulSignatureLen);
+        }
+        catch (...)
+@@ -824,6 +918,8 @@ PKCS_API CK_RV C_SignRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pM
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignRecoverInit(hSession, pMechanism, hKey);
+        }
+        catch (...)
+@@ -839,6 +935,8 @@ PKCS_API CK_RV C_SignRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_U
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignRecover(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
+        }
+        catch (...)
+@@ -854,6 +952,8 @@ PKCS_API CK_RV C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_VerifyInit(hSession, pMechanism, hKey);
+        }
+        catch (...)
+@@ -869,6 +969,8 @@ PKCS_API CK_RV C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Verify(hSession, pData, ulDataLen, pSignature, ulSignatureLen);
+        }
+        catch (...)
+@@ -884,6 +986,8 @@ PKCS_API CK_RV C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_VerifyUpdate(hSession, pPart, ulPartLen);
+        }
+        catch (...)
+@@ -899,6 +1003,8 @@ PKCS_API CK_RV C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature,
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_VerifyFinal(hSession, pSignature, ulSignatureLen);
+        }
+        catch (...)
+@@ -914,6 +1020,8 @@ PKCS_API CK_RV C_VerifyRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_VerifyRecoverInit(hSession, pMechanism, hKey);
+        }
+        catch (...)
+@@ -929,6 +1037,8 @@ PKCS_API CK_RV C_VerifyRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignatur
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_VerifyRecover(hSession, pSignature, ulSignatureLen, pData, pulDataLen);
+        }
+        catch (...)
+@@ -944,6 +1054,8 @@ PKCS_API CK_RV C_DigestEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DigestEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
+        }
+        catch (...)
+@@ -959,6 +1071,8 @@ PKCS_API CK_RV C_DecryptDigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DecryptDigestUpdate(hSession, pPart, ulPartLen, pDecryptedPart, pulDecryptedPartLen);
+        }
+        catch (...)
+@@ -974,6 +1088,8 @@ PKCS_API CK_RV C_SignEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
+        }
+        catch (...)
+@@ -989,6 +1105,8 @@ PKCS_API CK_RV C_DecryptVerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEn
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DecryptVerifyUpdate(hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen);
+        }
+        catch (...)
+@@ -1004,6 +1122,8 @@ PKCS_API CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GenerateKey(hSession, pMechanism, pTemplate, ulCount, phKey);
+        }
+        catch (...)
+@@ -1029,6 +1149,8 @@ PKCS_API CK_RV C_GenerateKeyPair
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GenerateKeyPair(hSession, pMechanism, pPublicKeyTemplate, ulPublicKeyAttributeCount, pPrivateKeyTemplate, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey);
+        }
+        catch (...)
+@@ -1052,6 +1174,8 @@ PKCS_API CK_RV C_WrapKey
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_WrapKey(hSession, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen);
+        }
+        catch (...)
+@@ -1077,6 +1201,8 @@ PKCS_API CK_RV C_UnwrapKey
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_UnwrapKey(hSession, pMechanism, hUnwrappingKey, pWrappedKey, ulWrappedKeyLen, pTemplate, ulCount, phKey);
+        }
+        catch (...)
+@@ -1100,6 +1226,8 @@ PKCS_API CK_RV C_DeriveKey
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DeriveKey(hSession, pMechanism, hBaseKey, pTemplate, ulCount, phKey);
+        }
+        catch (...)
+@@ -1115,6 +1243,8 @@ PKCS_API CK_RV C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_UL
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SeedRandom(hSession, pSeed, ulSeedLen);
+        }
+        catch (...)
+@@ -1130,6 +1260,8 @@ PKCS_API CK_RV C_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pRandomD
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GenerateRandom(hSession, pRandomData, ulRandomLen);
+        }
+        catch (...)
+@@ -1145,6 +1277,8 @@ PKCS_API CK_RV C_GetFunctionStatus(CK_SESSION_HANDLE hSession)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetFunctionStatus(hSession);
+        }
+        catch (...)
+@@ -1160,6 +1294,8 @@ PKCS_API CK_RV C_CancelFunction(CK_SESSION_HANDLE hSession)
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_CancelFunction(hSession);
+        }
+        catch (...)
+@@ -1175,6 +1311,8 @@ PKCS_API CK_RV C_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, CK_VOID_
+ {
+        try
+        {
+               if (objects_deleted == 1)
+                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_WaitForSlotEvent(flags, pSlot, pReserved);
+        }
+        catch (...)
+-- 
+2.42.0
diff --git a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb
index 930bca96f..66f048879 100644
--- a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb
+++ b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb
@@ -7,6 +7,7 @@ DEPENDS = "sqlite3"
 SRC_URI = "https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz \
           file://0001-avoid-unnecessary-check-for-sqlite3-binary.patch \
+           file://0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch \
 "
 SRC_URI[sha256sum] = "61249473054bcd1811519ef9a989a880a7bdcc36d317c9c25457fc614df475f2"
diff --git a/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch b/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
new file mode 100644
index 000000000..5aa502916
--- /dev/null
+++ b/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
@@ -0,0 +1,37 @@
+From 7d76513b82a67e117d195a1b5a0d6c2e8591488b Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 10 Oct 2024 13:58:38 +0800
+Subject: [PATCH] tests: Remove blocking_adaptation.cpp
+The test failed to build with clang as below.
+../../../asio-1.30.2/src/tests/../../include/asio/execution/blocking_adaptation.hpp:216:13: error: call to 'query' is ambiguous
+  216 |             conditional_t<true, T, P>::query(static_cast<P&&>(p))
+      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../../asio-1.30.2/src/tests/../../include/asio/execution/blocking_adaptation.hpp:213:29: note: in instantiation of exception specification for 'query<asio::execution::detail::blocking_adaptation::allowed_t<>>' requested here
+  213 |       static constexpr auto query(P&& p)
+      |
+We can add the case back once the above build failure resolved then.
+Upstream-Status: Pending
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ src/tests/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
+index 04f8a03..eab2d56 100644
+--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
+@@ -68,7 +68,6 @@ check_PROGRAMS = \
+        unit/error \
+        unit/execution/any_executor \
+        unit/execution/blocking \
+-       unit/execution/blocking_adaptation \
+        unit/execution/context_as \
+        unit/execution/executor \
+        unit/execution/invocable_archetype \
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/asio/asio/run-ptest b/meta-oe/recipes-support/asio/asio/run-ptest
new file mode 100644
index 000000000..d37db0b31
--- /dev/null
+++ b/meta-oe/recipes-support/asio/asio/run-ptest
@@ -0,0 +1,19 @@
+#!/bin/sh
+ptestdir=$(dirname "$(readlink -f "$0")")
+cd "$ptestdir"/tests || exit
+tests=$(find * -type f -executable)
+rm -rf test.log
+for f in $tests
+do
+    if test -x ./"$f"; then
+        if ./"$f" > test.log 2>&1; then
+            echo "PASS: $f"
+        else
+            echo "FAIL: $f"
+        fi
+    fi
+done
diff --git a/meta-oe/recipes-support/asio/asio_1.30.2.bb b/meta-oe/recipes-support/asio/asio_1.30.2.bb
index 6930381ec..1f492b71e 100644
--- a/meta-oe/recipes-support/asio/asio_1.30.2.bb
+++ b/meta-oe/recipes-support/asio/asio_1.30.2.bb
@@ -8,9 +8,12 @@ LICENSE = "BSL-1.0"
 DEPENDS = "openssl"
-SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2 \
+           file://0001-tests-Remove-blocking_adaptation.cpp.patch \
+           file://run-ptest \
+"
-inherit autotools
+inherit autotools ptest
 ALLOW_EMPTY:${PN} = "1"
@@ -22,4 +25,16 @@ PACKAGECONFIG ??= "boost"
 PACKAGECONFIG[boost] = "--with-boost=${STAGING_LIBDIR},--without-boost,boost"
+TESTDIR = "src/tests"
+do_compile_ptest() {
+    echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile
+    oe_runmake -C ${TESTDIR} buildtest-TESTS
+}
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    # copy executables
+    find ${B}/${TESTDIR}/unit -type f -executable -exec cp {} ${D}${PTEST_PATH}/tests/ \;
+}
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch b/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch
new file mode 100644
index 000000000..f4c0be19b
--- /dev/null
+++ b/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch
@@ -0,0 +1,38 @@
+From ef1aaeee984ab13dab5d46c73e9b207cbdf62c55 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= <l.goehrs@pengutronix.de>
+Date: Wed, 20 Dec 2023 14:37:20 +0100
+Subject: [PATCH] CMakeLists: do not use vendored libcurl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Upstream-Status: Inappropriate [upstream ticket https://github.com/nxp-imx/bcu/issues/17]
+Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
+---
+ CMakeLists.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3475179..bfecdb0 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -17,15 +17,16 @@ pkg_check_modules(LIBFTDI REQUIRED libftdi1)
+ pkg_check_modules(LIBYAML REQUIRED yaml-0.1)
+ pkg_check_modules(LIBOPENSSL REQUIRED openssl)
+ pkg_check_modules(LIBUSB REQUIRED libusb-1.0)
+pkg_check_modules(LIBCURL REQUIRED libcurl)
+ project(bcu)
+-include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${PROJECT_SOURCE_DIR}/libftdi/src ${LIBYAML_INCLUDEDIR} ${PROJECT_SOURCE_DIR}/libcurl/include)
+include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${LIBYAML_INCLUDEDIR})
+ include_directories(${PROJECT_SOURCE_DIR})
+ 
+ message("operation system is ${CMAKE_SYSTEM}")
+ if (LINUX)
+         add_executable(bcu bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c)
+         link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS})
+-        target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${PROJECT_SOURCE_DIR}/libcurl/build.bcu/lib/libcurl.a -lpthread -lssl -lcrypto -lm)
+        target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} -lcurl -lpthread -lssl -lcrypto -lm)
+         execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR}
+                          COMMAND ${PROJECT_SOURCE_DIR}/build_libs.sh ${PROJECT_SOURCE_DIR})
+         install(TARGETS bcu DESTINATION bin)
diff --git a/meta-oe/recipes-support/bcu/bcu_1.1.100.bb b/meta-oe/recipes-support/bcu/bcu_1.1.100.bb
new file mode 100644
index 000000000..bf6e4f4b6
--- /dev/null
+++ b/meta-oe/recipes-support/bcu/bcu_1.1.100.bb
@@ -0,0 +1,23 @@
+SUMMARY = "NXP Board Control Utilities"
+DESCRIPTION = "The NXP Board Control Utilities are able to control various \
+               features of NXP i.MX evaluation boards (EVK) from a host \
+               computer. \
+               Features like resetting the board, selecting the boot mode, \
+               monitoring power consumption, programming the EEPROM and others"
+HOMEPAGE = "https://github.com/nxp-imx/bcu"
+SECTION = "devel"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6"
+SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master \
+           file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \
+           "
+SRCREV = "c34d89b29f3d0d12793cd78b194d2f1d11728baf"
+S = "${WORKDIR}/git"
+DEPENDS = "curl libyaml libusb1 openssl libftdi"
+inherit cmake pkgconfig
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb
index a5a7a6365..fe51c1029 100644
--- a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb
+++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb
@@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075"
 DEPENDS = "libatomic-ops"
-SRCREV = "e340b2e869e02718de9c9d7fa440ef4b35785388"
+SRCREV = "ee59af3722e56de8404de6cd0c21c2493cc4d855"
 SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/btop/btop_1.3.2.bb b/meta-oe/recipes-support/btop/btop_1.4.0.bb
index c473bf0a3..adfb2418b 100644
--- a/meta-oe/recipes-support/btop/btop_1.3.2.bb
+++ b/meta-oe/recipes-support/btop/btop_1.4.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SECTION = "console/utils"
 SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main"
-SRCREV = "fd2a2acdad6fbaad76846cb5e802cf2ae022d670"
+SRCREV = "6c0cedd8912785f0f353af389e72a0ffc69984a2"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb
index 64dd94a9e..2c79be495 100644
--- a/meta-oe/recipes-support/colord/colord-native.bb
+++ b/meta-oe/recipes-support/colord/colord-native.bb
@@ -1,7 +1,5 @@
 require ${BPN}.inc
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-native:"
 inherit meson pkgconfig native
 DEPENDS += " \
diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
index a120b7311..a120b7311 100644
--- a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
+++ b/meta-oe/recipes-support/colord/colord/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
diff --git a/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-oe/recipes-support/colord/colord/Makefile
index 1e29e4f67..1e29e4f67 100644
--- a/meta-oe/recipes-support/colord/colord-native/Makefile
+++ b/meta-oe/recipes-support/colord/colord/Makefile
diff --git a/meta-oe/recipes-support/dool/dool_1.3.2.bb b/meta-oe/recipes-support/dool/dool_1.3.3.bb
index f7e403018..ba75a632e 100644
--- a/meta-oe/recipes-support/dool/dool_1.3.2.bb
+++ b/meta-oe/recipes-support/dool/dool_1.3.3.bb
@@ -12,7 +12,7 @@ RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell pyth
 SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \
          "
-SRCREV = "b2862905be841232c9e36ce1e059d3fe34ef0cdf"
+SRCREV = "e42e8c73043127283762eb52a2e31b7ab0aac177"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
index 47b070557..e75c88210 100644
--- a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
+++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
@@ -29,8 +29,9 @@ SRC_URI += " \
    file://run-ptest \
    file://fuse3.conf \
 "
+#python3-compile for filecmp module
 RDEPENDS:${PN}-ptest += " \
+    python3-compile \
    python3-pytest \
    python3-looseversion \
    bash \
diff --git a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch
deleted file mode 100644
index 3732c62cd..000000000
--- a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 176230435cb4b64ff7f2d97f77a04579ad9ca239 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 18 Feb 2023 13:14:14 -0800
-Subject: [PATCH] Change SleepForMilliseconds parameter from unsigned int -> long
-Fixes following error on 32bit platforms
-src/googletest.h:631:35: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'long' in initializer list [-Wc++11-narrowing]
-  const struct timespec req = {0, t * 1000 * 1000};
-                                  ^~~~~~~~~~~~~~~
-Upstream-Status: Submitted [https://github.com/google/glog/pull/894]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/googletest.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/googletest.h b/src/googletest.h
-index 5761361..836b06c 100644
--- a/src/googletest.h
-+++ b/src/googletest.h
-@@ -625,7 +625,7 @@ class Thread {
- #endif
- };
- 
-static inline void SleepForMilliseconds(unsigned t) {
-+static inline void SleepForMilliseconds(long t) {
- #ifndef GLOG_OS_WINDOWS
- # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L
-   const struct timespec req = {0, t * 1000 * 1000};
-- 
-2.39.2
diff --git a/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-oe/recipes-support/glog/glog/libexecinfo.patch
deleted file mode 100644
index a791a40db..000000000
--- a/meta-oe/recipes-support/glog/glog/libexecinfo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 19d00c15710840910a7397252c14d612746631fe Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 8 Mar 2021 14:58:40 -0800
-Subject: [PATCH] Link libexecinfo if its found, this is needed for musl based
- systems
-Fixes
-ld: libglog.so.0.4.0: undefined reference to `backtrace'
-| collect2: error: ld returned 1 exit status
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 846b444..1553358 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -162,6 +162,7 @@ cmake_pop_check_state ()
- check_cxx_symbol_exists (snprintf cstdio HAVE_SNPRINTF)
- 
- check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP)
-+check_library_exists (execinfo backtrace "" HAVE_EXECINFO)
- 
- check_cxx_source_compiles ("
- #include <cstdlib>
-@@ -629,6 +630,10 @@ if (Unwind_FOUND)
-   set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})")
- endif (Unwind_FOUND)
- 
-+if (HAVE_EXECINFO)
-+  target_link_libraries (glog PUBLIC execinfo)
-+endif (HAVE_EXECINFO)
-+
- if (HAVE_DBGHELP)
-   target_link_libraries (glog PRIVATE dbghelp)
-   set (glog_libraries_options_for_static_linking "${glog_libraries_options_for_static_linking} -ldbghelp")
diff --git a/meta-oe/recipes-support/glog/glog_0.6.0.bb b/meta-oe/recipes-support/glog/glog_0.7.1.bb
index ec39604f4..586afcad5 100644
--- a/meta-oe/recipes-support/glog/glog_0.6.0.bb
+++ b/meta-oe/recipes-support/glog/glog_0.7.1.bb
@@ -4,15 +4,13 @@ macros."
 HOMEPAGE = "https://github.com/google/glog"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=583a6ead531ca3cd5a2ea593a2888800"
 SRC_URI = " \
    git://github.com/google/glog.git;branch=master;protocol=https \
-    file://libexecinfo.patch \
-    file://0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch \
 "
-SRCREV = "b33e3bad4c46c8a6345525fd822af355e5ef9446"
+SRCREV = "7b134a5c82c0c0b5698bb6bf7a835b230c5638e4"
 S = "${WORKDIR}/git"
@@ -24,6 +22,7 @@ PACKAGECONFIG:remove:riscv32 = "unwind 64bit-atomics"
 PACKAGECONFIG:remove:mipsarch = "64bit-atomics"
 PACKAGECONFIG:remove:armv5 = "64bit-atomics"
 PACKAGECONFIG:remove:armv6 = "64bit-atomics"
+PACKAGECONFIG:remove:powerpc = "64bit-atomics"
 PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo"
 PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo"
diff --git a/meta-oe/recipes-support/gnulib/gnulib_202401.bb b/meta-oe/recipes-support/gnulib/gnulib_202401.bb
index 41675d358..8f70cd7a0 100644
--- a/meta-oe/recipes-support/gnulib/gnulib_202401.bb
+++ b/meta-oe/recipes-support/gnulib/gnulib_202401.bb
@@ -32,6 +32,5 @@ do_packagedata[noexec] = "1"
 deltask package_write_ipk
 deltask package_write_deb
 deltask package_write_rpm
-deltask do_deploy_archives 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.387.bb b/meta-oe/recipes-support/hwdata/hwdata_0.388.bb
index d73bb93aa..63fcfb22b 100644
--- a/meta-oe/recipes-support/hwdata/hwdata_0.387.bb
+++ b/meta-oe/recipes-support/hwdata/hwdata_0.388.bb
@@ -5,7 +5,7 @@ SECTION = "System/Base"
 LICENSE = "GPL-2.0-or-later | XFree86-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
-SRCREV = "f0ba62c0b0401c215aed8abb42cf7dcdb7e6fecc"
+SRCREV = "f25185c1814901bf85383693e0dd73bf1d8fe1a1"
 SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch
deleted file mode 100644
index ac1eff510..000000000
--- a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch
+++ /dev/null
@@ -1,530 +0,0 @@
-From 0d3e1b3923a1fac80e9d75d8b5e33cd36f4fe659 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 May 2024 09:03:22 -0700
-Subject: [PATCH] bindings: cxx: Migrate C++ tests to use Catch2 v3
-Catch2 v3.x has API changes which needs to be addressed
-in the tests themselves, hence this changeset is to fix
-those.
-Upstream-Status: Submitted [https://lore.kernel.org/linux-gpio/20240531184223.3949069-1-raj.khem@gmail.com/T/#u]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
- bindings/cxx/tests/Makefile.am              |  2 +-
- bindings/cxx/tests/gpiod-cxx-test-main.cpp  |  3 +--
- bindings/cxx/tests/helpers.hpp              |  8 +++---
- bindings/cxx/tests/tests-chip-info.cpp      | 30 ++++++++++-----------
- bindings/cxx/tests/tests-chip.cpp           | 14 +++++-----
- bindings/cxx/tests/tests-edge-event.cpp     |  2 +-
- bindings/cxx/tests/tests-info-event.cpp     |  2 +-
- bindings/cxx/tests/tests-line-config.cpp    |  2 +-
- bindings/cxx/tests/tests-line-info.cpp      | 22 +++++++--------
- bindings/cxx/tests/tests-line-request.cpp   | 16 +++++------
- bindings/cxx/tests/tests-line-settings.cpp  |  2 +-
- bindings/cxx/tests/tests-line.cpp           |  2 +-
- bindings/cxx/tests/tests-misc.cpp           |  2 +-
- bindings/cxx/tests/tests-request-config.cpp | 10 +++----
- configure.ac                                |  4 +--
- 15 files changed, 60 insertions(+), 61 deletions(-)
-diff --git a/bindings/cxx/tests/Makefile.am b/bindings/cxx/tests/Makefile.am
-index fbf80a1..d9284da 100644
--- a/bindings/cxx/tests/Makefile.am
-+++ b/bindings/cxx/tests/Makefile.am
-@@ -4,7 +4,7 @@
- AM_CXXFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include
- AM_CXXFLAGS += -I$(top_srcdir)/tests/gpiosim/
- AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17 $(CATCH2_CFLAGS)
-AM_LDFLAGS = -pthread
-+AM_LDFLAGS = -pthread $(CATCH2_LIBS)
- LDADD = $(top_builddir)/bindings/cxx/libgpiodcxx.la
- LDADD += $(top_builddir)/tests/gpiosim/libgpiosim.la
- 
-diff --git a/bindings/cxx/tests/gpiod-cxx-test-main.cpp b/bindings/cxx/tests/gpiod-cxx-test-main.cpp
-index 11bf8e5..ec48286 100644
--- a/bindings/cxx/tests/gpiod-cxx-test-main.cpp
-+++ b/bindings/cxx/tests/gpiod-cxx-test-main.cpp
-@@ -1,5 +1,4 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2017-2021 Bartosz Golaszewski <bartekgola@gmail.com>
- 
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
-diff --git a/bindings/cxx/tests/helpers.hpp b/bindings/cxx/tests/helpers.hpp
-index 62d9827..62bbdf5 100644
--- a/bindings/cxx/tests/helpers.hpp
-+++ b/bindings/cxx/tests/helpers.hpp
-@@ -4,13 +4,13 @@
- #ifndef __GPIOD_CXX_TEST_HELPERS_HPP__
- #define __GPIOD_CXX_TEST_HELPERS_HPP__
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <regex>
- #include <string>
- #include <sstream>
- #include <system_error>
- 
-class system_error_matcher : public Catch::MatcherBase<::std::system_error>
-+class system_error_matcher : public Catch::Matchers::MatcherBase<::std::system_error>
- {
- public:
-        explicit system_error_matcher(int expected_errno);
-@@ -21,7 +21,7 @@ private:
-        ::std::error_condition _m_cond;
- };
- 
-class regex_matcher : public Catch::MatcherBase<::std::string>
-+class regex_matcher : public Catch::Matchers::MatcherBase<::std::string>
- {
- public:
-        explicit regex_matcher(const ::std::string& pattern);
-@@ -33,7 +33,7 @@ private:
-        ::std::string _m_repr;
- };
- 
-template<class T> class stringify_matcher : public Catch::MatcherBase<T>
-+template<class T> class stringify_matcher : public Catch::Matchers::MatcherBase<T>
- {
- public:
-        explicit stringify_matcher(const ::std::string& expected) : _m_expected(expected)
-diff --git a/bindings/cxx/tests/tests-chip-info.cpp b/bindings/cxx/tests/tests-chip-info.cpp
-index 717c387..2c54f53 100644
--- a/bindings/cxx/tests/tests-chip-info.cpp
-+++ b/bindings/cxx/tests/tests-chip-info.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- #include <sstream>
- 
-@@ -24,12 +24,12 @@ TEST_CASE("chip_info properties can be read", "[chip-info][chip]")
- 
-        SECTION("get chip name")
-        {
-               REQUIRE_THAT(info.name(), Catch::Equals(sim.name()));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name()));
-        }
- 
-        SECTION("get chip label")
-        {
-               REQUIRE_THAT(info.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("get num_lines")
-@@ -52,12 +52,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
-        {
-                auto copy(info);
- 
-               REQUIRE_THAT(copy.name(), Catch::Equals(sim.name()));
-               REQUIRE_THAT(copy.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(copy.num_lines() == 4);
- 
-               REQUIRE_THAT(info.name(), Catch::Equals(sim.name()));
-               REQUIRE_THAT(info.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(info.num_lines() == 4);
-        }
- 
-@@ -67,12 +67,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
- 
-                copy = info;
- 
-               REQUIRE_THAT(copy.name(), Catch::Equals(sim.name()));
-               REQUIRE_THAT(copy.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(copy.num_lines() == 4);
- 
-               REQUIRE_THAT(info.name(), Catch::Equals(sim.name()));
-               REQUIRE_THAT(info.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(info.num_lines() == 4);
-        }
- 
-@@ -80,8 +80,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
-        {
-                auto moved(std::move(info));
- 
-               REQUIRE_THAT(moved.name(), Catch::Equals(sim.name()));
-               REQUIRE_THAT(moved.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(moved.num_lines() == 4);
-        }
- 
-@@ -91,8 +91,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
- 
-                moved = ::std::move(info);
- 
-               REQUIRE_THAT(moved.name(), Catch::Equals(sim.name()));
-               REQUIRE_THAT(moved.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(moved.num_lines() == 4);
-        }
- }
-diff --git a/bindings/cxx/tests/tests-chip.cpp b/bindings/cxx/tests/tests-chip.cpp
-index c5ec19b..1ab7add 100644
--- a/bindings/cxx/tests/tests-chip.cpp
-+++ b/bindings/cxx/tests/tests-chip.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- #include <sstream>
- #include <system_error>
-@@ -48,9 +48,9 @@ TEST_CASE("chip constructor works", "[chip]")
-                        .build();
- 
-                ::gpiod::chip first(sim.dev_path());
-               REQUIRE_THAT(first.get_info().label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(first.get_info().label(), Catch::Matchers::Equals("foobar"));
-                ::gpiod::chip second(::std::move(first));
-               REQUIRE_THAT(second.get_info().label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(second.get_info().label(), Catch::Matchers::Equals("foobar"));
-        }
- }
- 
-@@ -70,9 +70,9 @@ TEST_CASE("chip operators work", "[chip]")
- 
-                ::gpiod::chip moved_chip(moved_sim.dev_path());
- 
-               REQUIRE_THAT(chip.get_info().label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("foobar"));
-                chip = ::std::move(moved_chip);
-               REQUIRE_THAT(chip.get_info().label(), Catch::Equals("moved"));
-+               REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("moved"));
-        }
- 
-        SECTION("boolean operator")
-@@ -94,7 +94,7 @@ TEST_CASE("chip properties can be read", "[chip]")
- 
-        SECTION("get device path")
-        {
-               REQUIRE_THAT(chip.path(), Catch::Equals(sim.dev_path()));
-+               REQUIRE_THAT(chip.path(), Catch::Matchers::Equals(sim.dev_path()));
-        }
- 
-        SECTION("get file descriptor")
-@@ -169,7 +169,7 @@ TEST_CASE("stream insertion operator works for chip", "[chip]")
-                            "\", label=\"foobar\", num_lines=4))";
- 
-                buf << chip;
-               REQUIRE_THAT(buf.str(), Catch::Equals(expected.str()));
-+               REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str()));
-        }
- 
-        SECTION("closed chip")
-diff --git a/bindings/cxx/tests/tests-edge-event.cpp b/bindings/cxx/tests/tests-edge-event.cpp
-index 19a6ab3..db387be 100644
--- a/bindings/cxx/tests/tests-edge-event.cpp
-+++ b/bindings/cxx/tests/tests-edge-event.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <chrono>
- #include <gpiod.hpp>
- #include <sstream>
-diff --git a/bindings/cxx/tests/tests-info-event.cpp b/bindings/cxx/tests/tests-info-event.cpp
-index 21c0ef0..f7ae309 100644
--- a/bindings/cxx/tests/tests-info-event.cpp
-+++ b/bindings/cxx/tests/tests-info-event.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <chrono>
- #include <filesystem>
- #include <gpiod.hpp>
-diff --git a/bindings/cxx/tests/tests-line-config.cpp b/bindings/cxx/tests/tests-line-config.cpp
-index 5e439a1..2f510fb 100644
--- a/bindings/cxx/tests/tests-line-config.cpp
-+++ b/bindings/cxx/tests/tests-line-config.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- 
- #include "gpiosim.hpp"
-diff --git a/bindings/cxx/tests/tests-line-info.cpp b/bindings/cxx/tests/tests-line-info.cpp
-index 21211f2..8589da3 100644
--- a/bindings/cxx/tests/tests-line-info.cpp
-+++ b/bindings/cxx/tests/tests-line-info.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- #include <string>
- 
-@@ -35,9 +35,9 @@ TEST_CASE("get_line_info() works", "[chip][line-info]")
-                auto info = chip.get_line_info(0);
- 
-                REQUIRE(info.offset() == 0);
-               REQUIRE_THAT(info.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(info.used());
-               REQUIRE_THAT(info.consumer(), Catch::Equals("hog"));
-+               REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("hog"));
-                REQUIRE(info.direction() == ::gpiod::line::direction::OUTPUT);
-                REQUIRE_FALSE(info.active_low());
-                REQUIRE(info.bias() == ::gpiod::line::bias::UNKNOWN);
-@@ -74,9 +74,9 @@ TEST_CASE("line properties can be retrieved", "[line-info]")
-                auto info6 = chip.get_line_info(6);
- 
-                REQUIRE(info4.offset() == 4);
-               REQUIRE_THAT(info4.name(), Catch::Equals("baz"));
-+               REQUIRE_THAT(info4.name(), Catch::Matchers::Equals("baz"));
-                REQUIRE(info4.used());
-               REQUIRE_THAT(info4.consumer(), Catch::Equals("hog4"));
-+               REQUIRE_THAT(info4.consumer(), Catch::Matchers::Equals("hog4"));
-                REQUIRE(info4.direction() == direction::OUTPUT);
-                REQUIRE(info4.edge_detection() == edge::NONE);
-                REQUIRE_FALSE(info4.active_low());
-@@ -102,10 +102,10 @@ TEST_CASE("line_info can be copied and moved")
-        {
-                auto copy(info);
-                REQUIRE(copy.offset() == 2);
-               REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
-                /* info can still be used */
-                REQUIRE(info.offset() == 2);
-               REQUIRE_THAT(info.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("assignment operator works")
-@@ -113,17 +113,17 @@ TEST_CASE("line_info can be copied and moved")
-                auto copy = chip.get_line_info(0);
-                copy = info;
-                REQUIRE(copy.offset() == 2);
-               REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
-                /* info can still be used */
-                REQUIRE(info.offset() == 2);
-               REQUIRE_THAT(info.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("move constructor works")
-        {
-                auto copy(::std::move(info));
-                REQUIRE(copy.offset() == 2);
-               REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("move assignment operator works")
-@@ -131,7 +131,7 @@ TEST_CASE("line_info can be copied and moved")
-                auto copy = chip.get_line_info(0);
-                copy = ::std::move(info);
-                REQUIRE(copy.offset() == 2);
-               REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
-        }
- }
- 
-diff --git a/bindings/cxx/tests/tests-line-request.cpp b/bindings/cxx/tests/tests-line-request.cpp
-index 9632ae0..af8b979 100644
--- a/bindings/cxx/tests/tests-line-request.cpp
-+++ b/bindings/cxx/tests/tests-line-request.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- #include <sstream>
- #include <stdexcept>
-@@ -20,7 +20,7 @@ using pull = ::gpiosim::chip::pull;
- 
- namespace {
- 
-class value_matcher : public Catch::MatcherBase<value>
-+class value_matcher : public Catch::Matchers::MatcherBase<value>
- {
- public:
-        value_matcher(pull pull, bool active_low = false)
-@@ -117,7 +117,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]")
-                auto info = chip.get_line_info(2);
- 
-                REQUIRE(info.used());
-               REQUIRE_THAT(info.consumer(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("empty consumer")
-@@ -130,7 +130,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]")
-                auto info = chip.get_line_info(2);
- 
-                REQUIRE(info.used());
-               REQUIRE_THAT(info.consumer(), Catch::Equals("?"));
-+               REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("?"));
-        }
- }
- 
-@@ -380,7 +380,7 @@ TEST_CASE("line_request can be moved", "[line-request]")
-                auto moved(::std::move(request));
- 
-                REQUIRE(moved.fd() == fd);
-               REQUIRE_THAT(moved.offsets(), Catch::Equals(offs));
-+               REQUIRE_THAT(moved.offsets(), Catch::Matchers::Equals(offs));
-        }
- 
-        SECTION("move assignment operator works")
-@@ -388,7 +388,7 @@ TEST_CASE("line_request can be moved", "[line-request]")
-                another = ::std::move(request);
- 
-                REQUIRE(another.fd() == fd);
-               REQUIRE_THAT(another.offsets(), Catch::Equals(offs));
-+               REQUIRE_THAT(another.offsets(), Catch::Matchers::Equals(offs));
-        }
- }
- 
-@@ -484,7 +484,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]")
-        {
-                buf << request;
- 
-               REQUIRE_THAT(buf.str(), Catch::Equals(expected.str()));
-+               REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str()));
-        }
- 
-        SECTION("request released")
-@@ -493,7 +493,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]")
- 
-                buf << request;
- 
-               REQUIRE_THAT(buf.str(), Catch::Equals("gpiod::line_request(released)"));
-+               REQUIRE_THAT(buf.str(), Catch::Matchers::Equals("gpiod::line_request(released)"));
-        }
- }
- 
-diff --git a/bindings/cxx/tests/tests-line-settings.cpp b/bindings/cxx/tests/tests-line-settings.cpp
-index dc821bb..2690331 100644
--- a/bindings/cxx/tests/tests-line-settings.cpp
-+++ b/bindings/cxx/tests/tests-line-settings.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- 
- #include "helpers.hpp"
-diff --git a/bindings/cxx/tests/tests-line.cpp b/bindings/cxx/tests/tests-line.cpp
-index 319012a..abd0e08 100644
--- a/bindings/cxx/tests/tests-line.cpp
-+++ b/bindings/cxx/tests/tests-line.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- 
- #include "helpers.hpp"
-diff --git a/bindings/cxx/tests/tests-misc.cpp b/bindings/cxx/tests/tests-misc.cpp
-index f06dc39..33fc3fa 100644
--- a/bindings/cxx/tests/tests-misc.cpp
-+++ b/bindings/cxx/tests/tests-misc.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <filesystem>
- #include <gpiod.hpp>
- #include <string>
-diff --git a/bindings/cxx/tests/tests-request-config.cpp b/bindings/cxx/tests/tests-request-config.cpp
-index 66eb748..d71e91b 100644
--- a/bindings/cxx/tests/tests-request-config.cpp
-+++ b/bindings/cxx/tests/tests-request-config.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
-#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <cstddef>
- #include <gpiod.hpp>
- #include <string>
-@@ -33,7 +33,7 @@ TEST_CASE("request_config can be moved", "[request-config]")
-        SECTION("move constructor works")
-        {
-                auto moved(::std::move(cfg));
-               REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(moved.event_buffer_size() == 64);
-        }
- 
-@@ -43,7 +43,7 @@ TEST_CASE("request_config can be moved", "[request-config]")
- 
-                moved = ::std::move(cfg);
- 
-               REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(moved.event_buffer_size() == 64);
-        }
- }
-@@ -55,7 +55,7 @@ TEST_CASE("request_config mutators work", "[request-config]")
-        SECTION("set consumer")
-        {
-                cfg.set_consumer("foobar");
-               REQUIRE_THAT(cfg.consumer(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(cfg.consumer(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("set event_buffer_size")
-@@ -77,7 +77,7 @@ TEST_CASE("request_config stream insertion operator works", "[request-config]")
- 
-        ::std::string expected("gpiod::request_config(consumer='foobar', event_buffer_size=32)");
- 
-       REQUIRE_THAT(buf.str(), Catch::Equals(expected));
-+       REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected));
- }
- 
- } /* namespace */
-diff --git a/configure.ac b/configure.ac
-index a2370c5..216007e 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -206,9 +206,9 @@ then
- 
-        if test "x$with_tests" = xtrue
-        then
-               PKG_CHECK_MODULES([CATCH2], [catch2],, [
-+               PKG_CHECK_MODULES([CATCH2], [catch2-with-main],, [
-                        AC_LANG_PUSH([C++])
-                       AC_CHECK_HEADERS([catch2/catch.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch.hpp])])
-+                       AC_CHECK_HEADERS([catch2/catch_all.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch_all.hpp])])
-                        AC_LANG_POP([C++])
-                ])
-        fi
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-manager.init b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-manager.init
new file mode 100644
index 000000000..e36755eea
--- /dev/null
+++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-manager.init
@@ -0,0 +1,76 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:             gpio-manager
+# Required-Start:       $remote_fs $syslog
+# Required-Stop:        $remote_fs $syslog
+# Default-Start:        2 3 4 5
+# Default-Stop:         1
+# Short-Description:    Centralized GPIO manager daemon
+### END INIT INFO
+#
+# -*- coding: utf-8 -*-
+# Debian init.d script for gpio-manager
+# Copyright (c) 2024 Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+# set -e
+# Source function library.
+. /etc/init.d/functions
+DAEMON=/usr/bin/gpio-manager
+NAME=gpio-manager
+PIDFILE=/var/run/gpio-manager/pid
+DESC="GPIO manager daemon"
+test -x $DAEMON || exit 0
+test "$ENABLED" != "0" || exit 0
+do_start()
+{
+        mkdir -p "`dirname $PIDFILE`"
+        if [ -e $PIDFILE ]; then
+                PIDDIR=/proc/$(cat $PIDFILE)
+                if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+                        echo "$DESC already started; not starting."
+                else
+                        echo "Removing stale PID file $PIDFILE."
+                        rm -f $PIDFILE
+                fi
+        fi
+        echo -n "Starting $DESC: "
+        start-stop-daemon --user gpio-manager --background --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON
+        echo "$NAME."
+}
+do_stop()
+{
+        echo -n "Stopping $DESC: "
+        start-stop-daemon --stop --quiet --pidfile $PIDFILE
+        echo "$NAME."
+        rm -f $PIDFILE
+}
+case "$1" in
+        start)
+                do_start
+        ;;
+        stop)
+                do_stop
+        ;;
+        status)
+                status $DAEMON
+                exit $?
+        ;;
+        restart)
+                do_stop
+                sleep 1
+                do_start
+        ;;
+        *)
+                echo "Usage: /etc/init.d/$NAME {start|stop|status|restart}" >&2
+                exit 1
+        ;;
+esac
+exit 0
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest
index 29ec0d102..eae172116 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest
+++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest
@@ -1,24 +1,43 @@
 #!/bin/sh
-testbins="gpiod-test gpio-tools-test.bash gpiod-cxx-test"
 ptestdir=$(dirname "$(readlink -f "$0")")
 cd $ptestdir/tests
+export GPIODBUS_TEST_DAEMON_PATH="$ptestdir/tests/gpio-manager"
+export PATH="$ptestdir/tests/:$PATH"
 # libgpiod v2 uses gpio-sim - a configfs-based testing module. We need to
 # make sure configfs is mounted before running any tests.
 modprobe configfs
 mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config
-for testbin in $testbins; do
+# Make sure the daemon is not running during tests.
-        if test -e ./$testbin; then
+systemctl stop gpio-manager 2> /dev/null > /dev/null
-                ./$testbin > ./$testbin.out 2>&1
+service gpio-manager stop 2> /dev/null > /dev/null
-                if [ $? -ne 0 ]; then
-                        echo "FAIL: $testbin"
+run_one_test() {
-                else
+        testbin="$1"
-                        echo "PASS: $testbin"
-                fi
+        ./$testbin > ./$testbin.out 2>&1
+        if [ $? -ne 0 ]; then
+                echo "FAIL: $testbin"
        else
-                echo "SKIP: $testbin"
+                echo "PASS: $testbin"
        fi
-done
+}
+run_one_test gpiod-test
+run_one_test gpio-tools-test.bash
+run_one_test gpiod-cxx-test
+run_one_test gpiod-glib-test
+# Wait for the leftover uevents to be emitted before running DBus tests.
+udevadm settle
+run_one_test gpiodbus-test
+udevadm settle
+gpio-manager 2> /dev/null > /dev/null &
+GPIO_MANAGER_PID=$!
+run_one_test gpiocli-test.bash
+kill $GPIO_MANAGER_PID
+wait $GPIO_MANAGER_PID
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
index 079583949..dac7dd36f 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
@@ -7,7 +7,7 @@ SRC_URI += "file://0001-bindings-cxx-disable-tests.patch"
 SRC_URI[sha256sum] = "ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc"
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-1.x:"
 inherit python3native
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb
deleted file mode 100644
index 6130371e4..000000000
--- a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-require libgpiod.inc
-LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \
-    file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \
-"
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:"
-SRC_URI += "file://0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch"
-SRC_URI[sha256sum] = "2be4c0b03e995d236c0e476e14aeb475d7b431dd1439609b6d65c540f91eaf58"
-# Enable all project features for ptest
-PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit"
-PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit"
-PACKAGES =+ "${PN}-ptest-dev"
-FILES:${PN}-tools += "${bindir}/gpionotify"
-FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*"
-FILES:${PN}-ptest-dev += "${includedir}/gpiosim.h"
-RDEPENDS:${PN}-ptest += " \
-    ${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \
-"
-RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs"
-do_install_ptest:append() {
-    install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/
-    install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/
-    install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h
-}
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.bb
new file mode 100644
index 000000000..224918a55
--- /dev/null
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.bb
@@ -0,0 +1,101 @@
+require libgpiod.inc
+inherit systemd update-rc.d useradd gobject-introspection
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \
+    file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \
+"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-2.x:"
+SRC_URI += "file://gpio-manager.init"
+SRC_URI[sha256sum] = "ee29735890eb1cc0e4b494001da5163d1a9c4735343201d22485db313601ca07"
+# Enable all project features for ptest
+PACKAGECONFIG[tests] = " \
+    --enable-tests --enable-tools --enable-bindings-cxx --enable-bindings-glib --enable-gpioset-interactive --enable-dbus, \
+    --disable-tests, \
+    kmod util-linux glib-2.0 catch2 libedit glib-2.0-native libgudev, \
+    bash dbus glib-2.0-utils libgpiod-manager shunit2 \
+"
+PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit"
+PACKAGECONFIG[glib] = "--enable-bindings-glib,--disable-bindings-glib,glib-2.0 glib-2.0-native"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,glib-2.0 glib-2.0-native libgudev,dbus"
+PACKAGES =+ "${PN}-ptest-dev ${PN}-glib ${PN}-manager ${PN}-cli"
+FILES:${PN}-tools += "${bindir}/gpionotify"
+FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*"
+FILES:${PN}-ptest-dev += "${includedir}/gpiosim.h"
+FILES:${PN}-glib += "${libdir}/libgpiod-glib.so.*"
+FILES:${PN}-manager += " \
+    ${bindir}/gpio-manager \
+    ${sysconfdir}/dbus-1/system.d/io.gpiod1.conf \
+    ${datadir}/dbus-1/interfaces/io.gpiod1.xml \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/gpio-manager.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${sysconfdir}/init.d/gpio-manager', '', d)} \
+"
+FILES:${PN}-cli += "${bindir}/gpiocli"
+RDEPENDS:${PN}-manager += "dbus"
+RDEPENDS:${PN}-cli += "${PN}-manager"
+SYSTEMD_PACKAGES = "${PN}-manager"
+python __anonymous() {
+    distro_features = d.getVar("DISTRO_FEATURES").split()
+    packageconfig = d.getVar("PACKAGECONFIG").split()
+    pn = d.getVar("PN")
+    if "systemd" in distro_features and "dbus" in packageconfig:
+        d.appendVar("EXTRA_OECONF", " --enable-systemd")
+        # We need to set it conditionally or else the systemd class will look
+        # for the file that we don't install with systemd support disabled.
+        d.setVar("SYSTEMD_SERVICE:{}-manager".format(pn), "gpio-manager.service")
+    else:
+        d.appendVar("EXTRA_OECONF", " --disable-systemd")
+    # Disable gobject introspection set by the bbclass if we don't want it.
+    if not any(cfg in ["glib", "dbus", "ptest"] for cfg in packageconfig):
+        d.setVar("GI_DATA_ENABLED", "False")
+}
+UPDATERCPN = "${PN}-manager"
+INITSCRIPT_NAME = "gpio-manager"
+INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 0 1 6 ."
+USERADD_PACKAGES = "${PN}-manager"
+GROUPADD_PARAM:${PN}-manager = "--system gpio"
+USERADD_PARAM:${PN}-manager = "--system -M -s /bin/nologin -g gpio gpio-manager"
+RDEPENDS:${PN}-ptest += " \
+    ${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \
+"
+RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs"
+INSANE_SKIP:${PN}-ptest += "buildpaths"
+do_compile:prepend() {
+    export GIR_EXTRA_LIBS_PATH="${B}/lib/.libs"
+}
+do_install:append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${UNPACKDIR}/gpio-manager.init ${D}${sysconfdir}/init.d/gpio-manager
+    fi
+}
+do_install_ptest:append() {
+    install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/
+    install -m 0644 ${S}/tests/scripts/gpiod-bash-test-helper.inc ${D}${PTEST_PATH}/tests/
+    install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h
+    install -m 0755 ${B}/bindings/glib/tests/.libs/gpiod-glib-test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/dbus/tests/.libs/gpiodbus-test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${S}/dbus/client/gpiocli-test.bash ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/dbus/manager/.libs/gpio-manager ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/dbus/client/.libs/gpiocli ${D}${PTEST_PATH}/tests/
+}
diff --git a/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb b/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb
index db0542269..2e5940189 100644
--- a/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb
+++ b/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 DEPENDS = "libevdev libgudev"
 SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz"
-SRC_URI[sha256sum] = "cddd5c02a131072c19c6cde6f2cb2cd57eae7dacb50d14c337efd980baa51a51"
+SRC_URI[sha256sum] = "29366be5452f60a74c65fc64ffe2d74eddd4e6e6824c2cefa567a43bd92b688f"
 inherit meson pkgconfig gobject-introspection ptest vala
diff --git a/meta-oe/recipes-support/libp11/files/0001-detect-correct-openssl-3.x.patch b/meta-oe/recipes-support/libp11/files/0001-detect-correct-openssl-3.x.patch
new file mode 100644
index 000000000..aa61e9d97
--- /dev/null
+++ b/meta-oe/recipes-support/libp11/files/0001-detect-correct-openssl-3.x.patch
@@ -0,0 +1,28 @@
+From 74497e0fa5b69b15790d6697e1ebce13af842d4c Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 13 Jul 2023 13:52:54 -0400
+Subject: [PATCH] configure: treat all openssl-3.x releases the same
+OpenSSL's soversion will not change for any 3.x minor release.
+https://www.openssl.org/policies/general/versioning-policy.html
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Upstream-Status: Backport [https://github.com/OpenSC/libp11/commit/74497e0fa5b69b15790d6697e1ebce13af842d4c.patch]
+Signed-off-by: Sana Kazi <sanakazi720@gmail.com>
+diff --git a/configure.ac b/configure.ac
+index b96979d9..c344e84a 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -33,7 +33,7 @@ AC_C_BIGENDIAN
+ # issues with applications linking to new openssl, old libp11, and vice versa
+ case "`$PKG_CONFIG --modversion --silence-errors libcrypto || \
+        $PKG_CONFIG --modversion openssl`" in
+-       3.0.*) # Predicted engines directory prefix for OpenSSL 3.x
+       3.*) # Predicted engines directory prefix for OpenSSL 3.x
+            LIBP11_LT_OLDEST="3"
+            debian_ssl_prefix="openssl-3.0.0";;
+        1.1.*) # Predicted engines directory prefix for OpenSSL 1.1.x
diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.12.bb b/meta-oe/recipes-support/libp11/libp11_0.4.12.bb
index 223778200..cc4a138e2 100644
--- a/meta-oe/recipes-support/libp11/libp11_0.4.12.bb
+++ b/meta-oe/recipes-support/libp11/libp11_0.4.12.bb
@@ -9,7 +9,10 @@ LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
 DEPENDS = "libtool openssl"
-SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https \
+    file://0001-detect-correct-openssl-3.x.patch \
+"
 SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf"
 UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch b/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch
new file mode 100644
index 000000000..f0fd2a4aa
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch
@@ -0,0 +1,53 @@
+From 9426ac3d232e2f90c571979a2166c5e1328967d1 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <j.w.r.degoede@hhs.nl>
+Date: Tue, 15 Oct 2013 14:39:04 +0200
+Subject: [PATCH] Fix missing prototype compiler warnings
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/30e5556d1c9323e9f1887b28d42581c2954b53c9]
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/append.c  | 2 ++
+ lib/output.c  | 1 +
+ lib/wrapper.c | 1 +
+ 3 files changed, 4 insertions(+)
+diff --git a/lib/append.c b/lib/append.c
+index 13e1ace..e8bd89d 100644
+--- a/lib/append.c
+++ b/lib/append.c
+@@ -13,6 +13,8 @@
+ #include <internal.h>
+ 
+ #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sys/param.h>
+diff --git a/lib/output.c b/lib/output.c
+index a2db929..a5262ee 100644
+--- a/lib/output.c
+++ b/lib/output.c
+@@ -13,6 +13,7 @@
+ #include <internal.h>
+ 
+ #include <stdio.h>
+#include <stdlib.h>
+ #include <pwd.h>
+ #include <grp.h>
+ #include <time.h>
+diff --git a/lib/wrapper.c b/lib/wrapper.c
+index 4cd0652..44cc435 100644
+--- a/lib/wrapper.c
+++ b/lib/wrapper.c
+@@ -13,6 +13,7 @@
+ #include <internal.h>
+ 
+ #include <stdio.h>
+#include <stdlib.h>
+ #include <sys/param.h>
+ #include <dirent.h>
+ #include <errno.h>
diff --git a/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch b/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch
new file mode 100644
index 000000000..b1ecb552b
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch
@@ -0,0 +1,44 @@
+From c0a89709860acae5ef67727db7b23db385703bf6 Mon Sep 17 00:00:00 2001
+From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>
+Date: Tue, 15 Oct 2013 14:39:05 +0200
+Subject: [PATCH] Fix invalid memory de-reference issue
+Bug: https://bugzilla.redhat.com/551415
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/560911b694055b0c677431cf85d4d0d5ebd1a3fd]
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/libtar.h | 1 +
+ lib/util.c   | 4 +---
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+diff --git a/lib/libtar.h b/lib/libtar.h
+index 55f509a..7fc4d03 100644
+--- a/lib/libtar.h
+++ b/lib/libtar.h
+@@ -172,6 +172,7 @@ int th_write(TAR *t);
+ #define TH_ISDIR(t)    ((t)->th_buf.typeflag == DIRTYPE \
+                         || S_ISDIR((mode_t)oct_to_int((t)->th_buf.mode)) \
+                         || ((t)->th_buf.typeflag == AREGTYPE \
+                            && strlen((t)->th_buf.name) \
+                             && ((t)->th_buf.name[strlen((t)->th_buf.name) - 1] == '/')))
+ #define TH_ISFIFO(t)   ((t)->th_buf.typeflag == FIFOTYPE \
+                         || S_ISFIFO((mode_t)oct_to_int((t)->th_buf.mode)))
+diff --git a/lib/util.c b/lib/util.c
+index 31e8315..11438ef 100644
+--- a/lib/util.c
+++ b/lib/util.c
+@@ -148,9 +148,7 @@ oct_to_int(char *oct)
+ {
+        int i;
+ 
+-       sscanf(oct, "%o", &i);
+-
+-       return i;
+       return sscanf(oct, "%o", &i) == 1 ? i : 0;
+ }
+ 
+ 
diff --git a/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch b/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch
new file mode 100644
index 000000000..627c27016
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch
@@ -0,0 +1,101 @@
+From d998b9f75c79aab68255dace641dd30db239eff6 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Tue, 15 Oct 2013 19:48:41 -0400
+Subject: [PATCH] fix file descriptor leaks reported by cppcheck
+Bug: https://bugzilla.redhat.com/785760
+Authored by Kamil Dudka <kdudka@redhat.com>.
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/abd0274e6b2f708e9eaa29414b07b3f542cec694]
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/append.c    | 14 +++++++++-----
+ lib/extract.c   |  4 ++++
+ libtar/libtar.c |  3 +++
+ 3 files changed, 16 insertions(+), 5 deletions(-)
+diff --git a/lib/append.c b/lib/append.c
+index e8bd89d..ff58532 100644
+--- a/lib/append.c
+++ b/lib/append.c
+@@ -216,6 +216,7 @@ tar_append_regfile(TAR *t, const char *realname)
+        int filefd;
+        int i, j;
+        size_t size;
+       int rv = -1;
+ 
+        filefd = open(realname, O_RDONLY);
+        if (filefd == -1)
+@@ -234,25 +235,28 @@ tar_append_regfile(TAR *t, const char *realname)
+                {
+                        if (j != -1)
+                                errno = EINVAL;
+-                       return -1;
+                       goto fail;
+                }
+                if (tar_block_write(t, &block) == -1)
+-                       return -1;
+                       goto fail;
+        }
+ 
+        if (i > 0)
+        {
+                j = read(filefd, &block, i);
+                if (j == -1)
+-                       return -1;
+                       goto fail;
+                memset(&(block[i]), 0, T_BLOCKSIZE - i);
+                if (tar_block_write(t, &block) == -1)
+-                       return -1;
+                       goto fail;
+        }
+ 
+       /* success! */
+       rv = 0;
+fail:
+        close(filefd);
+ 
+-       return 0;
+       return rv;
+ }
+ 
+ 
+diff --git a/lib/extract.c b/lib/extract.c
+index 36357e7..9fc6ad5 100644
+--- a/lib/extract.c
+++ b/lib/extract.c
+@@ -228,13 +228,17 @@ tar_extract_regfile(TAR *t, char *realname)
+                {
+                        if (k != -1)
+                                errno = EINVAL;
+                       close(fdout);
+                        return -1;
+                }
+ 
+                /* write block to output file */
+                if (write(fdout, buf,
+                          ((i > T_BLOCKSIZE) ? T_BLOCKSIZE : i)) == -1)
+               {
+                       close(fdout);
+                        return -1;
+               }
+        }
+ 
+        /* close output file */
+diff --git a/libtar/libtar.c b/libtar/libtar.c
+index 9fa92b2..bb5644c 100644
+--- a/libtar/libtar.c
+++ b/libtar/libtar.c
+@@ -83,7 +83,10 @@ gzopen_frontend(char *pathname, int oflags, int mode)
+                return -1;
+ 
+        if ((oflags & O_CREAT) && fchmod(fd, mode))
+       {
+               close(fd);
+                return -1;
+       }
+ 
+        gzf = gzdopen(fd, gzoflags);
+        if (!gzf)
diff --git a/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch b/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch
new file mode 100644
index 000000000..90809ad84
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch
@@ -0,0 +1,26 @@
+From f6c5cba59444ecda9bbc22b8e8e57fd1015a688d Mon Sep 17 00:00:00 2001
+From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>
+Date: Tue, 15 Oct 2013 20:02:58 -0400
+Subject: [PATCH] fix memleak on tar_open() failure
+Authored by Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>.
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/36629a41208375f5105427e98078127551692028]
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/handle.c | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/lib/handle.c b/lib/handle.c
+index 33a262c..002d23c 100644
+--- a/lib/handle.c
+++ b/lib/handle.c
+@@ -82,6 +82,7 @@ tar_open(TAR **t, const char *pathname, tartype_t *type,
+        (*t)->fd = (*((*t)->type->openfunc))(pathname, oflags, mode);
+        if ((*t)->fd == -1)
+        {
+               libtar_hash_free((*t)->h, NULL);
+                free(*t);
+                return -1;
+        }
diff --git a/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch b/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch
new file mode 100644
index 000000000..f88bcbf9c
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch
@@ -0,0 +1,119 @@
+From e3888e452aee72e0d658185ac20e8e63bed1aff8 Mon Sep 17 00:00:00 2001
+From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>
+Date: Tue, 15 Oct 2013 20:05:04 -0400
+Subject: [PATCH] fix memleaks in libtar sample program
+Authored by Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>.
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/f3c711cf3054ff366a1a3500cdc8c64ecc2d2da6]
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ libtar/libtar.c | 29 ++++++++++++++++++-----------
+ 1 file changed, 18 insertions(+), 11 deletions(-)
+diff --git a/libtar/libtar.c b/libtar/libtar.c
+index bb5644c..23f8741 100644
+--- a/libtar/libtar.c
+++ b/libtar/libtar.c
+@@ -253,6 +253,7 @@ extract(char *tarfile, char *rootdir)
+        if (tar_extract_all(t, rootdir) != 0)
+        {
+                fprintf(stderr, "tar_extract_all(): %s\n", strerror(errno));
+               tar_close(t);
+                return -1;
+        }
+ 
+@@ -270,12 +271,13 @@ extract(char *tarfile, char *rootdir)
+ 
+ 
+ void
+-usage()
+usage(void *rootdir)
+ {
+        printf("Usage: %s [-C rootdir] [-g] [-z] -x|-t filename.tar\n",
+               progname);
+        printf("       %s [-C rootdir] [-g] [-z] -c filename.tar ...\n",
+               progname);
+       free(rootdir);
+        exit(-1);
+ }
+ 
+@@ -292,6 +294,7 @@ main(int argc, char *argv[])
+        int c;
+        int mode = 0;
+        libtar_list_t *l;
+       int return_code = -2;
+ 
+        progname = basename(argv[0]);
+ 
+@@ -313,17 +316,17 @@ main(int argc, char *argv[])
+                        break;
+                case 'c':
+                        if (mode)
+-                               usage();
+                               usage(rootdir);
+                        mode = MODE_CREATE;
+                        break;
+                case 'x':
+                        if (mode)
+-                               usage();
+                               usage(rootdir);
+                        mode = MODE_EXTRACT;
+                        break;
+                case 't':
+                        if (mode)
+-                               usage();
+                               usage(rootdir);
+                        mode = MODE_LIST;
+                        break;
+ #ifdef HAVE_LIBZ
+@@ -332,7 +335,7 @@ main(int argc, char *argv[])
+                        break;
+ #endif /* HAVE_LIBZ */
+                default:
+-                       usage();
+                       usage(rootdir);
+                }
+ 
+        if (!mode || ((argc - optind) < (mode == MODE_CREATE ? 2 : 1)))
+@@ -341,7 +344,7 @@ main(int argc, char *argv[])
+                printf("argc - optind == %d\tmode == %d\n", argc - optind,
+                       mode);
+ #endif
+-               usage();
+               usage(rootdir);
+        }
+ 
+ #ifdef DEBUG
+@@ -351,21 +354,25 @@ main(int argc, char *argv[])
+        switch (mode)
+        {
+        case MODE_EXTRACT:
+-               return extract(argv[optind], rootdir);
+               return_code = extract(argv[optind], rootdir);
+               break;
+        case MODE_CREATE:
+                tarfile = argv[optind];
+                l = libtar_list_new(LIST_QUEUE, NULL);
+                for (c = optind + 1; c < argc; c++)
+                        libtar_list_add(l, argv[c]);
+-               return create(tarfile, rootdir, l);
+               return_code = create(tarfile, rootdir, l);
+               libtar_list_free(l, NULL);
+               break;
+        case MODE_LIST:
+-               return list(argv[optind]);
+               return_code = list(argv[optind]);
+               break;
+        default:
+                break;
+        }
+ 
+-       /* NOTREACHED */
+-       return -2;
+       free(rootdir);
+       return return_code;
+ }
+ 
+ 
diff --git a/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch b/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch
new file mode 100644
index 000000000..beba45405
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch
@@ -0,0 +1,89 @@
+From edbee9832475347183a841a8fd5be71f74e10392 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Wed, 23 Oct 2013 15:04:22 +0200
+Subject: [PATCH] decode: avoid using a static buffer in th_get_pathname()
+A solution suggested by Chris Frey:
+https://lists.feep.net:8080/pipermail/libtar/2013-October/000377.html
+Note this can break programs that expect sizeof(TAR) to be fixed.
+Authored by Kamil Dudka <kdudka@redhat.com>.
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/ec613af2e9371d7a3e1f7c7a6822164a4255b4d1]
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/decode.c | 24 +++++++++++++++++-------
+ lib/handle.c |  1 +
+ lib/libtar.h |  3 +++
+ 3 files changed, 21 insertions(+), 7 deletions(-)
+diff --git a/lib/decode.c b/lib/decode.c
+index c16ea2d..edb2185 100644
+--- a/lib/decode.c
+++ b/lib/decode.c
+@@ -26,20 +26,30 @@
+ char *
+ th_get_pathname(TAR *t)
+ {
+-       static TLS_THREAD char filename[MAXPATHLEN];
+-
+        if (t->th_buf.gnu_longname)
+                return t->th_buf.gnu_longname;
+ 
+-       if (t->th_buf.prefix[0] != '\0')
+       /* allocate the th_pathname buffer if not already */
+       if (t->th_pathname == NULL)
+       {
+               t->th_pathname = malloc(MAXPATHLEN * sizeof(char));
+               if (t->th_pathname == NULL)
+                       /* out of memory */
+                       return NULL;
+       }
+
+       if (t->th_buf.prefix[0] == '\0')
+       {
+               snprintf(t->th_pathname, MAXPATHLEN, "%.100s", t->th_buf.name);
+       }
+       else
+        {
+-               snprintf(filename, sizeof(filename), "%.155s/%.100s",
+               snprintf(t->th_pathname, MAXPATHLEN, "%.155s/%.100s",
+                         t->th_buf.prefix, t->th_buf.name);
+-               return filename;
+        }
+ 
+-       snprintf(filename, sizeof(filename), "%.100s", t->th_buf.name);
+-       return filename;
+       /* will be deallocated in tar_close() */
+       return t->th_pathname;
+ }
+ 
+ 
+diff --git a/lib/handle.c b/lib/handle.c
+index 002d23c..a19c046 100644
+--- a/lib/handle.c
+++ b/lib/handle.c
+@@ -122,6 +122,7 @@ tar_close(TAR *t)
+                libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY
+                                        ? free
+                                        : (libtar_freefunc_t)tar_dev_free));
+       free(t->th_pathname);
+        free(t);
+ 
+        return i;
+diff --git a/lib/libtar.h b/lib/libtar.h
+index 7fc4d03..08a8e0f 100644
+--- a/lib/libtar.h
+++ b/lib/libtar.h
+@@ -85,6 +85,9 @@ typedef struct
+        int options;
+        struct tar_header th_buf;
+        libtar_hash_t *h;
+
+       /* introduced in libtar 1.2.21 */
+       char *th_pathname;
+ }
+ TAR;
+ 
diff --git a/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch b/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch
new file mode 100644
index 000000000..2d8f21171
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch
@@ -0,0 +1,30 @@
+From bc8ec7d940d7ffc870638521bd134098d2efa5df Mon Sep 17 00:00:00 2001
+From: Chris Frey <cdfrey@foursquare.net>
+Date: Thu, 24 Oct 2013 17:55:12 -0400
+Subject: [PATCH] Check for NULL before freeing th_pathname
+Thanks to Harald Koch for pointing out that AIX 4 and 5 still need this.
+Authored by Chris Frey <cdfrey@foursquare.net>.
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/495d0c0eabc5648186e7d58ad54b508d14af38f4]
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/handle.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/lib/handle.c b/lib/handle.c
+index a19c046..28a7dc2 100644
+--- a/lib/handle.c
+++ b/lib/handle.c
+@@ -122,7 +122,8 @@ tar_close(TAR *t)
+                libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY
+                                        ? free
+                                        : (libtar_freefunc_t)tar_dev_free));
+-       free(t->th_pathname);
+       if (t->th_pathname != NULL)
+               free(t->th_pathname);
+        free(t);
+ 
+        return i;
diff --git a/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch b/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch
new file mode 100644
index 000000000..edbd636b2
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch
@@ -0,0 +1,26 @@
+From c64dfdc6ec5bc752aafd1ac16a380f47602197c4 Mon Sep 17 00:00:00 2001
+From: Chris Frey <cdfrey@foursquare.net>
+Date: Thu, 24 Oct 2013 17:58:47 -0400
+Subject: [PATCH] Added stdlib.h for malloc() in lib/decode.c
+Authored by Chris Frey <cdfrey@foursquare.net>.
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/20aa09bd7775094a2beb0f136c2c7d9e9fd6c7e6]
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/decode.c | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/lib/decode.c b/lib/decode.c
+index edb2185..35312be 100644
+--- a/lib/decode.c
+++ b/lib/decode.c
+@@ -13,6 +13,7 @@
+ #include <internal.h>
+ 
+ #include <stdio.h>
+#include <stdlib.h>
+ #include <sys/param.h>
+ #include <pwd.h>
+ #include <grp.h>
diff --git a/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch b/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch
new file mode 100644
index 000000000..7b39df425
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch
@@ -0,0 +1,100 @@
+From b469d621c0143e652c51bb238fd2060135aa2009 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Tue, 6 Nov 2018 17:24:05 +0100
+Subject: [PATCH] libtar: fix programming mistakes detected by static analysis
+Authored by Kamil Dudka <kdudka@redhat.com>.
+meta-openembedded uses Debian's release tarball [1]. Debian uses
+repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has
+been inactive since 2013 [3].
+Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
+[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
+[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
+[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/append.c    |  7 +++++++
+ lib/wrapper.c   | 11 +++++++----
+ libtar/libtar.c |  1 +
+ 3 files changed, 15 insertions(+), 4 deletions(-)
+diff --git a/lib/append.c b/lib/append.c
+index ff58532..6386a50 100644
+--- a/lib/append.c
+++ b/lib/append.c
+@@ -110,9 +110,16 @@ tar_append_file(TAR *t, const char *realname, const char *savename)
+                td->td_dev = s.st_dev;
+                td->td_h = libtar_hash_new(256, (libtar_hashfunc_t)ino_hash);
+                if (td->td_h == NULL)
+               {
+                       free(td);
+                        return -1;
+               }
+                if (libtar_hash_add(t->h, td) == -1)
+               {
+                       libtar_hash_free(td->td_h, free);
+                       free(td);
+                        return -1;
+               }
+        }
+        libtar_hashptr_reset(&hp);
+        if (libtar_hash_getkey(td->td_h, &hp, &(s.st_ino),
+diff --git a/lib/wrapper.c b/lib/wrapper.c
+index 44cc435..2d3f5b9 100644
+--- a/lib/wrapper.c
+++ b/lib/wrapper.c
+@@ -97,6 +97,7 @@ tar_append_tree(TAR *t, char *realdir, char *savedir)
+        struct dirent *dent;
+        DIR *dp;
+        struct stat s;
+       int ret = -1;
+ 
+ #ifdef DEBUG
+        printf("==> tar_append_tree(0x%lx, \"%s\", \"%s\")\n",
+@@ -130,24 +131,26 @@ tar_append_tree(TAR *t, char *realdir, char *savedir)
+                                 dent->d_name);
+ 
+                if (lstat(realpath, &s) != 0)
+-                       return -1;
+                       goto fail;
+ 
+                if (S_ISDIR(s.st_mode))
+                {
+                        if (tar_append_tree(t, realpath,
+                                            (savedir ? savepath : NULL)) != 0)
+-                               return -1;
+                               goto fail;
+                        continue;
+                }
+ 
+                if (tar_append_file(t, realpath,
+                                    (savedir ? savepath : NULL)) != 0)
+-                       return -1;
+                       goto fail;
+        }
+ 
+       ret = 0;
+fail:
+        closedir(dp);
+ 
+-       return 0;
+       return ret;
+ }
+ 
+ 
+diff --git a/libtar/libtar.c b/libtar/libtar.c
+index 23f8741..ac339e7 100644
+--- a/libtar/libtar.c
+++ b/libtar/libtar.c
+@@ -92,6 +92,7 @@ gzopen_frontend(char *pathname, int oflags, int mode)
+        if (!gzf)
+        {
+                errno = ENOMEM;
+               close(fd);
+                return -1;
+        }
+ 
diff --git a/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch b/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch
new file mode 100644
index 000000000..93b35cbcd
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch
@@ -0,0 +1,160 @@
+From 2c81f47508fa6bce9df84e3b43dfb16dffb742a0 Mon Sep 17 00:00:00 2001
+From: Raphael Geissert <geissert@debian.org>
+Date: Thu, 12 Sep 2024 15:51:05 +0300
+Subject: [PATCH] Avoid directory traversal when extracting archives
+Description of the vulnerability from the NIST CVE tracker [1]:
+    Multiple directory traversal vulnerabilities in the (1)
+    tar_extract_glob and (2) tar_extract_all functions in libtar 1.2.20
+    and earlier allow remote attackers to overwrite arbitrary files via
+    a .. (dot dot) in a crafted tar file.
+Imported from the Debian libtar package 1.2.20-8 [2]. Original Debian
+description:
+    Author: Raphael Geissert <geissert@debian.org>
+    Bug-Debian: https://bugs.debian.org/731860
+    Description: Avoid directory traversal when extracting archives
+    by skipping over leading slashes and any prefix containing ".." components.
+    Forwarded: yes
+meta-openembedded uses Debian's release tarball [3]. Debian uses
+repo.or.cz/libtar.git as their upstream [4]. repo.or.cz/libtar.git has
+been inactive since 2013 [5].
+CVE: CVE-2013-4420
+Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
+Comments: Added the commit message
+[1] https://nvd.nist.gov/vuln/detail/CVE-2013-4420
+[2] https://sources.debian.org/patches/libtar/1.2.20-8/CVE-2013-4420.patch/
+[3] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
+[4] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
+[5] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/decode.c   | 33 +++++++++++++++++++++++++++++++--
+ lib/extract.c  |  8 ++++----
+ lib/internal.h |  1 +
+ lib/output.c   |  4 ++--
+ 4 files changed, 38 insertions(+), 8 deletions(-)
+diff --git a/lib/decode.c b/lib/decode.c
+index 35312be..edd5f2e 100644
+--- a/lib/decode.c
+++ b/lib/decode.c
+@@ -22,13 +22,42 @@
+ # include <string.h>
+ #endif
+ 
+char *
+safer_name_suffix (char const *file_name)
+{
+       char const *p, *t;
+       p = t = file_name;
+       while (*p == '/') t = ++p;
+       while (*p)
+       {
+               while (p[0] == '.' && p[0] == p[1] && p[2] == '/')
+               {
+                       p += 3;
+                       t = p;
+               }
+               /* advance pointer past the next slash */
+               while (*p && (p++)[0] != '/');
+       }
+
+       if (!*t)
+       {
+               t = ".";
+       }
+
+       if (t != file_name)
+       {
+               /* TODO: warn somehow that the path was modified */
+       }
+       return (char*)t;
+}
+
+ 
+ /* determine full path name */
+ char *
+ th_get_pathname(TAR *t)
+ {
+        if (t->th_buf.gnu_longname)
+-               return t->th_buf.gnu_longname;
+               return safer_name_suffix(t->th_buf.gnu_longname);
+ 
+        /* allocate the th_pathname buffer if not already */
+        if (t->th_pathname == NULL)
+@@ -50,7 +79,7 @@ th_get_pathname(TAR *t)
+        }
+ 
+        /* will be deallocated in tar_close() */
+-       return t->th_pathname;
+       return safer_name_suffix(t->th_pathname);
+ }
+ 
+ 
+diff --git a/lib/extract.c b/lib/extract.c
+index 9fc6ad5..4ff1a95 100644
+--- a/lib/extract.c
+++ b/lib/extract.c
+@@ -302,14 +302,14 @@ tar_extract_hardlink(TAR * t, char *realname)
+        if (mkdirhier(dirname(filename)) == -1)
+                return -1;
+        libtar_hashptr_reset(&hp);
+-       if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t),
+       if (libtar_hash_getkey(t->h, &hp, safer_name_suffix(th_get_linkname(t)),
+                               (libtar_matchfunc_t)libtar_str_match) != 0)
+        {
+                lnp = (char *)libtar_hashptr_data(&hp);
+                linktgt = &lnp[strlen(lnp) + 1];
+        }
+        else
+-               linktgt = th_get_linkname(t);
+               linktgt = safer_name_suffix(th_get_linkname(t));
+ 
+ #ifdef DEBUG
+        printf("  ==> extracting: %s (link to %s)\n", filename, linktgt);
+@@ -347,9 +347,9 @@ tar_extract_symlink(TAR *t, char *realname)
+ 
+ #ifdef DEBUG
+        printf("  ==> extracting: %s (symlink to %s)\n",
+-              filename, th_get_linkname(t));
+              filename, safer_name_suffix(th_get_linkname(t)));
+ #endif
+-       if (symlink(th_get_linkname(t), filename) == -1)
+       if (symlink(safer_name_suffix(th_get_linkname(t)), filename) == -1)
+        {
+ #ifdef DEBUG
+                perror("symlink()");
+diff --git a/lib/internal.h b/lib/internal.h
+index da7be7f..f05ca4f 100644
+--- a/lib/internal.h
+++ b/lib/internal.h
+@@ -21,3 +21,4 @@
+ #define TLS_THREAD
+ #endif
+ 
+char* safer_name_suffix(char const*);
+diff --git a/lib/output.c b/lib/output.c
+index a5262ee..af754f1 100644
+--- a/lib/output.c
+++ b/lib/output.c
+@@ -124,9 +124,9 @@ th_print_long_ls(TAR *t)
+                else
+                        printf(" link to ");
+                if ((t->options & TAR_GNU) && t->th_buf.gnu_longlink != NULL)
+-                       printf("%s", t->th_buf.gnu_longlink);
+                       printf("%s", safer_name_suffix(t->th_buf.gnu_longlink));
+                else
+-                       printf("%.100s", t->th_buf.linkname);
+                       printf("%.100s", safer_name_suffix(t->th_buf.linkname));
+        }
+ 
+        putchar('\n');
diff --git a/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch b/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch
new file mode 100644
index 000000000..0a2773fae
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch
@@ -0,0 +1,42 @@
+From e590423f62cf5bc922ff4a1f7eab9bf7d65ee472 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Tue, 4 Oct 2022 10:39:35 +0200
+Subject: [PATCH] free memory allocated by gnu_long* fields
+Authored by Kamil Dudka <kdudka@redhat.com>.
+meta-openembedded uses Debian's release tarball [1]. Debian uses
+repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has
+been inactive since 2013 [3].
+CVE: CVE-2021-33640 CVE-2021-33645 CVE-2021-33646
+Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
+[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
+[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
+[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/handle.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+diff --git a/lib/handle.c b/lib/handle.c
+index 28a7dc2..18bd8dc 100644
+--- a/lib/handle.c
+++ b/lib/handle.c
+@@ -122,8 +122,11 @@ tar_close(TAR *t)
+                libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY
+                                        ? free
+                                        : (libtar_freefunc_t)tar_dev_free));
+-       if (t->th_pathname != NULL)
+-               free(t->th_pathname);
+
+       free(t->th_pathname);
+       free(t->th_buf.gnu_longname);
+       free(t->th_buf.gnu_longlink);
+
+        free(t);
+ 
+        return i;
diff --git a/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch b/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch
new file mode 100644
index 000000000..a61cc3b6a
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch
@@ -0,0 +1,52 @@
+From c778d234c396e78bacef7c9bff0dd2bb9fb6aac8 Mon Sep 17 00:00:00 2001
+From: shixuantong <1726671442@qq.com>
+Date: Wed, 6 Apr 2022 17:40:57 +0800
+Subject: [PATCH] Ensure that sz is greater than 0.
+Authored by shixuantong <1726671442@qq.com>.
+meta-openembedded uses Debian's release tarball [1]. Debian uses
+repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has
+been inactive since 2013 [3].
+CVE: CVE-2021-33643 CVE-2021-33644
+Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
+[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
+[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
+[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/block.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+diff --git a/lib/block.c b/lib/block.c
+index 092bc28..f12c4bc 100644
+--- a/lib/block.c
+++ b/lib/block.c
+@@ -118,6 +118,11 @@ th_read(TAR *t)
+        if (TH_ISLONGLINK(t))
+        {
+                sz = th_get_size(t);
+               if ((int)sz <= 0)
+               {
+                       errno = EINVAL;
+                       return -1;
+               }
+                blocks = (sz / T_BLOCKSIZE) + (sz % T_BLOCKSIZE ? 1 : 0);
+                if (blocks > ((size_t)-1 / T_BLOCKSIZE))
+                {
+@@ -168,6 +173,11 @@ th_read(TAR *t)
+        if (TH_ISLONGNAME(t))
+        {
+                sz = th_get_size(t);
+               if ((int)sz <= 0)
+               {
+                       errno = EINVAL;
+                       return -1;
+               }
+                blocks = (sz / T_BLOCKSIZE) + (sz % T_BLOCKSIZE ? 1 : 0);
+                if (blocks > ((size_t)-1 / T_BLOCKSIZE))
+                {
diff --git a/meta-oe/recipes-support/libtar/libtar_1.2.20.bb b/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
index f93d9c09a..c7501ac68 100644
--- a/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
+++ b/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
@@ -8,6 +8,18 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=61cbac6719ae682ce6cd45b5c11e21af"
 SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz \
           file://fix_libtool_sysroot.patch \
           file://0002-Do-not-strip-libtar.patch \
+           file://0003-Fix-missing-prototype-compiler-warnings.patch \
+           file://0004-Fix-invalid-memory-de-reference-issue.patch \
+           file://0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch \
+           file://0006-fix-memleak-on-tar_open-failure.patch \
+           file://0007-fix-memleaks-in-libtar-sample-program.patch \
+           file://0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch \
+           file://0009-Check-for-NULL-before-freeing-th_pathname.patch \
+           file://0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch \
+           file://0011-libtar-fix-programming-mistakes-detected-by-static-a.patch \
+           file://CVE-2021-33643-CVE-2021-33644.patch \
+           file://CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch \
+           file://CVE-2013-4420.patch \
           "
 S = "${WORKDIR}/${BPN}"
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
deleted file mode 100644
index 86edcc2e4..000000000
--- a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 2cc2315eecaa48fd24792aaa889dc7d9fb96978b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 20 Mar 2017 22:18:44 -0700
-Subject: [PATCH] Makefiles: Respect environment variables and add LDFLAGS to
- linker cmdline
-Fixes QA errors about GNU_HASH
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- mib-modules/Makefile | 10 +++++-----
- tools/Makefile       |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/mib-modules/Makefile b/mib-modules/Makefile
-index 0d54c9b..051d4d2 100644
--- a/mib-modules/Makefile
-+++ b/mib-modules/Makefile
-@@ -17,13 +17,13 @@ TARG                = iscsiTargetMib.so
- OBJS           = iscsiTargetMib.o iscsiMib.o scsiMib.o ipsAuthMib.o \
-                iscsiAuthData.o
- 
-CC             = gcc
-CFLAGS         = -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
-+CC             ?= gcc
-+CFLAGS         += -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
- CFLAGS         += -I../include -Wall -Werror
- #CFLAGS                +=$(AUTO_CFLAGS)
- 
-LD             = gcc -shared
-
-+LD             ?= gcc
-+LDFLAGS                += -shared
- INSTALL                = install
- 
- all: $(TARG)
-@@ -32,7 +32,7 @@ all: $(TARG)
-        $(CC) $(CFLAGS) -o $@ -c $<
- 
- $(TARG): $(OBJS)
-       $(LD) -o $@ $(OBJS)
-+       $(LD) -o $@ $(OBJS) $(LDFLAGS)
- 
- clean:
-        rm -f $(OBJS) $(TARG)
-diff --git a/tools/Makefile b/tools/Makefile
-index 79ed3cd..ffd9bf3 100644
--- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -6,7 +6,7 @@ ISCSI_NAME_OBJS      = $(ISCSI_NAME_SRCS:.c=.o)
- all:: $(ISCSI_NAME) 
- 
- $(ISCSI_NAME): $(ISCSI_NAME_OBJS)
-       $(CC) -o $@ $(CFLAGS) $(ISCSI_NAME_OBJS) 
-+       $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(ISCSI_NAME_OBJS) 
- 
- clean:
-        rm -f $(ISCSI_NAME_OBJS) $(ISCSI_NAME) 
-- 
-2.12.0
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
deleted file mode 100644
index 844e5acf9..000000000
--- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
+++ /dev/null
@@ -1,75 +0,0 @@
-SUMMARY = "lio-utils"
-DESCRIPTION = "a simple low-level configuration tool set for the Target+iSCSI (LIO)"
-HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df"
-PV = "4.1+git"
-SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \
-           file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \
-           "
-SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e"
-S = "${WORKDIR}/git"
-inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)}
-EXTRA_OEMAKE += "DESTDIR=${D}"
-do_compile() {
-    cd ${S}/tcm-py
-    distutils_do_compile
-    cd ${S}/lio-py
-    distutils_do_compile
-    if test -d ${S}/tools; then
-        oe_runmake -C ${S}/tools
-    fi
-}
-do_install() {
-    cd ${S}/tcm-py
-    distutils_do_install
-    cd ${S}/lio-py
-    distutils_do_install
-    SITE_PACKAGES=${D}/${PYTHON_SITEPACKAGES_DIR}
-    install -d ${D}/${sbindir}
-    for var in tcm_node tcm_dump tcm_loop tcm_fabric lio_dump lio_node; do
-        if [ ! -h ${D}/${sbindir}/${var} ];then
-            chmod a+x ${SITE_PACKAGES}/${var}.py
-            ln -s ${PYTHON_SITEPACKAGES_DIR}/${var}.py ${D}/${sbindir}/${var}
-        fi
-    done
-    if test -d ${S}/tools; then
-        oe_runmake -C ${S}/tools install
-    fi
-    install -d ${D}/etc/target/
-    install -d ${D}/etc/init.d/
-    install -m 755 ${S}/scripts/rc.target ${D}/etc/init.d/
-    install -m 755 ${S}/conf/tcm_start.default ${D}/etc/target/tcm_start.sh
-    install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh
-}
-SKIP_RECIPE[lio-utils] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}"
-RDEPENDS:${PN} += "python-stringold python-subprocess python-shell \
-    python-datetime python-textutils python-crypt python-netclient python-email \
-    bash"
-FILES:${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*"
-# http://errors.yoctoproject.org/Errors/Details/184712/
-# python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory
-CLEANBROKEN = "1"
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2.bb
index f1a1aae2c..f905a5ac9 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.bb
+++ b/meta-oe/recipes-support/lvm2/lvm2.bb
@@ -57,13 +57,16 @@ LVM2_PACKAGECONFIG:append:class-target = " \
 "
 PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev"
-PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules"
+PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,"
 PACKAGES =+ "libdevmapper"
 FILES:libdevmapper = " \
    ${libdir}/libdevmapper.so.* \
    ${sbindir}/dmsetup \
    ${sbindir}/dmstats \
+    ${nonarch_base_libdir}/udev/rules.d/10-dm.rules \
+    ${nonarch_base_libdir}/udev/rules.d/13-dm-disk.rules \
+    ${nonarch_base_libdir}/udev/rules.d/95-dm-notify.rules \
 "
 FILES:${PN} += " \
@@ -71,7 +74,13 @@ FILES:${PN} += " \
    ${systemd_system_unitdir} \
    ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \
    ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \
+    ${nonarch_base_libdir}/udev/rules.d/11-dm-lvm.rules \
+    ${nonarch_base_libdir}/udev/rules.d/69-dm-lvm.rules \
 "
+# Remove /lib/udev from FILES:${PN} so that any new rules files that are added
+# upstream will have to be explicitly added to either FILES:${PN} or
+# FILES:libdevmapper.
+FILES:${PN}:remove = "${nonarch_base_libdir}/udev"
 FILES:${PN}-scripts = " \
    ${sbindir}/blkdeactivate \
@@ -79,11 +88,8 @@ FILES:${PN}-scripts = " \
    ${sbindir}/lvmconf \
    ${sbindir}/lvmdump \
 "
-# Specified explicitly for the udev rules, just in case that it does not get picked
-# up automatically:
-FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
 RDEPENDS:${PN} = "bash"
-RDEPENDS:${PN}-udevrules = "libdevmapper"
 RDEPENDS:${PN}:append:class-target = " libdevmapper"
 RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 059ab6999..b46ef2570 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -18,9 +18,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
           file://0001-include-libgen.h-for-basename.patch \
           "
-SRCREV = "6de3937ac517a3ecfd6d8d90f3f055dab631157e"
+SRCREV = "207990a8770208151b2f39b51526580a9dca24c4"
 S = "${WORKDIR}/git"
-PV = "2.03.26"
+PV = "2.03.27"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
diff --git a/meta-oe/recipes-support/monit/monit_5.34.0.bb b/meta-oe/recipes-support/monit/monit_5.34.2.bb
index 7c3869789..5502a15b0 100644
--- a/meta-oe/recipes-support/monit/monit_5.34.0.bb
+++ b/meta-oe/recipes-support/monit/monit_5.34.2.bb
@@ -15,7 +15,7 @@ SRC_URI = " \
        file://monitrc \
 "
-SRC_URI[sha256sum] = "37f514cd8973bbce104cb8517ff3fc504052a083703eee0d0e873db26b919820"
+SRC_URI[sha256sum] = "291ca3d898e9b425b6d0c1768728fecd6c1cf4c268c79db15fda26285ad5b832"
 DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt"
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
index 74ae1530c..909fd77ba 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
@@ -1,7 +1,7 @@
-From 1e1ba9ecc16895bf472eae345d44631b65629611 Mon Sep 17 00:00:00 2001
+From 68160e86472b197107c60bf6e5a3d126040e85b6 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Thu, 13 Apr 2017 07:22:23 -0500
-Subject: [PATCH 01/12] RH: fixup udev rules for redhat
+Subject: [PATCH] RH: fixup udev rules for redhat
 The multipath rules need to run after scsi_id is run. This means moving
 them after 60-persistent-storage.rules for redhat. Redhat also uses a
@@ -18,17 +18,20 @@ Rebase to 0.9.8
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 Upstream-Status: Pending
+Rebase to 0.10.0
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
- Makefile.inc        | 2 +-
+ Makefile.inc           | 2 +-
- kpartx/kpartx.rules | 2 +-
+ kpartx/kpartx.rules.in | 2 +-
- multipath/Makefile  | 4 ++--
+ multipath/Makefile     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 diff --git a/Makefile.inc b/Makefile.inc
-index 5668e638..de89b21f 100644
+index 729618bd..69521882 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -59,7 +59,7 @@ tmpfilesdir   := $(systemd_prefix)lib/tmpfiles.d
+@@ -62,7 +62,7 @@ tmpfilesdir   := $(systemd_prefix)lib/tmpfiles.d
 modulesloaddir := $(systemd_prefix)lib/modules-load.d
 libudevdir     := $(systemd_prefix)lib/udev
 udevrulesdir   := $(libudevdir)/rules.d
@@ -37,16 +40,16 @@ index 5668e638..de89b21f 100644
 mandir         := $(usr_prefix)share/man
 LIB            := $(if $(shell test -d /lib64 && echo 1),lib64,lib)
 syslibdir      := $(prefix)$(LIB)
-diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
+diff --git a/kpartx/kpartx.rules.in b/kpartx/kpartx.rules.in
-index 1969dee0..d2b28233 100644
+index 9d879609..2049eb8f 100644
--- a/kpartx/kpartx.rules
+--- a/kpartx/kpartx.rules.in
-+++ b/kpartx/kpartx.rules
+++ b/kpartx/kpartx.rules.in
 @@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end"
 GOTO="kpartx_end"
 
 LABEL="run_kpartx"
-RUN+="/sbin/kpartx -un -p -part /dev/$name"
+-RUN+="@BINDIR@/kpartx -un -p -part /dev/$name"
-+RUN+="/sbin/kpartx -un /dev/$name"
+RUN+="@BINDIR@/kpartx -un /dev/$name"
 
 LABEL="kpartx_end"
 diff --git a/multipath/Makefile b/multipath/Makefile
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch
deleted file mode 100644
index 0365a7ef6..000000000
--- a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 389286b25a903be62ce7f964246824fcc20c4c67 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 26 Mar 2024 18:56:55 -0700
-Subject: [PATCH] libmultipath: always use glibc basename()
-There is a use of basename() which expects it to be GNU version of
-basename, which is not available in other libcs e.g. musl on Linux
-therefore provide a version for such cases
-Upstream-Status: Submitted [https://github.com/opensvc/multipath-tools/pull/84]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libmultipath/configure.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-diff --git a/libmultipath/configure.c b/libmultipath/configure.c
-index 4ecf6ba4..e81cc67c 100644
--- a/libmultipath/configure.c
-+++ b/libmultipath/configure.c
-@@ -43,6 +43,19 @@
- #include "sysfs.h"
- #include "io_err_stat.h"
- 
-+#ifndef __GLIBC__
-+/*
-+ * glibc's non-destructive version of basename()
-+ * License: LGPL-2.1-or-later
-+ */
-+static const char *__basename(const char *filename)
-+{
-+       char *p = strrchr(filename, '/');
-+       return p ? p + 1 : filename;
-+}
-+#define basename(x) __basename(x)
-+#endif
-+
- /* group paths in pg by host adapter
-  */
- int group_by_host_adapter(struct pathgroup *pgp, vector adapters)
-- 
-2.44.0
diff --git a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
index 4b24bd2d3..a57828049 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
@@ -1,7 +1,7 @@
-From bb6db01cc19940bb5162c1cc0c9b5f8e4c209822 Mon Sep 17 00:00:00 2001
+From e3449e163d7fe9bf1e188f0e28962f0659e9652d Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Fri, 1 Mar 2024 10:34:06 +0800
-Subject: [PATCH 02/12] RH: Remove the property blacklist exception builtin
+Subject: [PATCH] RH: Remove the property blacklist exception builtin
 Multipath set the default property blacklist exceptions to
 (ID_SCSI_VPD|ID_WWN).  This has the effect of blacklisting some internal
@@ -13,21 +13,19 @@ it.
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
-Upsteam-Status: Pending
+Upstream-Status: Pending
 [OP: Rebase to 0.9.3]
 Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 Rebase to 0.9.8
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
-Upstream-Status: Pending
 ---
 libmultipath/blacklist.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)
 diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
-index 75100b20..4fdaca76 100644
+index 17e1b54a..2cfb18b8 100644
 --- a/libmultipath/blacklist.c
 +++ b/libmultipath/blacklist.c
 @@ -221,15 +221,6 @@ setup_default_blist (struct config * conf)
diff --git a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
index 54b3bdc86..b11fb2c72 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
@@ -1,7 +1,7 @@
-From de8ee3480ec7479ed014c197a9d747403f6e0237 Mon Sep 17 00:00:00 2001
+From 06a411b15e131eb4ebc2df95dc10fcff944bead6 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Fri, 23 Nov 2018 17:25:15 +0800
-Subject: [PATCH 03/12] RH: don't start without a config file
+Subject: [PATCH] RH: don't start without a config file
 If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist
 all devices when running multipath.  A completely blank configuration file
@@ -28,7 +28,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 5 files changed, 23 insertions(+)
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index 83fa7369..8a3a8f37 100644
+index 0e3a5cc1..3fbfcc85 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
 @@ -26,6 +26,7 @@
@@ -39,7 +39,7 @@ index 83fa7369..8a3a8f37 100644
 
 /*
  * We don't support re-initialization after
-@@ -959,6 +960,23 @@ int _init_config (const char *file, struct config *conf)
+@@ -959,6 +960,23 @@ int init_config__ (const char *file, struct config *conf)
                }
                factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
                validate_pctable(conf->overrides, 0, file);
@@ -64,7 +64,7 @@ index 83fa7369..8a3a8f37 100644
 
        conf->processed_main_config = 1;
 diff --git a/libmultipath/config.h b/libmultipath/config.h
-index 384193ab..158cebf0 100644
+index 94cdf252..534b6142 100644
 --- a/libmultipath/config.h
 +++ b/libmultipath/config.h
 @@ -10,6 +10,7 @@
@@ -76,7 +76,7 @@ index 384193ab..158cebf0 100644
 enum devtypes {
        DEV_NONE,
 diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in
-index 780bf852..2c518378 100644
+index 2ac1972f..cc248231 100644
 --- a/multipath/multipath.rules.in
 +++ b/multipath/multipath.rules.in
 @@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath"
@@ -88,7 +88,7 @@ index 780bf852..2c518378 100644
 ENV{DEVTYPE}!="partition", GOTO="test_dev"
 IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH"
 diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in
-index f1cab3ff..5ae21db1 100644
+index 7bc8806e..315884eb 100644
 --- a/multipathd/multipathd.8.in
 +++ b/multipathd/multipathd.8.in
 @@ -49,6 +49,8 @@ map regains its maximum performance and redundancy.
@@ -101,7 +101,7 @@ index f1cab3ff..5ae21db1 100644
 .
 .\" ----------------------------------------------------------------------------
 diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in
-index 6d03ff71..0cd85102 100644
+index 646001e6..979e6f12 100644
 --- a/multipathd/multipathd.service.in
 +++ b/multipathd/multipathd.service.in
 @@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target
diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
index 91477a44c..6556d4af8 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
@@ -1,7 +1,7 @@
-From f1b74f21875d6d9f0a5ac3d67df40a28b167052a Mon Sep 17 00:00:00 2001
+From dd4f005ab3b38cee2776dcb0a0661c5a01befd00 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 26 Nov 2018 09:19:17 +0800
-Subject: [PATCH 04/12] RH: use rpm optflags if present
+Subject: [PATCH] RH: use rpm optflags if present
 Use the passed in optflags when compiling as an RPM, and keep the
 default flags as close as possible to the current fedora flags, while
@@ -16,15 +16,18 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 Rebase to 0.9.8
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
+Rebase to 0.10.0
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
 Makefile.inc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
 diff --git a/Makefile.inc b/Makefile.inc
-index de89b21f..6ac632ff 100644
+index 69521882..2127f208 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -95,7 +95,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
+@@ -99,7 +99,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
 MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \
                        echo "modprobe@dm_multipath.service")
 
@@ -38,18 +41,18 @@ index de89b21f..6ac632ff 100644
 +                  -Werror=implicit-function-declaration -Wno-sign-compare \
 +                  -Wno-unused-parameter -Werror=cast-qual \
 +                  -Werror=discarded-qualifiers
- WARNFLAGS      := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
+ 
-                  -Werror=implicit-function-declaration -Werror=format-security \
+ # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development.
-                  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS)
+ WARN_ONLY       :=
-@@ -105,7 +113,7 @@ CPPFLAGS    := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
+@@ -115,7 +123,7 @@ CPPFLAGS    := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
-                   -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(configdir)\" \
+                   -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(TGTDIR)$(configdir)\" \
-                   -DDEFAULT_CONFIGFILE=\"$(configfile)\" -DSTATE_DIR=\"$(statedir)\" \
+                   -DDEFAULT_CONFIGFILE=\"$(TGTDIR)$(configfile)\" -DSTATE_DIR=\"$(TGTDIR)$(statedir)\" \
                   -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
-CFLAGS         := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
+-CFLAGS         := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
-+CFLAGS         := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe
+CFLAGS         := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe \
+                   -fexceptions
 BIN_CFLAGS     := -fPIE -DPIE
 LIB_CFLAGS     := -fPIC
- SHARED_FLAGS   := -shared
 -- 
 2.25.1
diff --git a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
index c6089612b..36a7d4774 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
@@ -1,7 +1,7 @@
-From 8f52504859704466667e042baf437c2b6272ffb9 Mon Sep 17 00:00:00 2001
+From 30b85a61d665137ed1bca0d3e3d011c72758a192 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 26 Nov 2018 09:55:12 +0800
-Subject: [PATCH 05/12] RH: add mpathconf
+Subject: [PATCH] RH: add mpathconf
 mpathconf is a program (largely based on lvmcomf) to help users
 configure /etc/multipath.conf and enable or disable multipathing.  It
@@ -29,10 +29,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 create mode 100644 multipath/mpathconf.8
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index 8a3a8f37..a40b41ab 100644
+index 3fbfcc85..fbaaca8c 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
-@@ -962,6 +962,7 @@ int _init_config (const char *file, struct config *conf)
+@@ -962,6 +962,7 @@ int init_config__ (const char *file, struct config *conf)
                validate_pctable(conf->overrides, 0, file);
        } else {
                condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
diff --git a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
index 8df7de3b4..04160eaac 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
@@ -1,7 +1,7 @@
-From f93248d8e3598ccdc42b6d639107917c9cda268c Mon Sep 17 00:00:00 2001
+From bd65cdc704666dd4153779c74cdbb2cac6efea71 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 26 Sep 2019 16:29:48 +0800
-Subject: [PATCH 06/12] RH: add wwids from kernel cmdline mpath.wwids with -A
+Subject: [PATCH] RH: add wwids from kernel cmdline mpath.wwids with -A
 This patch adds another option to multipath, "-A", which reads
 /proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds
@@ -27,7 +27,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 2 files changed, 45 insertions(+)
 diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
-index 591cd09b..b01f1b85 100644
+index aac18c04..68f8e373 100644
 --- a/libmultipath/wwids.c
 +++ b/libmultipath/wwids.c
 @@ -439,3 +439,47 @@ int unmark_failed_wwid(const char *wwid)
@@ -79,7 +79,7 @@ index 591cd09b..b01f1b85 100644
 +       return ret;
 +}
 diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h
-index 0c6ee54d..e32a0b0e 100644
+index ee47ad9f..1ed0d85e 100644
 --- a/libmultipath/wwids.h
 +++ b/libmultipath/wwids.h
 @@ -17,6 +17,7 @@ int remember_wwid(char *wwid);
diff --git a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
index c64b8aeab..b435e6d67 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
@@ -1,7 +1,7 @@
-From 49d0b0279f54ceb96878e8e72e828efbb84a534c Mon Sep 17 00:00:00 2001
+From 9f1075f82ecd39a9960f868eef890baf2ba36d4e Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Fri, 1 Mar 2024 11:45:10 +0800
-Subject: [PATCH 07/12] RH: warn on invalid regex instead of failing
+Subject: [PATCH] RH: warn on invalid regex instead of failing
 multipath.conf used to allow "*" as a match everything regular expression,
 instead of requiring ".*". Instead of erroring when the old style
@@ -23,7 +23,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 1 file changed, 34 insertions(+), 6 deletions(-)
 diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index 5af036b7..e494419d 100644
+index a06a6138..a734ba9b 100644
 --- a/libmultipath/dict.c
 +++ b/libmultipath/dict.c
 @@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr)
@@ -61,7 +61,7 @@ index 5af036b7..e494419d 100644
 static int
 set_yes_no(vector strvec, void *ptr, const char *file, int line_nr)
 {
-@@ -1798,7 +1826,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec,           \
+@@ -1854,7 +1882,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec,           \
        if (!conf->option)                                              \
                return 1;                                               \
                                                                        \
@@ -70,7 +70,7 @@ index 5af036b7..e494419d 100644
        if (!buff)                                                      \
                return 1;                                               \
                                                                        \
-@@ -1818,7 +1846,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \
+@@ -1874,7 +1902,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \
        if (!conf->option)                                              \
                return 1;                                               \
                                                                        \
@@ -79,7 +79,7 @@ index 5af036b7..e494419d 100644
        if (!buff)                                                      \
                return 1;                                               \
                                                                        \
-@@ -1924,16 +1952,16 @@ device_handler(struct config *conf, vector strvec, const char *file,
+@@ -1980,16 +2008,16 @@ device_handler(struct config *conf, vector strvec, const char *file,
        return 0;
 }
 
diff --git a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
index 1fa1f3be2..9ea255cbc 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
@@ -1,7 +1,7 @@
-From fcba3e0d4c8448a2510025acb255c7335413bf56 Mon Sep 17 00:00:00 2001
+From 87e19d273c46fe78933627fc4e8046e3a76da47a Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 26 Nov 2018 11:12:01 +0800
-Subject: [PATCH 08/12] RH: reset default find_mutipaths value to off
+Subject: [PATCH] RH: reset default find_mutipaths value to off
 Upstream has changed to default find_multipaths to "strict". For now
 Redhat will retain the previous default of "off".
@@ -17,10 +17,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
-index 64b633f2..a06a8a41 100644
+index 02f7e57c..98dd66f7 100644
 --- a/libmultipath/defaults.h
 +++ b/libmultipath/defaults.h
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@
 #define DEFAULT_NO_PATH_RETRY  NO_PATH_RETRY_UNDEF
 #define DEFAULT_VERBOSITY      2
 #define DEFAULT_REASSIGN_MAPS  0
diff --git a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
index 041b79a9a..661e38f68 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
@@ -1,7 +1,7 @@
-From 7452549e572b1c40aefe25524bf4bbbf34c952e5 Mon Sep 17 00:00:00 2001
+From c22c897e7c55fc0b8c5bdd113a0357654ee895ae Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Tue, 4 Jun 2019 11:39:39 +0800
-Subject: [PATCH 09/12] multipath-tools: modify create-config.mk for
+Subject: [PATCH] multipath-tools: modify create-config.mk for
 cross-compilation
 Do not look for systemd info on the host, and allow us to pass in CFLAGS
@@ -21,7 +21,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 1 file changed, 4 deletions(-)
 diff --git a/create-config.mk b/create-config.mk
-index 4d318b96..a65975ba 100644
+index 8bd2c20c..40d2446a 100644
 --- a/create-config.mk
 +++ b/create-config.mk
 @@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0)
diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch
index b48720b8a..cf053680f 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch
@@ -1,7 +1,7 @@
-From 5d2fa3c5975266a6c02214afa6254e6eeeb1baad Mon Sep 17 00:00:00 2001
+From c34c65a3f5ddec22cb417872f90c2c9540a1847b Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 26 Nov 2018 11:17:41 +0800
-Subject: [PATCH 10/12] Subject: [PATCH] Always use devmapper
+Subject: [PATCH] Always use devmapper
 Do not try to compute several _API_ make variables
 from host information when cross-compiling.
@@ -21,7 +21,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 1 file changed, 8 insertions(+), 28 deletions(-)
 diff --git a/create-config.mk b/create-config.mk
-index a65975ba..8ba592f4 100644
+index 40d2446a..f5eb2803 100644
 --- a/create-config.mk
 +++ b/create-config.mk
 @@ -79,34 +79,14 @@ URCU_VERSION = $(shell \
diff --git a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
index abaea2cfb..0c5015142 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
@@ -1,7 +1,7 @@
-From 949070286692dfff89213792571da233fe82e440 Mon Sep 17 00:00:00 2001
+From 698361847e6fae321bc277a5fc518b2bd55751b8 Mon Sep 17 00:00:00 2001
 From: Wang Mingyu <wangmy@cn.fujitsu.com>
 Date: Sun, 10 May 2020 21:22:53 +0800
-Subject: [PATCH 11/12] fix bug of do_compile and do_install
+Subject: [PATCH] fix bug of do_compile and do_install
 when multiple processes make run in parallel,
 because of dependency error will occur.
@@ -18,10 +18,10 @@ Upstream-Status: Pending
 1 file changed, 10 insertions(+)
 diff --git a/Makefile b/Makefile
-index 4df5f161..065249c2 100644
+index f06f7faa..690dc050 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -91,6 +91,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath
+@@ -94,6 +94,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath
 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath
 mpathpersist multipathd:  libmpathpersist
 
diff --git a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
index 2f774940d..f47d8afe4 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
@@ -1,7 +1,7 @@
-From 7a46f43682641436464579d8bf76c382e71ea557 Mon Sep 17 00:00:00 2001
+From 69ee17207574ca032c3cb46a3db99736de3eedf8 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Mon, 25 May 2020 23:22:55 -0700
-Subject: [PATCH 12/12] add explicit dependency on libraries
+Subject: [PATCH] add explicit dependency on libraries
 [snip]
 gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist
@@ -24,10 +24,10 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 1 file changed, 1 insertion(+)
 diff --git a/Makefile b/Makefile
-index 065249c2..0444c2ea 100644
+index 690dc050..b775f949 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -90,6 +90,7 @@ libmultipath: libmpathutil
+@@ -93,6 +93,7 @@ libmultipath: libmpathutil
 libmpathpersist libmpathvalid multipath multipathd: libmultipath
 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath
 mpathpersist multipathd:  libmpathpersist
diff --git a/meta-oe/recipes-support/multipath-tools/files/multipathd.oe b/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
index 3bdf875e3..3bdf875e3 100755..100644
--- a/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
+++ b/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.10.0.bb
index 374cda3b4..18874e909 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.10.0.bb
@@ -41,15 +41,14 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=ma
           file://0007-RH-warn-on-invalid-regex-instead-of-failing.patch \
           file://0008-RH-reset-default-find_mutipaths-value-to-off.patch \
           file://0009-multipath-tools-modify-create-config.mk-for-cross-co.patch \
-           file://0010-Subject-PATCH-Always-use-devmapper.patch \
+           file://0010-Always-use-devmapper.patch \
           file://0011-fix-bug-of-do_compile-and-do_install.patch \
           file://0012-add-explicit-dependency-on-libraries.patch \
-           file://0001-libmultipath-always-use-glibc-basename.patch \
           "
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-SRCREV = "3daacfdfd110b24a3a7d5a276dcf8512b7039199"
+SRCREV = "ee3a70175a8a9045e5c309d5392300922e2a0625"
 S = "${WORKDIR}/git"
@@ -73,6 +72,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
 EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \
                OPTFLAGS="${CFLAGS}" \
                prefix=${prefix} \
+                etc_prefix=${sysconfdir} \
                bindir=${base_sbindir} \
                LIB=${base_libdir} libdir=${base_libdir}/multipath \
                usrlibdir=${libdir} \
diff --git a/meta-oe/recipes-support/opencv/opencv_4.9.0.bb b/meta-oe/recipes-support/opencv/opencv_4.10.0.bb
index 1a873ddef..07bdb37b7 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.9.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.10.0.bb
@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
 DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
-SRCREV_opencv = "dad8af6b17f8e60d7b95a1203a1b4d22f56574cf"
+SRCREV_opencv = "a7d942b681c5edd0cc27407d8e4d3dbf36c7a40e"
-SRCREV_contrib = "c7602a8f74205e44389bd6a4e8d727d32e7e27b4"
+SRCREV_contrib = "1aab1f34815a58a5a63aee6d510fe234129754a2"
 SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
 SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
 SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.17.0.bb
index 1d86f1abc..04e43d99c 100644
--- a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb
+++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.17.0.bb
@@ -10,7 +10,7 @@ DEPENDS = "nlohmann-json"
 SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main \
           file://0001-Fix-build-with-clang-19.patch"
-SRCREV = "baecbb95bd63df53e0af16e87bc683967962c5f8"
+SRCREV = "fa0a5200ddbe9ae6f487a228e658aedc102dab56"
 S = "${WORKDIR}/git"
 inherit cmake pkgconfig lib_package
diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.35.bb b/meta-oe/recipes-support/remmina/remmina_1.4.36.bb
index 0cad52df3..62e7d5811 100644
--- a/meta-oe/recipes-support/remmina/remmina_1.4.35.bb
+++ b/meta-oe/recipes-support/remmina/remmina_1.4.36.bb
@@ -25,7 +25,7 @@ DEPENDS = " \
 DEPENDS:append:libc-musl = " libexecinfo"
 LDFLAGS:append:libc-musl = " -lexecinfo"
-SRCREV = "2a455eadd6462457d08c2d066c5c245e0dee3bf9"
+SRCREV = "17cf7956b9f925fa788083a2db8d5e669f86bfaf"
 SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master"
 S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/snapper/snapper/0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch b/meta-oe/recipes-support/snapper/snapper/0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch
new file mode 100644
index 000000000..ec8594629
--- /dev/null
+++ b/meta-oe/recipes-support/snapper/snapper/0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch
@@ -0,0 +1,30 @@
+From d103eaeae169708ca567f092182a89b79e5ab9db Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 20 Oct 2024 07:52:33 -0700
+Subject: [PATCH 1/2] Include linux/types.h for __u16/__u32/__u64 type
+This header is included indirectly with glibc but when using musl
+it ends up with compilation failure
+BcachefsUtils.cc:85:20: error: use of undeclared identifier '__u32'
+   85 |             args.dirfd = (__u32) fddst;
+      |                           ^
+Upstream-Status: Submitted [https://github.com/openSUSE/snapper/pull/945]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ snapper/BcachefsUtils.cc | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/snapper/BcachefsUtils.cc b/snapper/BcachefsUtils.cc
+index e9163ffb..1d328a78 100644
+--- a/snapper/BcachefsUtils.cc
+++ b/snapper/BcachefsUtils.cc
+@@ -24,6 +24,7 @@
+ 
+ #include <cstring>
+ #include <cerrno>
+#include <linux/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ 
diff --git a/meta-oe/recipes-support/snapper/snapper/0002-Use-statvfs-instead-of-statvfs64.patch b/meta-oe/recipes-support/snapper/snapper/0002-Use-statvfs-instead-of-statvfs64.patch
new file mode 100644
index 000000000..b915fda25
--- /dev/null
+++ b/meta-oe/recipes-support/snapper/snapper/0002-Use-statvfs-instead-of-statvfs64.patch
@@ -0,0 +1,37 @@
+From 0b39f4484553c796cb300fb4933ea314e91d913b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 20 Oct 2024 07:55:23 -0700
+Subject: [PATCH 2/2] Use statvfs instead of statvfs64
+when using LFS64 these functions are same and also
+on 64bit systems they are same. musl is using 64bit off_t
+by default and does not define LFS64 variants of these functions
+and it ends up in build errors
+Taken from Alpine Linux: [https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/snapper/statvfs64.patch]
+Upstream-Status: Submitted [https://github.com/openSUSE/snapper/pull/945]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ snapper/FileUtils.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+diff --git a/snapper/FileUtils.cc b/snapper/FileUtils.cc
+index d4034279..4c8578a1 100644
+--- a/snapper/FileUtils.cc
+++ b/snapper/FileUtils.cc
+@@ -387,9 +387,9 @@ namespace snapper
+     std::pair<unsigned long long, unsigned long long>
+     SDir::statvfs() const
+     {
+-       struct statvfs64 fsbuf;
+-       if (fstatvfs64(dirfd, &fsbuf) != 0)
+-           SN_THROW(IOErrorException(sformat("statvfs64 failed path:%s errno:%d (%s)", base_path.c_str(),
+       struct statvfs fsbuf;
+       if (fstatvfs(dirfd, &fsbuf) != 0)
+           SN_THROW(IOErrorException(sformat("statvfs failed path:%s errno:%d (%s)", base_path.c_str(),
+                                              errno, stringerror(errno).c_str())));
+ 
+        // f_bavail is used (not f_bfree) since df seems to do the
diff --git a/meta-oe/recipes-support/snapper/snapper_0.11.2.bb b/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
new file mode 100644
index 000000000..d8987eead
--- /dev/null
+++ b/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Snapper is a tool for Linux file system snapshot management"
+HOMEPAGE = "https://github.com/openSUSE/snapper"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+DEPENDS = "acl boost btrfs-tools dbus e2fsprogs json-c libxml2 lvm2 ncurses zlib"
+# Build separation is slightly broken
+inherit autotools-brokensep pkgconfig gettext
+SRC_URI = " \
+    git://github.com/openSUSE/snapper.git;protocol=https;branch=master \
+    file://0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch \
+    file://0002-Use-statvfs-instead-of-statvfs64.patch \
+"
+SRCREV = "6c603565f36e9996d85045c8012cd04aba5f3708"
+S = "${WORKDIR}/git"
+EXTRA_OECONF += "--disable-zypp"
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'api-documentation systemd pam', d)}"
+PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
+PACKAGECONFIG[api-documentation] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native"
+# Avoid HOSTTOOLS path in binaries
+export DIFFBIN = "${bindir}/diff"
+export RMBIN = "${bindir}/rm"
+export TOUCHBIN = "${bindir}/touch"
+export CPBIN = "${bindir}/cp"
+do_install:append() {
+        install -d ${D}${sysconfdir}/sysconfig
+        install -m0644 ${S}/data/default-config ${D}${sysconfdir}/sysconfig/snapper
+}
+FILES:${PN} += "${nonarch_libdir} ${systemd_system_unitdir} ${datadir}"
+# bash is needed for the testsuite
+RDEPENDS:${PN} = "bash diffutils util-linux util-linux-mount"
diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch
deleted file mode 100644
index f21ad5d70..000000000
--- a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 896d77dd949b52d6ea5798e5a038ba97d6b802be Mon Sep 17 00:00:00 2001
-From: Peter Marko <peter.marko@siemens.com>
-Date: Thu, 4 Apr 2024 15:44:18 +0200
-Subject: [PATCH] macros: guard ipv6 code with SYSLOG_NG_ENABLE_IPV6
-With ipv6 disabled, there are linking errors currently.
-This fixes it by not using the symbols when IPv6 is disabled.
-Solves #4810 with my config options
-https://github.com/openembedded/meta-openembedded/blob/2487e65ee3842b6ae0c7a2628985be6189ed9ebf/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb
-Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/4880]
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
- lib/template/macros.c | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/lib/template/macros.c b/lib/template/macros.c
-index 54142706c..fcb83637f 100644
--- a/lib/template/macros.c
-+++ b/lib/template/macros.c
-@@ -277,12 +277,14 @@ _get_originating_ip_protocol(const LogMessage *msg)
-     return 0;
-   if (g_sockaddr_inet_check(msg->saddr))
-     return 4;
-+#if SYSLOG_NG_ENABLE_IPV6
-   if (g_sockaddr_inet6_check(msg->saddr))
-     {
-       if (g_sockaddr_inet6_is_v4_mapped(msg->saddr))
-         return 4;
-       return 6;
-     }
-+#endif
-   return 0;
- }
- 
-- 
-2.30.2
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb
index ab4a8d182..588a38126 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb
@@ -13,7 +13,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec"
 # util-linux added to get libuuid
-DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl"
+DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl json-c"
 SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \
           file://syslog-ng.conf.systemd \
@@ -23,11 +23,10 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta
           file://syslog-ng-tmp.conf \
           file://syslog-ng.service-the-syslog-ng-service.patch \
           file://0001-Fix-buildpaths-warning.patch \
-           file://0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch \
 "
 SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch"
-SRC_URI[sha256sum] = "b69e3360dfb96a754a4e1cbead4daef37128b1152a23572356db4ab64a475d4f"
+SRC_URI[sha256sum] = "b601265362c633a25f26c497a7e57592739d5a583b7963b722ff58f01b853506"
 UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch
new file mode 100644
index 000000000..3d76aa4e4
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch
@@ -0,0 +1,33 @@
+From fff1b1773bff2ef7c3b867ab019d69faa36c010d Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Wed, 3 Jul 2024 13:36:54 -0700
+Subject: [PATCH] WebKitDOMEventTarget.h:95: Warning: WebKit2WebExtension:
+ invalid "scope" annotation: only valid on callback parameters
+ https://bugs.webkit.org/show_bug.cgi?id=276180
+Unreviewed build fix.
+Emmanuele recommends using (type gpointer) for the GCallback parameter
+of webkit_dom_event_target_remove_event_listener, since it won't be
+called and is therefore not functioning as a callback.
+* Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h:
+Canonical link: https://commits.webkit.org/280639@main
+Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/fff1b1773bff2ef7c3b867ab019d69faa36c010d]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ .../InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h           | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
+@@ -92,7 +92,7 @@ WEBKIT_DEPRECATED gboolean  webkit_dom_e
+  * webkit_dom_event_target_remove_event_listener:
+  * @target: A #WebKitDOMEventTarget
+  * @event_name: A #gchar
+- * @handler: (scope call): A #GCallback
+ * @handler: (type gpointer): A #GCallback
+  * @use_capture: A #gboolean
+  *
+  * Returns: a #gboolean
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb
index 9493d8642..01eefe13d 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb
@@ -16,6 +16,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
           file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \
           file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
           file://0001-Fix-build-issues-with-latest-Clang.patch \
+           file://fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch \
           "
 SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54"
@@ -93,9 +94,8 @@ EXTRA_OECMAKE = " \
        -DENABLE_MINIBROWSER=ON \
        -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \
                "
-# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the
+# pass -g1 to massively reduce the size of the debug symbols (4.3GB to 700M at time of writing)
-# debug symbols (4.3GB to 700M at time of writing)
+DEBUG_LEVELFLAG = "-g1"
-DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}"
 # Javascript JIT is not supported on ARC
 EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF "
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb
index 994adef3a..50c387d25 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0"
 SECTION = "libs"
-SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \
+SRC_URI = "https://github.com/lsh123/xmlsec/releases/download/${PR}/${BP}.tar.gz \
           file://fix-ltmain.sh.patch \
           file://change-finding-path-of-nss.patch \
           file://makefile-ptest.patch \
diff --git a/meta-oe/recipes-test/catch2/catch2_3.7.0.bb b/meta-oe/recipes-test/catch2/catch2_3.7.1.bb
index 2d571a9cf..35cdab5e8 100644
--- a/meta-oe/recipes-test/catch2/catch2_3.7.0.bb
+++ b/meta-oe/recipes-test/catch2/catch2_3.7.1.bb
@@ -5,7 +5,7 @@ LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https"
-SRCREV = "31588bb4f56b638dd5afc28d3ebff9b9dcefb88d"
+SRCREV = "fa43b77429ba76c462b1898d6cd2f2d7a9416b14"
 S = "${WORKDIR}/git"
@@ -16,6 +16,7 @@ do_install:append() {
    rm ${D}${datadir}/Catch2/gdbinit
    rmdir ${D}${datadir}/Catch2/
 }
 # Header-only library
 RDEPENDS:${PN}-dev = ""
 RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf
index fb1fe8845..057fb05b2 100644
--- a/meta-perl/conf/layer.conf
+++ b/meta-perl/conf/layer.conf
@@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1"
 LAYERDEPENDS_perl-layer = "core openembedded-layer"
-LAYERSERIES_COMPAT_perl-layer = "styhead"
+LAYERSERIES_COMPAT_perl-layer = "styhead walnascar"
diff --git a/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb b/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb
index a5d28265d..28dbf1399 100644
--- a/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb
+++ b/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Constructs and (by default) mails MIME messages. \
               It is entirely driven from the command line, it is \
               designed to be used by other programs, or people who act \
               like programs."
-HOMEPAGE = "http://search.cpan.org/~rosch/mime-construct/mime-construct"
+HOMEPAGE = "https://metacpan.org/release/ROSCH/mime-construct-1.11/view/mime-construct"
 SECTION = "mail"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=5e2e5da619ac8ef8c84767ccc4656e96"
@@ -12,7 +12,6 @@ SRC_URI = "${CPAN_MIRROR}/authors/id/R/RO/ROSCH/mime-construct-${PV}.tar.gz \
    file://fix-mime-construct-help-return-value.patch \
 "
-SRC_URI[md5sum] = "73834ea780fbea81b89dbd9b2fb54f58"
 SRC_URI[sha256sum] = "4cd7bb61b51d41192d1498c1051aa6a4ccd75aeb09b71d2ec706a7084a4a9303"
 inherit cpan
diff --git a/meta-perl/recipes-perl/adduser/adduser_3.118.bb b/meta-perl/recipes-perl/adduser/adduser_3.118.bb
index 3ac2211aa..431b41a2d 100644
--- a/meta-perl/recipes-perl/adduser/adduser_3.118.bb
+++ b/meta-perl/recipes-perl/adduser/adduser_3.118.bb
@@ -11,7 +11,6 @@ SRC_URI = "https://launchpad.net/debian/+archive/primary/+sourcefiles/adduser/${
           file://0001-adduser-set-default-shell-with-sbin-nologin.patch \
 "
-SRC_URI[md5sum] = "44ba2475ebdaafc9613236bdda321c97"
 SRC_URI[sha256sum] = "3e9eea661c9aac6b2c791bfcc1de3a9c6a422d45c8f3d38ed417737ed3166ffc"
 S = "${WORKDIR}/${BPN}"
diff --git a/meta-perl/recipes-perl/libalgorithm/libalgorithm-diff-perl_1.15.bb b/meta-perl/recipes-perl/libalgorithm/libalgorithm-diff-perl_1.15.bb
index d87df0974..cef17fb40 100644
--- a/meta-perl/recipes-perl/libalgorithm/libalgorithm-diff-perl_1.15.bb
+++ b/meta-perl/recipes-perl/libalgorithm/libalgorithm-diff-perl_1.15.bb
@@ -7,13 +7,12 @@ program.   It is guaranteed to find the *smallest possible* set of \
 differences. \
 "
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~nedkonz/Algorithm-Diff/"
+HOMEPAGE = "https://metacpan.org/release/NEDKONZ/Algorithm-Diff-1.15"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://lib/Algorithm/Diff.pm;beginline=406;endline=409;md5=d393b8ad3b8994b9d0ae9299b8a8a1ee"
 SRC_URI = "${CPAN_MIRROR}/authors/id/N/NE/NEDKONZ/Algorithm-Diff-${PV}.tar.gz"
-SRC_URI[md5sum] = "457cd497a0411a88b47d3741eb176071"
 SRC_URI[sha256sum] = "aa848b75ad3ecc32d31e8651909551e851cceef74a32822c7a3cb35c259f5190"
 S = "${WORKDIR}/Algorithm-Diff-${PV}"
diff --git a/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb b/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb
index ee7c4d750..835fd2f6c 100644
--- a/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb
+++ b/meta-perl/recipes-perl/libauthen/libauthen-radius-perl_0.22.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "The Authen::Radius module provides a simple class that \
    Radius server. \
 "
-HOMEPAGE = "http://search.cpan.org/~manowar/RadiusPerl"
+HOMEPAGE = "https://metacpan.org/release/MANOWAR/RadiusPerl"
 SECTION = "libs"
 LICENSE = "Artistic-2.0"
@@ -12,11 +12,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=78ab6ea0cba1f1ec1680ebb149e3bc11"
 DEPENDS = "perl"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MANOWAR/RadiusPerl-${PV}.tar.gz \
+SRC_URI = "${CPAN_MIRROR}/authors/id/M/MA/MANOWAR/RadiusPerl-${PV}.tar.gz \
           file://test.pl-adjust-for-ptest.patch \
           file://run-ptest \
 "
-SRC_URI[md5sum] = "d1fe2d6ecf7ea99299e4e3a8f945aad8"
 SRC_URI[sha256sum] = "3b276506986ccaa4949d92b13ce053a0017ad11562a991cc753364923fe81ca7"
 S = "${WORKDIR}/Authen-Radius-${PV}"
diff --git a/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.16.bb b/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.1700.bb
index a9eec6950..f0913c5b5 100644
--- a/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.16.bb
+++ b/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.1700.bb
@@ -2,7 +2,7 @@ SUMMARY = "SASL Authentication framework for Perl"
 DESCRIPTION = "SASL is a generic mechanism for authentication used by several network \
 protocols. Authen::SASL provides an implementation framework that all \
 protocols should be able to share."
-HOMEPAGE = "http://search.cpan.org/dist/Authen-SASL/"
+HOMEPAGE = "https://metacpan.org/dist/Authen-SASL/"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
@@ -11,11 +11,10 @@ LIC_FILES_CHKSUM = "file://lib/Authen/SASL/Perl.pm;beginline=1;endline=3;md5=171
 DEPENDS = "perl"
 RDEPENDS:${PN} = "libdigest-hmac-perl"
-SRC_URI = "http://www.cpan.org/authors/id/G/GB/GBARR/Authen-SASL-${PV}.tar.gz \
+SRC_URI = "${CPAN_MIRROR}/authors/id/E/EH/EHUELS/Authen-SASL-${PV}.tar.gz \
           file://run-ptest \
          "
-SRC_URI[md5sum] = "7c03a689d4c689e5a9e2f18a1c586b2f"
+SRC_URI[sha256sum] = "b86d5a576b8d387aee24f39f47a54afd14bb66b09003db5065001f1de03a8ece"
-SRC_URI[sha256sum] = "6614fa7518f094f853741b63c73f3627168c5d3aca89b1d02b1016dc32854e09"
 S = "${WORKDIR}/Authen-SASL-${PV}"
diff --git a/meta-perl/recipes-perl/libcapture/libcapture-tiny-perl_0.48.bb b/meta-perl/recipes-perl/libcapture/libcapture-tiny-perl_0.48.bb
index a51d327a3..e37101d72 100644
--- a/meta-perl/recipes-perl/libcapture/libcapture-tiny-perl_0.48.bb
+++ b/meta-perl/recipes-perl/libcapture/libcapture-tiny-perl_0.48.bb
@@ -8,14 +8,13 @@ a dozen capturing modules to use in any particular situation and just use \
 this one."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~dagolden/Capture-Tiny/"
+HOMEPAGE = "https://metacpan.org/dist/Capture-Tiny"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=37a4918a30ace24395020e5b8c03b83f"
 SRCNAME = "Capture-Tiny"
 SRC_URI = "${CPAN_MIRROR}/authors/id/D/DA/DAGOLDEN/${SRCNAME}-${PV}.tar.gz"
-SRC_URI[md5sum] = "f5d24083ad270f8326dd659dd83eeb54"
 SRC_URI[sha256sum] = "6c23113e87bad393308c90a207013e505f659274736638d8c79bac9c67cc3e19"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.66.bb b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.66.bb
index 94fb4393c..42100acec 100644
--- a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.66.bb
+++ b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.66.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "CGI.pm is a stable, complete and mature solution for processing a
 HTTP requests and responses. Major features including processing form \
 submissions, file uploads, reading and writing cookies, query string generation \
 and manipulation, and processing and preparing HTTP headers."
-HOMEPAGE = "http://search.cpan.org/~leejo/CGI-4.28/lib/CGI.pod"
+HOMEPAGE = "https://metacpan.org/pod/CGI"
 SECTION = "libs"
 LICENSE = "Artistic-2.0 | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=415fc49abed2728f9480cd32c8d67beb"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz"
 SRC_URI[sha256sum] = "4697437688a193e3f02556e1d223015590c1f2800b40becf83dc12d5cc5ed8e1"
diff --git a/meta-perl/recipes-perl/libconfig-tiny/libconfig-tiny-perl_2.30.bb b/meta-perl/recipes-perl/libconfig-tiny/libconfig-tiny-perl_2.30.bb
index ccdc1e0cb..f232c3585 100644
--- a/meta-perl/recipes-perl/libconfig-tiny/libconfig-tiny-perl_2.30.bb
+++ b/meta-perl/recipes-perl/libconfig-tiny/libconfig-tiny-perl_2.30.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Config::Tiny is a Perl class to read and write .ini \
 configuration files with as little code as possible, reducing load time and \
 memory overhead."
-HOMEPAGE = "https://search.cpan.org/dist/Config-Tiny"
+HOMEPAGE = "https://metacpan.org/dist/Config-Tiny"
 SECTION = "libraries"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
@@ -13,7 +13,7 @@ RDEPENDS:${PN} += "perl"
 S = "${WORKDIR}/Config-Tiny-${PV}"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RS/RSAVAGE/Config-Tiny-${PV}.tgz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/R/RS/RSAVAGE/Config-Tiny-${PV}.tgz"
 SRC_URI[sha256sum] = "b2f7345619b3b8e636dd39ea010731c9dc2bfb8f022bcbd86ae6ad17866e110d"
diff --git a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
index 5c3701f16..8331a1d4a 100644
--- a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
+++ b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Config::AutoConf is intended to provide the same opportunities to
 developers as GNU Autoconf <http://www.gnu.org/software/autoconf/> does for \
 Shell developers."
-HOMEPAGE=       "https://metacpan.org/release/Config-AutoConf"
+HOMEPAGE = "https://metacpan.org/release/Config-AutoConf"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
@@ -16,7 +16,6 @@ file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf
 SRC_URI = "${CPAN_MIRROR}/authors/id/R/RE/REHSACK/Config-AutoConf-${PV}.tar.gz"
-SRC_URI[md5sum] = "eeeab8cc93eef7dd2e2c343ecdf247b7"
 SRC_URI[sha256sum] = "304f66cc2653264c0fe127d21669e86d3d18cd72f2574d8f5131beec31a0a33e"
 RDEPENDS:${PN} += "libcapture-tiny-perl"
 RDEPENDS:${PN} += "perl-module-base"
diff --git a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.15.bb b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.15.bb
index d64fc296e..dd6cd8041 100644
--- a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.15.bb
+++ b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.15.bb
@@ -1,9 +1,10 @@
 SUMMARY = "Guess OpenSSL include path"
 SECTION = "libs"
+HOMEPAGE = "https://metacpan.org/pod/Crypt::OpenSSL::Guess"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ea914cc2718e8d53bd7744d96e66c03c"
-SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-Guess-${PV}.tar.gz "
+SRC_URI = "${CPAN_MIRROR}/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-${PV}.tar.gz"
 SRC_URI[sha256sum] = "1c5033381819fdb4c9087dd291b90ec70e7810d31d57eade9b388eccfd70386d"
diff --git a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.17.bb b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.17.bb
index c15d41713..c55f7f768 100644
--- a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.17.bb
+++ b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.17.bb
@@ -1,10 +1,11 @@
 SUMMARY = "Crypt::OpenSSL::Random - OpenSSL/LibreSSL pseudo-random number generator access"
 SECTION = "libs"
+HOMEPAGE = "https://metacpan.org/pod/Crypt::OpenSSL::Random"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9e876d4149406d88b4ff1b37645363ad"
-SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-Random-${PV}.tar.gz "
+SRC_URI = "${CPAN_MIRROR}/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-${PV}.tar.gz"
 SRC_URI[sha256sum] = "a571b24181baaa76c96704e92acffc6934ff593e380dade274db4e43c140ad51"
 S = "${WORKDIR}/Crypt-OpenSSL-Random-${PV}"
diff --git a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb
index aa8d138f2..36f96d59c 100644
--- a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb
+++ b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb
@@ -1,9 +1,10 @@
 SUMMARY = "Crypt Openssl RSA cpan module"
 SECTION = "libs"
+HOMEPAGE = "https://metacpan.org/pod/Crypt::OpenSSL::RSA"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a67ceecc5d9a91a5a0d003ba50c26346"
-SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-RSA-${PV}.tar.gz \
+SRC_URI = "${CPAN_MIRROR}/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-${PV}.tar.gz \
 "
 SRC_URI[sha256sum] = "bdbe630f6d6f540325746ad99977272ac8664ff81bd19f0adaba6d6f45efd864"
diff --git a/meta-perl/recipes-perl/libcurses/libcurses-perl_1.45.bb b/meta-perl/recipes-perl/libcurses/libcurses-perl_1.45.bb
index 7951e0ddb..f44020986 100644
--- a/meta-perl/recipes-perl/libcurses/libcurses-perl_1.45.bb
+++ b/meta-perl/recipes-perl/libcurses/libcurses-perl_1.45.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "lib-curses provides an interface between Perl programs and \
 the curses library."
 SECTION = "libs"
+HOMEPAGE = "https://metacpan.org/pod/Curses"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=26;endline=30;md5=0b37356c5e9e28080a3422d82af8af09"
 DEPENDS += "perl ncurses "
-SRC_URI = "http://www.cpan.org/authors/id/G/GI/GIRAFFED/Curses-${PV}.tar.gz \
+SRC_URI = "${CPAN_MIRROR}/authors/id/G/GI/GIRAFFED/Curses-${PV}.tar.gz \
           file://0001-testtyp.c-Use-proper-prototype-for-main-function.patch \
           "
diff --git a/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb b/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb
index 4493a7e5e..f52d0034f 100644
--- a/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb
+++ b/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb
@@ -7,7 +7,7 @@ of each line shows the printable characters \
 (all others are shown as single dots).\
 "
-HOMEPAGE = "http://search.cpan.org/~ftassin/Data-HexDump-0.02/lib/Data/HexDump.pm"
+HOMEPAGE = "https://metacpan.org/pod/Data::HexDump"
 SECTION = "libs"
 LICENSE = "Artistic-1.0"
@@ -15,10 +15,9 @@ LIC_FILES_CHKSUM = "file://lib/Data/HexDump.pm;beginline=215;endline=217;md5=bf1
 DEPENDS = "perl"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/F/FT/FTASSIN/Data-HexDump-${PV}.tar.gz \
+SRC_URI = "${CPAN_MIRROR}/authors/id/F/FT/FTASSIN/Data-HexDump-${PV}.tar.gz \
           file://run-ptest \
 "
-SRC_URI[md5sum] = "467b7183d1062ab4a502b50c34e7d67f"
 SRC_URI[sha256sum] = "1a9d843e7f667c1c6f77c67af5d77e7462ff23b41937cb17454d03535cd9be70"
 S = "${WORKDIR}/Data-HexDump-${PV}"
diff --git a/meta-perl/recipes-perl/libdevel/libdevel-globaldestruction-perl_0.14.bb b/meta-perl/recipes-perl/libdevel/libdevel-globaldestruction-perl_0.14.bb
index 1dcecd0dc..e8450c7ac 100644
--- a/meta-perl/recipes-perl/libdevel/libdevel-globaldestruction-perl_0.14.bb
+++ b/meta-perl/recipes-perl/libdevel/libdevel-globaldestruction-perl_0.14.bb
@@ -10,7 +10,6 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=53;endline=55;md5=935dadb9423774f53548e5cd5055d41a"
 SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Devel-GlobalDestruction-${PV}.tar.gz"
-SRC_URI[md5sum] = "24221ba322cf2dc46a1fc99b53e2380b"
 SRC_URI[sha256sum] = "34b8a5f29991311468fe6913cadaba75fd5d2b0b3ee3bb41fe5b53efab9154ab"
 S = "${WORKDIR}/Devel-GlobalDestruction-${PV}"
diff --git a/meta-perl/recipes-perl/libdigest/libdigest-hmac-perl_1.03.bb b/meta-perl/recipes-perl/libdigest/libdigest-hmac-perl_1.05.bb
index 43b7f4d5a..5bbabf24d 100644
--- a/meta-perl/recipes-perl/libdigest/libdigest-hmac-perl_1.03.bb
+++ b/meta-perl/recipes-perl/libdigest/libdigest-hmac-perl_1.05.bb
@@ -1,18 +1,17 @@
 SUMMARY = "Keyed-Hashing for Message Authentication"
 DESCRIPTION = "Keyed-Hashing for Message Authentication"
-HOMEPAGE = "http://search.cpan.org/~gaas/Digest-HMAC-1.03/"
+HOMEPAGE = "https://metacpan.org/pod/Digest::HMAC"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-LIC_FILES_CHKSUM = "file://README;beginline=13;endline=17;md5=da980cdc026faa065e5d5004115334e6"
+LIC_FILES_CHKSUM = "file://README;beginline=6;endline=9;md5=6321739e9ccbf74ee5dd2eb82c42d609"
 RDEPENDS:${PN} = "libdigest-sha1-perl perl-module-extutils-makemaker perl-module-digest-md5"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-HMAC-${PV}.tar.gz \
+SRC_URI = "${CPAN_MIRROR}/authors/id/A/AR/ARODLAND/Digest-HMAC-${PV}.tar.gz \
           file://run-ptest \
          "
-SRC_URI[md5sum] = "e6a5d6f552da16eacb5157ea4369ff9d"
+SRC_URI[sha256sum] = "215cb59cba610745cfb2d4b3f8ef756d590e57e3ad7986a992e87c4969fcdc7a"
-SRC_URI[sha256sum] = "3bc72c6d3ff144d73aefb90e9a78d33612d58cf1cd1631ecfb8985ba96da4a59"
 S = "${WORKDIR}/Digest-HMAC-${PV}"
diff --git a/meta-perl/recipes-perl/libdigest/libdigest-sha1-perl_2.13.bb b/meta-perl/recipes-perl/libdigest/libdigest-sha1-perl_2.13.bb
index df89c9bcd..dbfe8d3d2 100644
--- a/meta-perl/recipes-perl/libdigest/libdigest-sha1-perl_2.13.bb
+++ b/meta-perl/recipes-perl/libdigest/libdigest-sha1-perl_2.13.bb
@@ -1,15 +1,14 @@
 SUMMARY = "Perl interface to the SHA-1 algorithm "
 DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm"
-HOMEPAGE = "http://search.cpan.org/~gaas/Digest-SHA1-2.13/"
+HOMEPAGE = "https://metacpan.org/pod/Digest::SHA1"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=10;endline=14;md5=ff5867ebb4bc1103a7a416aef2fce00a"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-${PV}.tar.gz \
+SRC_URI = "${CPAN_MIRROR}/authors/id/G/GA/GAAS/Digest-SHA1-${PV}.tar.gz \
           file://run-ptest \
          "
-SRC_URI[md5sum] = "bd22388f268434f2b24f64e28bf1aa35"
 SRC_URI[sha256sum] = "68c1dac2187421f0eb7abf71452a06f190181b8fc4b28ededf5b90296fb943cc"
 S = "${WORKDIR}/Digest-SHA1-${PV}"
diff --git a/meta-perl/recipes-perl/libenv/libenv-perl_1.04.bb b/meta-perl/recipes-perl/libenv/libenv-perl_1.04.bb
index 79fff9d52..f88a418a4 100644
--- a/meta-perl/recipes-perl/libenv/libenv-perl_1.04.bb
+++ b/meta-perl/recipes-perl/libenv/libenv-perl_1.04.bb
@@ -3,15 +3,14 @@ DESCRIPTION = "Perl maintains environment variables in a special hash named %ENV
 For when this access method is inconvenient, the Perl module Env allows environment \
 variables to be treated as scalar or array variables."
-HOMEPAGE = "http://search.cpan.org/~flora/Env/"
+HOMEPAGE = "https://metacpan.org/dist/Env/"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=76c1cbf18db56b3340d91cb947943bd3"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Env-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/F/FL/FLORA/Env-${PV}.tar.gz"
-SRC_URI[md5sum] = "fdba5c0690e66972c96fee112cf5f25c"
 SRC_URI[sha256sum] = "d94a3d412df246afdc31a2199cbd8ae915167a3f4684f7b7014ce1200251ebb0"
 S = "${WORKDIR}/Env-${PV}"
diff --git a/meta-perl/recipes-perl/liberror/liberror-perl_0.17029.bb b/meta-perl/recipes-perl/liberror/liberror-perl_0.17029.bb
index e54bb11cc..83baf2a02 100644
--- a/meta-perl/recipes-perl/liberror/liberror-perl_0.17029.bb
+++ b/meta-perl/recipes-perl/liberror/liberror-perl_0.17029.bb
@@ -31,9 +31,8 @@ RDEPENDS:${PN}-ptest += " \
    perl-module-test-more \
 "
-SRC_URI = "http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Error-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/S/SH/SHLOMIF/Error-${PV}.tar.gz"
-SRC_URI[md5sum] = "6732b1c6207e4a9a3e2987c88368039a"
 SRC_URI[sha256sum] = "1a23f7913032aed6d4b68321373a3899ca66590f4727391a091ec19c95bf7adc"
 S = "${WORKDIR}/Error-${PV}"
diff --git a/meta-perl/recipes-perl/libextutils/libextutils-config-perl_0.008.bb b/meta-perl/recipes-perl/libextutils/libextutils-config-perl_0.008.bb
index a58d96582..b6e80cd88 100644
--- a/meta-perl/recipes-perl/libextutils/libextutils-config-perl_0.008.bb
+++ b/meta-perl/recipes-perl/libextutils/libextutils-config-perl_0.008.bb
@@ -2,13 +2,12 @@ SUMMARY = "ExtUtils::Config - A wrapper for perl's configuration"
 DESCRIPTION = "ExtUtils::Config is an abstraction around the %Config hash."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~leont/ExtUtils-Config/"
+HOMEPAGE = "https://metacpan.org/dist/ExtUtils-Config"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1932ab4d8b84c25fd7967aa18088e57e"
 SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/ExtUtils-Config-${PV}.tar.gz"
-SRC_URI[md5sum] = "565a7b09c7cac5907a25bbe2c959a717"
 SRC_URI[sha256sum] = "ae5104f634650dce8a79b7ed13fb59d67a39c213a6776cfdaa3ee749e62f1a8c"
 S = "${WORKDIR}/ExtUtils-Config-${PV}"
diff --git a/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.27.bb b/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.27.bb
index 45b772650..c7accb317 100644
--- a/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.27.bb
+++ b/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.27.bb
@@ -6,7 +6,7 @@ It can generate the necessary options to the Module::Build constructor or \
 to ExtUtils::MakeMaker's WriteMakefile function."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~smueller/ExtUtils-CppGuess/"
+HOMEPAGE = "https://metacpan.org/pod/ExtUtils::CppGuess"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=81;endline=84;md5=84c0390b90ea8c6702ce659b67bed699"
diff --git a/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.028.bb b/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.028.bb
index 3ee9df730..e03496d78 100644
--- a/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.028.bb
+++ b/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.028.bb
@@ -2,7 +2,7 @@ SUMMARY = "ExtUtils::Helpers - Various portability utilities for module builders
 DESCRIPTION = "This module provides various portable helper function for module building modules."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~leont/ExtUtils-Helpers/"
+HOMEPAGE = "https://metacpan.org/pod/ExtUtils::Helpers"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c0280160e4f26faafef507664884bf63"
diff --git a/meta-perl/recipes-perl/libextutils/libextutils-installpaths-perl_0.012.bb b/meta-perl/recipes-perl/libextutils/libextutils-installpaths-perl_0.012.bb
index 07dab4e16..25de3fc5d 100644
--- a/meta-perl/recipes-perl/libextutils/libextutils-installpaths-perl_0.012.bb
+++ b/meta-perl/recipes-perl/libextutils/libextutils-installpaths-perl_0.012.bb
@@ -3,13 +3,12 @@ DESCRIPTION = "This module tries to make install path resolution as easy \
 as possible."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~leont/ExtUtils-InstallPaths/"
+HOMEPAGE = "https://metacpan.org/pod/ExtUtils::InstallPaths"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b6fa54d873ce6bcf4809ea88bdf97769"
 SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-${PV}.tar.gz"
-SRC_URI[md5sum] = "9a8d66aab1ffec98ea260faf03ac612b"
 SRC_URI[sha256sum] = "84735e3037bab1fdffa3c2508567ad412a785c91599db3c12593a50a1dd434ed"
 S = "${WORKDIR}/ExtUtils-InstallPaths-${PV}"
diff --git a/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb b/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb
index 43b5b60ef..c3a85f6f4 100644
--- a/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb
+++ b/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb
@@ -7,14 +7,13 @@ and variables to Perl values."
 SECTION = "libs"
-HOMEPAGE = "http://metapan.org/release/ExtUtils-ParseXS/"
+HOMEPAGE = "https://metacpan.org/release/SMUELLER/ExtUtils-ParseXS-3.35"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=120;endline=129;md5=eb858f0e3b1b0bee0c05b86a474ae2b6"
 SRCNAME = "ExtUtils-ParseXS"
 SRC_URI = "${CPAN_MIRROR}/authors/id/S/SM/SMUELLER/${SRCNAME}-${PV}.tar.gz"
-SRC_URI[md5sum] = "2ae41036d85e98e1369645724962dd16"
 SRC_URI[sha256sum] = "41def0511278a2a8ba9afa25ccab45b0453f75e7fd774e8644b5f9a57cc4ee1c"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/meta-perl/recipes-perl/libfile/libfile-slurp-perl_9999.19.bb b/meta-perl/recipes-perl/libfile/libfile-slurp-perl_9999.19.bb
index 1012ae952..7a6a9aadd 100644
--- a/meta-perl/recipes-perl/libfile/libfile-slurp-perl_9999.19.bb
+++ b/meta-perl/recipes-perl/libfile/libfile-slurp-perl_9999.19.bb
@@ -4,16 +4,16 @@ DESCRIPTION = "This module provides subroutines to read or write \
  reading the list of filenames in a directory. \
 "
 SECTION = "libs"
+HOMEPAGE = "https://metacpan.org/release/URI/File-Slurp-9999.19"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=37;endline=41;md5=255fbd5f98a90d51d9908d31271ae4d4"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/U/UR/URI/File-Slurp-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/U/UR/URI/File-Slurp-${PV}.tar.gz"
 S = "${WORKDIR}/File-Slurp-${PV}"
 inherit cpan
-SRC_URI[md5sum] = "7d584cd15c4f8b9547765eff8c4ef078"
 SRC_URI[sha256sum] = "ce29ebe995097ebd6e9bc03284714cdfa0c46dc94f6b14a56980747ea3253643"
 BBCLASSEXTEND="native"
diff --git a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.014.bb b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.014.bb
index e29abb3e3..410ce8046 100644
--- a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.014.bb
+++ b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.014.bb
@@ -6,7 +6,7 @@ errors, write functions don't return any meaningful value."
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-HOMEPAGE=       "https://metacpan.org/release/File-Slurper"
+HOMEPAGE = "https://metacpan.org/release/File-Slurper"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
 file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61"
diff --git a/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.72.bb b/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.72.bb
index 216d7c413..64330ceea 100644
--- a/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.72.bb
+++ b/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.72.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "This package contains the Parser.pm module with friends."
-HOMEPAGE = "https://metacpan.org/release/HTML-Parser"
+HOMEPAGE = "https://metacpan.org/release/GAAS/HTML-Parser-3.72"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://README;md5=b0459e4426b94753b9a9b8a15f1223b8"
 DEPENDS += "perl"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/G/GA/GAAS/HTML-Parser-${PV}.tar.gz"
-SRC_URI[md5sum] = "eb7505e5f626913350df9dd4a03d54a8"
 SRC_URI[sha256sum] = "ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b"
 S = "${WORKDIR}/HTML-Parser-${PV}"
diff --git a/meta-perl/recipes-perl/libhtml/libhtml-tagset-perl_3.20.bb b/meta-perl/recipes-perl/libhtml/libhtml-tagset-perl_3.20.bb
index c871b97c3..a0ce7c0b2 100644
--- a/meta-perl/recipes-perl/libhtml/libhtml-tagset-perl_3.20.bb
+++ b/meta-perl/recipes-perl/libhtml/libhtml-tagset-perl_3.20.bb
@@ -8,7 +8,6 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=62;endline=66;md5=aa91eed6adfe182d2af676954f06a7c9"
 SRC_URI = "${CPAN_MIRROR}/authors/id/P/PE/PETDANCE/HTML-Tagset-${PV}.tar.gz"
-SRC_URI[md5sum] = "d2bfa18fe1904df7f683e96611e87437"
 SRC_URI[sha256sum] = "adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2"
 S = "${WORKDIR}/HTML-Tagset-${PV}"
diff --git a/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb b/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb
index d2c151bf5..7bdebcd37 100644
--- a/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb
+++ b/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb
@@ -6,7 +6,7 @@ libwww-perl distribution, but are now unbundled in order to facilitate \
 a separate development track."
 SECTION = "libs"
-HOMEPAGE = "http://www.cpan.org/authors/id/C/CJ/CJM/HTML-Tree-${PV}.readme"
+HOMEPAGE = "https://metacpan.org/release/CJM/HTML-Tree-5.03/source/README"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3eb57a8958cae73cb65e7d0c26339242"
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3eb57a8958cae73cb65e7d0c26339242"
 SRC_URI = "${CPAN_MIRROR}/authors/id/C/CJ/CJM/HTML-Tree-${PV}.tar.gz \
           file://bin-htmltree-fix-shebang.patch \
 "
-SRC_URI[md5sum] = "d9271d60b872ed6fbe68b2d0fe8c450e"
 SRC_URI[sha256sum] = "7d6d73fca622aa74855a8b088faa39454a0f91b7af83c9ec0387f01eefc2148f"
 S = "${WORKDIR}/HTML-Tree-${PV}"
@@ -26,6 +25,13 @@ export PERL_USE_UNSAFE_INC = "1"
 DEPENDS += "libmodule-build-perl-native \
 "
+do_install:append() {
+  sed -i \
+    -e 's|${TMPDIR}||g' \
+    `find ${D}/usr/share/doc/perl/html/site/lib/HTML/ -type f` \
+    `find ${D}/usr/lib/perl5 -type f -name .packlist`
+}
 RPROVIDES:${PN} = " libhtml-element-perl \
    libhtml-tree-assubs-perl \
    libhtml-tree-perl \
diff --git a/meta-perl/recipes-perl/libimport/libimport-into-perl_1.002004.bb b/meta-perl/recipes-perl/libimport/libimport-into-perl_1.002004.bb
index e88d60d13..c16c358fc 100644
--- a/meta-perl/recipes-perl/libimport/libimport-into-perl_1.002004.bb
+++ b/meta-perl/recipes-perl/libimport/libimport-into-perl_1.002004.bb
@@ -11,13 +11,12 @@ directly, since they effect the current unit of compilation. \
 SECTION = "libs"
-HOMEPAGE = "https://metacpan.org/pod/Import-Into/"
+HOMEPAGE = "https://metacpan.org/pod/Import::Into"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=209;endline=223;md5=3cf363f1e405dea6db2c6cd0ef23680c"
 SRC_URI = "${CPAN_MIRROR}/authors/id/E/ET/ETHER/Import-Into-${PV}.tar.gz"
-SRC_URI[md5sum] = "70f2f3b08a5b706ee382a8448c346cb1"
 SRC_URI[sha256sum] = "decb259bc2ff015fe3dac85e4a287d4128e9b0506a0b2c5fa7244836a68b1084"
 S = "${WORKDIR}/Import-Into-${PV}"
diff --git a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.089.bb b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.089.bb
index e745cecaf..689c46b90 100644
--- a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.089.bb
+++ b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.089.bb
@@ -6,7 +6,7 @@ needs to write a full-featured SSL client or server application: \
 multiple SSL contexts, cipher selection, certificate verification, and \
 SSL version selection. As an extra bonus, it works perfectly with \
 mod_perl."
-HOMEPAGE = "http://search.cpan.org/dist/IO-Socket-SSL/"
+HOMEPAGE = "https://metacpan.org/dist/IO-Socket-SSL"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
diff --git a/meta-perl/recipes-perl/libio/libio-stringy-perl_2.111.bb b/meta-perl/recipes-perl/libio/libio-stringy-perl_2.111.bb
index b74593923..5c5ccf7db 100644
--- a/meta-perl/recipes-perl/libio/libio-stringy-perl_2.111.bb
+++ b/meta-perl/recipes-perl/libio/libio-stringy-perl_2.111.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=01406e4ff2e60d88d42ef1caebdd0011"
 SRC_URI = "${CPAN_MIRROR}/authors/id/D/DS/DSKOLL/IO-stringy-${PV}.tar.gz"
-SRC_URI[md5sum] = "e91acf0a800b190d13585a47de775bdd"
 SRC_URI[sha256sum] = "8c67fd6608c3c4e74f7324f1404a856c331dbf48d9deda6aaa8296ea41bf199d"
 S = "${WORKDIR}/IO-stringy-${PV}"
diff --git a/meta-perl/recipes-perl/libipc/libipc-signal-perl_1.00.bb b/meta-perl/recipes-perl/libipc/libipc-signal-perl_1.00.bb
index 203db7b10..43a6ff652 100644
--- a/meta-perl/recipes-perl/libipc/libipc-signal-perl_1.00.bb
+++ b/meta-perl/recipes-perl/libipc/libipc-signal-perl_1.00.bb
@@ -2,7 +2,7 @@ SUMMARY = "IPC::Signal - Utility functions dealing with signals"
 DESCRIPTION = "IPC::Signal - This module contains utility functions for \
 dealing with signals."
-HOMEPAGE = "http://search.cpan.org/~rosch/IPC-Signal-1.00/"
+HOMEPAGE = "https://metacpan.org/release/ROSCH/IPC-Signal-1.00"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
@@ -10,9 +10,8 @@ LIC_FILES_CHKSUM = "file://README;beginline=16;endline=18;md5=f36550f59a0ae5e6e3
 S = "${WORKDIR}/IPC-Signal-${PV}"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RO/ROSCH/IPC-Signal-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/R/RO/ROSCH/IPC-Signal-${PV}.tar.gz"
-SRC_URI[md5sum] = "4cebf17fdf1785eaf8c151bf2e8c360a"
 SRC_URI[sha256sum] = "7c21f9c8c2d0c0f0f0f46e77de7c3d879dd562668ddf0525875c38cef2076fd0"
 inherit cpan
diff --git a/meta-perl/recipes-perl/liblocale/liblocale-gettext-perl_1.07.bb b/meta-perl/recipes-perl/liblocale/liblocale-gettext-perl_1.07.bb
index 1e4b56353..9774ac55d 100644
--- a/meta-perl/recipes-perl/liblocale/liblocale-gettext-perl_1.07.bb
+++ b/meta-perl/recipes-perl/liblocale/liblocale-gettext-perl_1.07.bb
@@ -4,14 +4,13 @@ functions for retrieving message strings from databases constructed to \
 internationalize software."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~pvandry/Locale-gettext-${PV}/"
+HOMEPAGE = "https://metacpan.org/pod/Locale::gettext"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;md5=d028249c2d08dca6ca6c5bb43b56d926"
 SRC_URI = "${CPAN_MIRROR}/authors/id/P/PV/PVANDRY/Locale-gettext-${PV}.tar.gz"
-SRC_URI[md5sum] = "bc652758af65c24500f1d06a77415019"
 SRC_URI[sha256sum] = "909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15"
 S = "${WORKDIR}/Locale-gettext-${PV}"
diff --git a/meta-perl/recipes-perl/libmime/libmime-charset-perl_1.013.1.bb b/meta-perl/recipes-perl/libmime/libmime-charset-perl_1.013.1.bb
index 27ed41e99..a39081851 100644
--- a/meta-perl/recipes-perl/libmime/libmime-charset-perl_1.013.1.bb
+++ b/meta-perl/recipes-perl/libmime/libmime-charset-perl_1.013.1.bb
@@ -1,7 +1,7 @@
 SUMMARY = "MIME::Charset - Charset Information for MIME."
 DESCRIPTION = "MIME::Charset provides information about character sets used for MIME \
 messages on Internet."
-HOMEPAGE = "http://search.cpan.org/~nezumi/MIME-Charset-${PV}/"
+HOMEPAGE = "https://metacpan.org/release/NEZUMI/MIME-Charset-1.013.1"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
diff --git a/meta-perl/recipes-perl/libmime/libmime-types-perl_2.26.bb b/meta-perl/recipes-perl/libmime/libmime-types-perl_2.26.bb
index fa4ad6fc4..9b4dc1cab 100644
--- a/meta-perl/recipes-perl/libmime/libmime-types-perl_2.26.bb
+++ b/meta-perl/recipes-perl/libmime/libmime-types-perl_2.26.bb
@@ -5,13 +5,13 @@ is transmitted. Sometimes real knowledge about a mime-type is need.\
 \n\
 This module maintains a set of MIME::Type objects, which each describe \
 one known mime type."
-HOMEPAGE = "http://search.cpan.org/~markov/MIME-Types-${PV}"
+HOMEPAGE = "https://metacpan.org/release/MARKOV/MIME-Types-2.26"
 SECTION = "libraries"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=11;md5=963ce28228347875ace682de56eef8e8"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MIME-Types-${PV}.tar.gz \
+SRC_URI = "${CPAN_MIRROR}/authors/id/M/MA/MARKOV/MIME-Types-${PV}.tar.gz \
           file://run-ptest \
          "
 SRC_URI[sha256sum] = "bc738483cb4cdb47d61e85fe9304fa929aa9ab927e3171ec2ba2ab1cd7cefdff"
diff --git a/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.048.bb b/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.048.bb
index 860185007..bab9c5c95 100644
--- a/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.048.bb
+++ b/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.048.bb
@@ -7,7 +7,7 @@ Whereas Module::Build has over 6,700 lines of code; this module has less than \
 120, yet supports the features needed by most distributions."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~leont/Module-Build-Tiny/"
+HOMEPAGE = "https://metacpan.org/release/LEONT/Module-Build-Tiny-0.048"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2b9e8b5e2bd19fcc97ac84b78a271a64"
@@ -21,6 +21,13 @@ S = "${WORKDIR}/Module-Build-Tiny-${PV}"
 inherit cpan_build ptest-perl
+do_install:append() {
+  sed -i \
+    -e 's|${TMPDIR}||g' \
+    `find ${D}/usr/lib/perl5 -type f -name .packlist`
+}
 RDEPENDS:${PN} += " \
    libextutils-config-perl \
    libextutils-helpers-perl \
diff --git a/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb b/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb
index 538fa30d3..fac74ba97 100644
--- a/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb
+++ b/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb
@@ -17,7 +17,6 @@ LIC_FILES_CHKSUM = "file://README;beginline=322;endline=325;md5=086450ce010f6fda
 SRCNAME = "Module-Pluggable"
 SRC_URI = "${CPAN_MIRROR}/authors/id/S/SI/SIMONW/${SRCNAME}-${PV}.tar.gz"
-SRC_URI[md5sum] = "87ce2971662efd0b69a81bb4dc9ea76c"
 SRC_URI[sha256sum] = "b3f2ad45e4fd10b3fb90d912d78d8b795ab295480db56dc64e86b9fa75c5a6df"
diff --git a/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb b/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb
index 205df6802..0ed61ac3a 100644
--- a/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb
+++ b/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb
@@ -14,14 +14,13 @@ are applied on any Perl version where the bugs exist, except for a case where \
 one of the bugs cannot be adequately worked around in pure Perl."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~zefram/Module-Runtime/"
+HOMEPAGE = "https://metacpan.org/dist/Module-Runtime"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=36;endline=44;md5=9416434672a57853d6181f3da9094963"
 SRCNAME = "Module-Runtime"
 SRC_URI = "${CPAN_MIRROR}/authors/id/Z/ZE/ZEFRAM/${SRCNAME}-${PV}.tar.gz"
-SRC_URI[md5sum] = "d3d47222fa2e3dfcb4526f6cc8437b20"
 SRC_URI[sha256sum] = "68302ec646833547d410be28e09676db75006f4aa58a11f3bdb44ffe99f0f024"
 UPSTREAM_CHECK_REGEX = "Module\-Runtime\-(?P<pver>(\d+\.\d+)).tar"
diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.46.bb b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.47.bb
index 18ba6336f..e83701397 100644
--- a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.46.bb
+++ b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.47.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "This package contains the DNS.pm module with friends."
-HOMEPAGE = "http://www.net-dns.org/"
+HOMEPAGE = "https://metacpan.org/pod/Net::DNS"
 SECTION = "libs"
 LICENSE = "MIT"
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=252;endline=269;md5=de95b6a896d5f861
 DEPENDS += "perl"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz"
-SRC_URI[sha256sum] = "91b65cd0f12461802c61ca5474f87b3e29f5182d2e1b3a2ea70702a3efb4a743"
+SRC_URI[sha256sum] = "fec3dab10ac82dbac26b1ae2e367909256f420835d96cda7dc1b508e29938f0b"
 UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb b/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb
index fe7bb3326..ba79922ba 100644
--- a/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb
+++ b/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb
@@ -5,8 +5,7 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://README;beginline=165;endline=192;md5=6ef523fa09e8c272675839e21de16bde"
-SRC_URI = "https://cpan.metacpan.org/authors/id/W/WI/WILLEM/Net-DNS-SEC-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/W/WI/WILLEM/Net-DNS-SEC-${PV}.tar.gz"
-SRC_URI[md5sum] = "ffa55a9898192c9d4c623cb1357eba9b"
 SRC_URI[sha256sum] = "37a47d4def72d7338f3cc7cd807ec19bd9e2ae638ae656fa536cf0314801989e"
 DEPENDS += "openssl"
diff --git a/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb b/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb
index a77381dce..a7793200a 100644
--- a/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb
+++ b/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://README;beginline=3;endline=5;md5=4d6588c2fa0d38ae162f
 SRC_URI = "${CPAN_MIRROR}/authors/id/M/MA/MARSCHAP/perl-ldap-${PV}.tar.gz"
-SRC_URI[md5sum] = "d091ed00302f0276069bca9df9478744"
 SRC_URI[sha256sum] = "e2f389fe3e7a9e4b61488692919ad723b98f3b479b5288f610daa8c27995b351"
 S = "${WORKDIR}/perl-ldap-${PV}"
diff --git a/meta-perl/recipes-perl/libnet/libnet-libidn-perl_0.12.bb b/meta-perl/recipes-perl/libnet/libnet-libidn-perl_0.12.bb
index 4c4faab4d..f56b5a26e 100644
--- a/meta-perl/recipes-perl/libnet/libnet-libidn-perl_0.12.bb
+++ b/meta-perl/recipes-perl/libnet/libnet-libidn-perl_0.12.bb
@@ -6,14 +6,13 @@ Turbo Fredriksson's PHP-IDN. \
 "
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-HOMEPAGE = "http://search.cpan.org/dist/Net-LibIDN/"
+HOMEPAGE = "https://metacpan.org/dist/Net-LibIDN/"
 DEPENDS += "libidn"
 # We must need glibc-gconvs to enable charset related functions,
 # such as Net::LibIDN::idn_to_ascii().
 RDEPENDS:${PN}:append:libc-glibc = " glibc-gconvs"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TH/THOR/Net-LibIDN-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/T/TH/THOR/Net-LibIDN-${PV}.tar.gz"
-SRC_URI[md5sum] = "c3e4de2065009d67bcb1df0afb473e12"
 SRC_URI[sha256sum] = "2f8acc9442b3866ec7dc63cd449fc693ae3e930d5d3e5e9430fbb6f393bdbb17"
 SRC_URI += "file://libidn-wr-cross-compile.patch"
diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb
index 5d0eccd84..d09f756fb 100644
--- a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb
+++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb
@@ -4,7 +4,7 @@ web pages on SSL servers (for symmetry, same API is offered for \
 accessing http servers, too), a sslcat() function for writing your own \
 clients, and finally access to the SSL api of SSLeay/OpenSSL package \
 so you can write servers or clients for more complicated applications."
-HOMEPAGE = "http://search.cpan.org/dist/Net-SSLeay/"
+HOMEPAGE = "https://metacpan.org/dist/Net-SSLeay"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
@@ -23,11 +23,10 @@ RDEPENDS:${PN} += "\
    zlib \
 "
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-${PV}.tar.gz \
+SRC_URI = "${CPAN_MIRROR}/authors/id/M/MI/MIKEM/Net-SSLeay-${PV}.tar.gz \
           file://no-exec-on-configure.patch \
           file://run-ptest \
          "
-SRC_URI[md5sum] = "d602bdce4e0531c6efc276e3e429ca69"
 SRC_URI[sha256sum] = "9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8"
 S = "${WORKDIR}/Net-SSLeay-${PV}"
diff --git a/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.05.bb b/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.05.bb
index d1365f269..2e79a3b1c 100644
--- a/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.05.bb
+++ b/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.05.bb
@@ -8,14 +8,13 @@ These interactive features include the ability to specify a time-out and to \
 wait for patterns to appear in the input stream, such as the prompt from a \
 shell."
-HOMEPAGE = "http://search.cpan.org/dist/Net-Telnet/"
+HOMEPAGE = "https://metacpan.org/dist/Net-Telnet"
 SECTION = "Development/Libraries"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=4;endline=7;md5=e94ab3b72335e3cdadd6c1ff736dd714"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JR/JROGERS/Net-Telnet-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/J/JR/JROGERS/Net-Telnet-${PV}.tar.gz"
-SRC_URI[md5sum] = "c8573c57a2d9469f038c40ac284b1e5f"
 SRC_URI[sha256sum] = "677f68ba2cd2a824fae323fa82e183bf7e3d03c3c499c91d923bd6283796a743"
 S = "${WORKDIR}/Net-Telnet-${PV}"
diff --git a/meta-perl/recipes-perl/libproc/libproc-waitstat-perl_1.00.bb b/meta-perl/recipes-perl/libproc/libproc-waitstat-perl_1.00.bb
index 643a704a1..d9424ed4d 100644
--- a/meta-perl/recipes-perl/libproc/libproc-waitstat-perl_1.00.bb
+++ b/meta-perl/recipes-perl/libproc/libproc-waitstat-perl_1.00.bb
@@ -2,7 +2,7 @@ SUMMARY = "Interpret and act on wait() status values"
 DESCRIPTION = "This module contains functions for interpreting and acting \
 on wait status values."
-HOMEPAGE = "http://search.cpan.org/~rosch/Proc-WaitStat/"
+HOMEPAGE = "https://metacpan.org/dist/Proc-WaitStat"
 SECTION = "libraries"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
@@ -12,9 +12,8 @@ RDEPENDS:${PN} += "perl libipc-signal-perl"
 S = "${WORKDIR}/Proc-WaitStat-${PV}"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RO/ROSCH/Proc-WaitStat-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/R/RO/ROSCH/Proc-WaitStat-${PV}.tar.gz"
-SRC_URI[md5sum] = "b911bd579b6b142391b21de1efa30c95"
 SRC_URI[sha256sum] = "d07563f5e787909d16e7390241e877f49ab739b1de9d0e2ea1a41bd0bf4474bc"
 inherit cpan
diff --git a/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002004.bb b/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002004.bb
index c5efc1535..8ccd269e6 100644
--- a/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002004.bb
+++ b/meta-perl/recipes-perl/librole/librole-tiny-perl_2.002004.bb
@@ -9,7 +9,6 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=197;endline=234;md5=26df7e7c20551fb1906e2286624f0b71"
 SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Role-Tiny-${PV}.tar.gz"
-SRC_URI[md5sum] = "9ee45591befa3d0b1094ac75d282b6ba"
 SRC_URI[sha256sum] = "d7bdee9e138a4f83aa52d0a981625644bda87ff16642dfa845dcb44d9a242b45"
 S = "${WORKDIR}/Role-Tiny-${PV}"
diff --git a/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb b/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
index cf290d990..6b1c4e8c0 100644
--- a/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
+++ b/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb
@@ -28,7 +28,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c195
    file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
 "
-SRC_URI[md5sum] = "a6bc06b3f7749f7d77a2b1bd13402821"
 SRC_URI[sha256sum] = "16a29f7acaeec081bf0e7303ba5ee24fda1d21a1104669b837745f3ea61d6afa"
 S = "${WORKDIR}/Unix-Statgrab-${PV}"
diff --git a/meta-perl/recipes-perl/libstrictures/libstrictures-perl_2.000006.bb b/meta-perl/recipes-perl/libstrictures/libstrictures-perl_2.000006.bb
index 80c21b2b1..5a779a673 100644
--- a/meta-perl/recipes-perl/libstrictures/libstrictures-perl_2.000006.bb
+++ b/meta-perl/recipes-perl/libstrictures/libstrictures-perl_2.000006.bb
@@ -29,7 +29,6 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=246;endline=262;md5=43be558cf4f19823cdd6af22135cf5f8"
 SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/strictures-${PV}.tar.gz"
-SRC_URI[md5sum] = "35c14fd25320f32ff40e977feae95d0d"
 SRC_URI[sha256sum] = "09d57974a6d1b2380c802870fed471108f51170da81458e2751859f2714f8d57"
 S = "${WORKDIR}/strictures-${PV}"
diff --git a/meta-perl/recipes-perl/libsub/libsub-exporter-progressive-perl_0.001013.bb b/meta-perl/recipes-perl/libsub/libsub-exporter-progressive-perl_0.001013.bb
index d51ab2171..10f0fa204 100644
--- a/meta-perl/recipes-perl/libsub/libsub-exporter-progressive-perl_0.001013.bb
+++ b/meta-perl/recipes-perl/libsub/libsub-exporter-progressive-perl_0.001013.bb
@@ -14,7 +14,6 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=003fa970662359a43ac2c2961108b0f1"
 SRC_URI = "${CPAN_MIRROR}/authors/id/F/FR/FREW/Sub-Exporter-Progressive-${PV}.tar.gz"
-SRC_URI[md5sum] = "72cf6acdd2a0a8b105821a4db98e4ebe"
 SRC_URI[sha256sum] = "d535b7954d64da1ac1305b1fadf98202769e3599376854b2ced90c382beac056"
 S = "${WORKDIR}/Sub-Exporter-Progressive-${PV}"
diff --git a/meta-perl/recipes-perl/libsub/libsub-uplevel-perl_0.2800.bb b/meta-perl/recipes-perl/libsub/libsub-uplevel-perl_0.2800.bb
index 3a0de9757..1981ae4a9 100644
--- a/meta-perl/recipes-perl/libsub/libsub-uplevel-perl_0.2800.bb
+++ b/meta-perl/recipes-perl/libsub/libsub-uplevel-perl_0.2800.bb
@@ -17,7 +17,6 @@ CPAN_AUTHOR = "DAGOLDEN"
 SRC_URI = "${CPAN_MIRROR}/authors/id/D/DA/${CPAN_AUTHOR}/${CPAN_PACKAGE}-${PV}.tar.gz"
-SRC_URI[md5sum] = "6c6a174861fd160e8d5871a86df00baf"
 SRC_URI[sha256sum] = "b4f3f63b80f680a421332d8851ddbe5a8e72fcaa74d5d1d98f3c8cc4a3ece293"
 S = "${WORKDIR}/${CPAN_PACKAGE}-${PV}"
diff --git a/meta-perl/recipes-perl/libterm/libterm-readkey-perl_2.38.bb b/meta-perl/recipes-perl/libterm/libterm-readkey-perl_2.38.bb
index f4ce3131d..3f184badf 100644
--- a/meta-perl/recipes-perl/libterm/libterm-readkey-perl_2.38.bb
+++ b/meta-perl/recipes-perl/libterm/libterm-readkey-perl_2.38.bb
@@ -6,7 +6,7 @@ handy functions for working with terminals. One of the main goals is to \
 have the functions as portable as possible, so you can just plug in 'use \
 Term::ReadKey' on any architecture and have a good likelihood of it \
 working."
-HOMEPAGE = "http://search.cpan.org/~jstowe/TermReadKey-${PV}"
+HOMEPAGE = "https://metacpan.org/release/JSTOWE/TermReadKey-2.38"
 SECTION = "libraries"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://README;md5=c275db663c8489a5709ebb22b185add5"
 SRC_URI = "${CPAN_MIRROR}/authors/id/J/JS/JSTOWE/TermReadKey-${PV}.tar.gz"
-SRC_URI[md5sum] = "b2b4aab7a0e6bddb7ac3b21ba637482c"
 SRC_URI[sha256sum] = "5a645878dc570ac33661581fbb090ff24ebce17d43ea53fd22e105a856a47290"
 S = "${WORKDIR}/TermReadKey-${PV}"
diff --git a/meta-perl/recipes-perl/libtest/libtest-nowarnings-perl_1.04.bb b/meta-perl/recipes-perl/libtest/libtest-nowarnings-perl_1.04.bb
index d74a34729..fe178b46c 100644
--- a/meta-perl/recipes-perl/libtest/libtest-nowarnings-perl_1.04.bb
+++ b/meta-perl/recipes-perl/libtest/libtest-nowarnings-perl_1.04.bb
@@ -16,7 +16,7 @@ run when any forked children exit."
 SECTION = "libs"
 LICENSE = "LGPL-2.1-only"
-HOMEPAGE= "https://metacpan.org/release/Test-NoWarnings"
+HOMEPAGE = "https://metacpan.org/release/ADAMK/Test-NoWarnings-1.04"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d8045f3b8f929c1cb29a1e3fd737b499"
@@ -25,7 +25,6 @@ CPAN_AUTHOR = "ADAMK"
 SRC_URI = "${CPAN_MIRROR}/authors/id/A/AD/${CPAN_AUTHOR}/${CPAN_PACKAGE}-${PV}.tar.gz"
-SRC_URI[md5sum] = "682ed043f7d3e38f3dfd8745fd21c49a"
 SRC_URI[sha256sum] = "638a57658cb119af1fe5b15e73d47c2544dcfef84af0c6b1b2e97f08202b686c"
 RDEPENDS:${PN} += "perl-module-test-builder perl-module-test-more perl-module-test-tester"
diff --git a/meta-perl/recipes-perl/libtest/libtest-warn-perl_0.37.bb b/meta-perl/recipes-perl/libtest/libtest-warn-perl_0.37.bb
index 5148fbeb0..0f0816df9 100644
--- a/meta-perl/recipes-perl/libtest/libtest-warn-perl_0.37.bb
+++ b/meta-perl/recipes-perl/libtest/libtest-warn-perl_0.37.bb
@@ -7,7 +7,7 @@ the time to go take a look. \
 "
 SECTION = "libs"
-HOMEPAGE= "https://metacpan.org/release/Test-Warn"
+HOMEPAGE = "https://metacpan.org/release/Test-Warn"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=73;endline=78;md5=42b423d91c92ba59c215835a2ee9b57a"
diff --git a/meta-perl/recipes-perl/libtext/libtext-charwidth-perl_0.04.bb b/meta-perl/recipes-perl/libtext/libtext-charwidth-perl_0.04.bb
index 29118129a..8f16aa1ec 100644
--- a/meta-perl/recipes-perl/libtext/libtext-charwidth-perl_0.04.bb
+++ b/meta-perl/recipes-perl/libtext/libtext-charwidth-perl_0.04.bb
@@ -10,14 +10,13 @@ width of the first character of the given string and mbswidth() gives the \
 width of the whole given string."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~kubota/Text-CharWidth-${PV}/"
+HOMEPAGE = "https://metacpan.org/release/KUBOTA/Text-CharWidth-0.04"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;md5=d8d54c8c500cbdd57a4c15911d9d96db"
 SRC_URI = "${CPAN_MIRROR}/authors/id/K/KU/KUBOTA/Text-CharWidth-${PV}.tar.gz"
-SRC_URI[md5sum] = "37a723df0580c0758c0ee67b37336c15"
 SRC_URI[sha256sum] = "abded5f4fdd9338e89fd2f1d8271c44989dae5bf50aece41b6179d8e230704f8"
 S = "${WORKDIR}/Text-CharWidth-${PV}"
diff --git a/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb b/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb
index 9dfadde8e..9c473d15a 100644
--- a/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb
+++ b/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb
@@ -6,7 +6,7 @@ faster than shelling out to a system's diff executable for small files, \
 and generally slower on larger files."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~ovid/Text-Diff/"
+HOMEPAGE = "https://metacpan.org/release/OVID/Text-Diff-1.41"
 LICENSE = "Artistic-1.0 | GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=385c55653886acac3821999a3ccd17b3"
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=385c55653886acac3821999a3ccd17b3"
 SRC_URI = "${CPAN_MIRROR}/authors/id/O/OV/OVID/Text-Diff-${PV}.tar.gz \
           file://run-ptest \
          "
-SRC_URI[md5sum] = "30d56e6dd5551ca16b8e16cc7299dc21"
 SRC_URI[sha256sum] = "a67f50a48e313c1680cc662109ce5f913ea71454db355d0cf4db87ac89d2d2fa"
 S = "${WORKDIR}/Text-Diff-${PV}"
diff --git a/meta-perl/recipes-perl/libtext/libtext-iconv-perl_1.7.bb b/meta-perl/recipes-perl/libtext/libtext-iconv-perl_1.7.bb
index 1e8405cab..80c976561 100644
--- a/meta-perl/recipes-perl/libtext/libtext-iconv-perl_1.7.bb
+++ b/meta-perl/recipes-perl/libtext/libtext-iconv-perl_1.7.bb
@@ -8,13 +8,13 @@ Settings of fromcode and tocode and their permitted combinations are \
 implementation-dependent. Valid values are specified in the system \
 documentation."
 SECTION = "libs"
+HOMEPAGE = "https://metacpan.org/pod/Text::Iconv"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=3;endline=6;md5=fadf2919c7128e887d26b4d905f90649"
 RRECOMMENDS:${PN}:append:libc-glibc = " glibc-gconvs"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MP/MPIOTR/Text-Iconv-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/M/MP/MPIOTR/Text-Iconv-${PV}.tar.gz"
-SRC_URI[md5sum] = "81b26e069eaebb084e91ea3c009b67ae"
 SRC_URI[sha256sum] = "5b80b7d5e709d34393bcba88971864a17b44a5bf0f9e4bcee383d029e7d2d5c3"
 S = "${WORKDIR}/Text-Iconv-${PV}"
diff --git a/meta-perl/recipes-perl/libtext/libtext-wrapi18n-perl_0.06.bb b/meta-perl/recipes-perl/libtext/libtext-wrapi18n-perl_0.06.bb
index 017e951d3..7bc2e234a 100644
--- a/meta-perl/recipes-perl/libtext/libtext-wrapi18n-perl_0.06.bb
+++ b/meta-perl/recipes-perl/libtext/libtext-wrapi18n-perl_0.06.bb
@@ -11,14 +11,13 @@ characters). Also, minimal handling of languages which doesn't use \
 whitespaces between words (like Chinese and Japanese) is supported."
 SECTION = "libs"
-HOMEPAGE = "http://search.cpan.org/~kubota/Text-WrapI18N-${PV}/"
+HOMEPAGE = "https://metacpan.org/release/KUBOTA/Text-WrapI18N-0.06"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://README;md5=080862e1e40cdcddef4393e137285858"
 SRC_URI = "${CPAN_MIRROR}/authors/id/K/KU/KUBOTA/Text-WrapI18N-${PV}.tar.gz"
-SRC_URI[md5sum] = "0799c16a00926e6c18d400c2e2861d5f"
 SRC_URI[sha256sum] = "4bd29a17f0c2c792d12c1005b3c276f2ab0fae39c00859ae1741d7941846a488"
 S = "${WORKDIR}/Text-WrapI18N-${PV}"
diff --git a/meta-perl/recipes-perl/libunicode/libunicode-linebreak-perl_2019.001.bb b/meta-perl/recipes-perl/libunicode/libunicode-linebreak-perl_2019.001.bb
index a7a998c35..ae922d9dd 100644
--- a/meta-perl/recipes-perl/libunicode/libunicode-linebreak-perl_2019.001.bb
+++ b/meta-perl/recipes-perl/libunicode/libunicode-linebreak-perl_2019.001.bb
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://README;beginline=5;endline=9;md5=b5e8b1099b86b86fbc31
 SRC_URI = "${CPAN_MIRROR}/authors/id/N/NE/NEZUMI/Unicode-LineBreak-${PV}.tar.gz"
-SRC_URI[md5sum] = "003d6da7a13700e069afed9238c864b9"
 SRC_URI[sha256sum] = "486762e4cacddcc77b13989f979a029f84630b8175e7fef17989e157d4b6318a"
 S = "${WORKDIR}/Unicode-LineBreak-${PV}"
diff --git a/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb b/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb
index 7962d22c9..4393fbd91 100644
--- a/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb
+++ b/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb
@@ -8,12 +8,11 @@ of putting all characters into a single event. \
 "
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-HOMEPAGE = "http://search.cpan.org/dist/XML-Filter-BufferText/"
+HOMEPAGE = "https://metacpan.org/dist/XML-Filter-BufferText"
 DEPENDS += "libxml-sax-perl-native"
 RDEPENDS:${PN} += "libxml-sax-perl"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RB/RBERJON/XML-Filter-BufferText-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/R/RB/RBERJON/XML-Filter-BufferText-${PV}.tar.gz"
-SRC_URI[md5sum] = "2992c0387632583b966ab9c965b25512"
 SRC_URI[sha256sum] = "8fd2126d3beec554df852919f4739e689202cbba6a17506e9b66ea165841a75c"
 LIC_FILES_CHKSUM = "file://BufferText.pm;beginline=88;endline=90;md5=497aa6d79cc84c3d769a2a0016bee928"
diff --git a/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb b/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb
index f184b89e5..e0ed6e7c3 100644
--- a/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb
+++ b/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb
@@ -6,7 +6,7 @@ The module is split into several packages which are not described in this \
 section; unless stated otherwise, you only need to use XML::LibXML; in \
 your programs."
-HOMEPAGE = "http://search.cpan.org/dist/XML-LibXML-1.99/"
+HOMEPAGE = "https://metacpan.org/dist/XML-LibXML"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 DEPENDS += "libxml2 \
@@ -22,7 +22,7 @@ RDEPENDS:${PN} += "\
    zlib \
 "
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/XML-LibXML-${PV}.tar.gz;name=libxml \
+SRC_URI = "${CPAN_MIRROR}/authors/id/S/SH/SHLOMIF/XML-LibXML-${PV}.tar.gz;name=libxml \
    file://disable-libxml2-check.patch \
    file://fix-CATALOG-conditional-compile.patch \
    file://using-DOCB-conditional.patch \
diff --git a/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb b/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb
index 487a5c22c..d4a027e6d 100644
--- a/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb
+++ b/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb
@@ -8,12 +8,11 @@ the AxKit XML Application Server. \
 "
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-HOMEPAGE = "http://search.cpan.org/dist/XML-SAX-Writer/"
+HOMEPAGE = "https://metacpan.org/dist/XML-SAX-Writer"
 DEPENDS += "libxml-filter-buffertext-perl-native"
 RDEPENDS:${PN} += "libxml-filter-buffertext-perl"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-${PV}.tar.gz"
+SRC_URI = "${CPAN_MIRROR}/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-${PV}.tar.gz"
-SRC_URI[md5sum] = "3e3023c648e3003c04de2fb04435f8bd"
 SRC_URI[sha256sum] = "3d61d07ef43b0126f5b4de4f415a256fa859fa88dc4fdabaad70b7be7c682cf0"
 LIC_FILES_CHKSUM = "file://README;beginline=45;endline=46;md5=d41d8cd98f00b204e9800998ecf8427e"
diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc
index 92e64908b..ee8f957cc 100644
--- a/meta-python/conf/include/ptest-packagelists-meta-python.inc
+++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc
@@ -16,6 +16,7 @@ PTESTS_FAST_META_PYTHON = "\
    python3-blinker \
    python3-cachetools \
    python3-cbor2 \
+    python3-configobj \
    python3-click \
    python3-dasbus \
    python3-dominate \
@@ -42,16 +43,20 @@ PTESTS_FAST_META_PYTHON = "\
    python3-multidict \
    python3-netaddr \
    python3-ordered-set \
+    python3-outcome \
    python3-parse \
    python3-parse-type \
    python3-platformdirs \
    python3-polyline \
    python3-portalocker \
+    python3-portion \
    python3-precise-runner \
    python3-prettytable \
+    python3-propcache \
    python3-pydantic \
    python3-pydantic-core \
    python3-pylint \
+    python3-python-multipart \
    python3-ptyprocess \
    python3-py-cpuinfo \
    python3-pyasn1-modules \
@@ -67,10 +72,12 @@ PTESTS_FAST_META_PYTHON = "\
    python3-semver \
    python3-serpent \
    python3-service-identity \
+    python3-setproctitle \
    python3-simpleeval \
    python3-smpplib \
    python3-soupsieve \
    python3-sqlparse \
+    python3-starlette \
    python3-tomli-w \
    python3-tomlkit \
    python3-trustme \
@@ -96,6 +103,7 @@ PTESTS_SLOW_META_PYTHON = "\
    python3-lz4 \
    python3-marshmallow \
    python3-pillow \
+    python3-pint \
    python3-pytest-localserver \
    python3-scrypt \
    python3-traitlets \
@@ -107,7 +115,5 @@ PTESTS_PROBLEMS_META_PYTHON ="\
    python3-betamax \
    python3-dnspython \
    python3-fastjsonschema \
-    python3-pint \
    python3-pyzmq \
-    python3-whoosh \
 "
diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf
index aaf620a43..cae3931b8 100644
--- a/meta-python/conf/layer.conf
+++ b/meta-python/conf/layer.conf
@@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1"
 LAYERDEPENDS_meta-python = "core (>= 12) openembedded-layer"
-LAYERSERIES_COMPAT_meta-python = "styhead"
+LAYERSERIES_COMPAT_meta-python = "styhead walnascar"
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb b/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb
index 60ac18155..4bd8fed68 100644
--- a/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb
+++ b/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb
@@ -9,7 +9,6 @@ RDEPENDS:${PN} += " \
    python3-logging \
 "
-SRC_URI[md5sum] = "49f5f292ef1b60944ae92ca426a5e550"
 SRC_URI[sha256sum] = "f2e2749aceadce6b27ca52e2b0a64af99797746a8681e1a2963f72007c14cb14"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-connectivity/python-hpack/python3-hpack_4.0.0.bb b/meta-python/recipes-connectivity/python-hpack/python3-hpack_4.0.0.bb
index 0297cb8c2..9fc1d6c0d 100644
--- a/meta-python/recipes-connectivity/python-hpack/python3-hpack_4.0.0.bb
+++ b/meta-python/recipes-connectivity/python-hpack/python3-hpack_4.0.0.bb
@@ -4,7 +4,6 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5bf1c68e73fbaec2b1687b7e71514393"
-SRC_URI[md5sum] = "27e01514ef06dc9fa0798d3dcb7de47c"
 SRC_URI[sha256sum] = "fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.2.0.bb b/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.2.0.bb
index 359a2918c..040f1acc9 100644
--- a/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.2.0.bb
+++ b/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.2.0.bb
@@ -4,7 +4,6 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI[md5sum] = "d60bdffbd9c920f005fdc5e05a8b94cd"
 SRC_URI[sha256sum] = "d3a63a039c82b08a1171b003eafa62c6f128aa4eaa1ce7a55a9401b48f9ad926"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.20.0.bb b/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.21.0.bb
index 6a0a66aef..6a22f2170 100644
--- a/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.20.0.bb
+++ b/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.21.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "Python bindings for the Apache Thrift RPC system"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515"
-SRC_URI[sha256sum] = "4dd662eadf6b8aebe8a41729527bd69adf6ceaa2a8681cbef64d1273b3e8feba"
+SRC_URI[sha256sum] = "5e6f7c50f936ebfa23e924229afc95eb219f8c8e5a83202dd4a391244803e402"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python3_0.15.19.bb b/meta-python/recipes-connectivity/telepathy/telepathy-python3_0.15.19.bb
index 23c216504..b2b4695d2 100644
--- a/meta-python/recipes-connectivity/telepathy/telepathy-python3_0.15.19.bb
+++ b/meta-python/recipes-connectivity/telepathy/telepathy-python3_0.15.19.bb
@@ -16,7 +16,6 @@ S = "${WORKDIR}/telepathy-python-${PV}"
 inherit autotools python3native
-SRC_URI[md5sum] = "f7ca25ab3c88874015b7e9728f7f3017"
 SRC_URI[sha256sum] = "244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376"
 FILES:${PN} += "\
diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index 8850f8eb9..8ee1cdc10 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -452,7 +452,6 @@ RDEPENDS:packagegroup-meta-python3 = "\
    python3-websocket-client \
    python3-werkzeug \
    python3-werkzeug \
-    python3-whoosh \
    python3-wrapt \
    python3-wtforms \
    python3-xlrd \
@@ -466,6 +465,7 @@ RDEPENDS:packagegroup-meta-python3 = "\
    python3-yappi \
    python3-yarl \
    python3-zopeinterface \
+    python3-zstandard \
    telepathy-python3 \
    unattended-upgrades \
 "
@@ -524,7 +524,6 @@ RDEPENDS:packagegroup-meta-python3-ptest = "\
    python3-unidiff-ptest \
    python3-uritemplate-ptest \
    python3-webcolors-ptest \
-    python3-whoosh-ptest \
    python3-wpa-supplicant \
    python3-xlrd-ptest \
    python3-xmltodict-ptest \
diff --git a/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb b/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb
index ed4e58850..cf800c958 100644
--- a/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb
+++ b/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=a53cbc7cb75660694e
 PYPI_PACKAGE_EXT = "tar.bz2"
-SRC_URI[md5sum] = "7c87da94656b620dfe532ca63d642eb8"
 SRC_URI[sha256sum] = "b2d701b25ad3f9a1542057f3eb492c5c1d7dbe2b8d1e8f763043dcc14ee1d933"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python-django-south.inc b/meta-python/recipes-devtools/python/python-django-south.inc
deleted file mode 100644
index 28eb84c56..000000000
--- a/meta-python/recipes-devtools/python/python-django-south.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Migrations for Django"
-DESCRIPTION = "South is an intelligent database migrations library for the Django web framework. It is database-independent and DVCS-friendly, as well as a whole host of other features."
-HOMEPAGE = "http://south.aeracode.org/"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=17;endline=18;md5=2155d8ae21e7c23101d5febac696b27e"
-SRC_URI[md5sum] = "c76a9758b2011bc3b6c39f881bba2f66"
-SRC_URI[sha256sum] = "d360bd31898f9df59f6faa786551065bba45b35e7ee3c39b381b4fbfef7392f4"
-PYPI_PACKAGE = "South"
-inherit pypi
-BBCLASSEXTEND = "native nativesdk"
-RDEPENDS:${PN} += "\
-    python3-django \
-    "
diff --git a/meta-python/recipes-devtools/python/python-flask-bootstrap.inc b/meta-python/recipes-devtools/python/python-flask-bootstrap.inc
deleted file mode 100644
index 24c76ce94..000000000
--- a/meta-python/recipes-devtools/python/python-flask-bootstrap.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "An extension that includes Bootstrap in your project, without any boilerplate code."
-LICENSE = "Apache-2.0 & MIT & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=a03749709f06118a17349deb5a210619"
-SRC_URI[md5sum] = "e40d50f5c5b6438c1c6200a6f2871f81"
-SRC_URI[sha256sum] = "cb08ed940183f6343a64e465e83b3a3f13c53e1baabb8d72b5da4545ef123ac8"
-PYPI_PACKAGE = "Flask-Bootstrap"
-RDEPENDS:${PN} += "\
-    python3-dominate \
-    python3-flask \
-    python3-visitor \
-    "
diff --git a/meta-python/recipes-devtools/python/python-flask-sijax.inc b/meta-python/recipes-devtools/python/python-flask-sijax.inc
deleted file mode 100644
index 239c843fc..000000000
--- a/meta-python/recipes-devtools/python/python-flask-sijax.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "An extension for the Flask microframework that adds Sijax support."
-HOMEPAGE = "https://github.com/spantaleev/flask-sijax"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=266adc7b911b7c84b837bf77196e1ba6"
-PYPI_PACKAGE = "Flask-Sijax"
-RDEPENDS:${PN} += " \
-    python3-flask \
-    python3-sijax \
-    python3-werkzeug \
-"
diff --git a/meta-python/recipes-devtools/python/python-flask-xstatic.inc b/meta-python/recipes-devtools/python/python-flask-xstatic.inc
deleted file mode 100644
index 8434d2610..000000000
--- a/meta-python/recipes-devtools/python/python-flask-xstatic.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "XStatic support for flask"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=659968f6ebd4b70b6c3190d20b4a924c"
-SRC_URI[md5sum] = "2f56023e1444c8bd1fec41afe93de743"
-SRC_URI[sha256sum] = "226ea8e97065a9488b59bfe5c94af4c6e2ea70a25052e301fb231a1381490133"
-FILESEXTRAPATHS:prepend := "${THISDIR}/python-flask-xstatic:"
-SRC_URI += "file://remove-pip-requires.patch"
-PYPI_PACKAGE = "Flask-XStatic"
-RDEPENDS:${PN} += "\
-    python3-flask \
-    python3-xstatic \
-    "
diff --git a/meta-python/recipes-devtools/python/python-libusb1_3.1.0.bb b/meta-python/recipes-devtools/python/python-libusb1_3.1.0.bb
index 3d7765607..96c83b3fa 100644
--- a/meta-python/recipes-devtools/python/python-libusb1_3.1.0.bb
+++ b/meta-python/recipes-devtools/python/python-libusb1_3.1.0.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = " \
 "
 SRC_URI = "https://github.com/vpelletier/${BPN}/releases/download/${PV}/libusb1-${PV}.tar.gz"
-SRC_URI[md5sum] = "7b4f094786d1dfc8d011c7649d8ccb97"
 SRC_URI[sha256sum] = "4ee9b0a55f8bd0b3ea7017ae919a6c1f439af742c4a4b04543c5fd7af89b828c"
 S = "${WORKDIR}/libusb1-${PV}"
diff --git a/meta-python/recipes-devtools/python/python3-a2wsgi/run-ptest b/meta-python/recipes-devtools/python/python3-a2wsgi/run-ptest
index 8d2017d39..951c73a6c 100644
--- a/meta-python/recipes-devtools/python/python3-a2wsgi/run-ptest
+++ b/meta-python/recipes-devtools/python/python3-a2wsgi/run-ptest
@@ -1,3 +1,3 @@
 #!/bin/sh
-pytest --automake
+pytest --automake --deselect tests/test_asgi.py::test_baize_stream_response
diff --git a/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.7.bb b/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.7.bb
index e65519ec3..023f22790 100644
--- a/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.7.bb
+++ b/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.7.bb
@@ -20,6 +20,7 @@ RDEPENDS:${PN}-ptest += " \
        python3-httpx \
        python3-pytest \
        python3-pytest-asyncio \
+        python3-starlette \
        python3-unittest-automake-output \
 "
diff --git a/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.4.0.bb b/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.4.3.bb
index 940492283..e06bd7178 100644
--- a/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.4.3.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohappyeyeballs"
 LICENSE = "PSF-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2"
-SRC_URI[sha256sum] = "55a1714f084e63d49639800f95716da97a1f173d46a16dfcfda0016abb93b6b2"
+SRC_URI[sha256sum] = "75cf88a15106a5002a8eb1dab212525c00d1f4c0fa96e551c9fbe6f09a621586"
 inherit pypi python_poetry_core
diff --git a/meta-python/recipes-devtools/python/python3-aiohttp_3.10.5.bb b/meta-python/recipes-devtools/python/python3-aiohttp_3.10.10.bb
index f167b9d6e..02c53ff91 100644
--- a/meta-python/recipes-devtools/python/python3-aiohttp_3.10.5.bb
+++ b/meta-python/recipes-devtools/python/python3-aiohttp_3.10.10.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=748073912af33aa59430d3702aa32d41"
-SRC_URI[sha256sum] = "f071854b47d39591ce9a17981c46790acb30518e2f83dfca8db2dfa091178691"
+SRC_URI[sha256sum] = "0631dd7c9f0822cc61c88586ca76d5b5ada26538097d0f1df510b082bad3411a"
 PYPI_PACKAGE = "aiohttp"
 inherit python_setuptools_build_meta pypi
diff --git a/meta-python/recipes-devtools/python/python3-aioresponses_0.7.6.bb b/meta-python/recipes-devtools/python/python3-aioresponses_0.7.6.bb
new file mode 100644
index 000000000..a99c80f59
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-aioresponses_0.7.6.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Mock out requests made by ClientSession from aiohttp package"
+HOMEPAGE = "https://github.com/pnuckowski/aioresponses"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b22b40d5974300051216633098387c57"
+SRC_URI[sha256sum] = "f795d9dbda2d61774840e7e32f5366f45752d1adc1b74c9362afd017296c7ee1"
+DEPENDS += "python3-pbr-native"
+inherit setuptools3 pypi
+RDEPENDS:${PN} += "python3-aiohttp \
+                   python3-asyncio \
+                   python3-core \
+                   python3-json \
+                   python3-math \
+                   python3-multidict \
+                   python3-netclient \
+                   python3-packaging \
+                   python3-unittest \
+                   python3-yarl"
+# optionally needs asynctest asynctest.case ddt but recipes do not exist for them
+PYPI_PACKAGE = "aioresponses"
diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.13.2.bb b/meta-python/recipes-devtools/python/python3-alembic_1.13.3.bb
index 6f8fb8c33..f046c3ebc 100644
--- a/meta-python/recipes-devtools/python/python3-alembic_1.13.2.bb
+++ b/meta-python/recipes-devtools/python/python3-alembic_1.13.3.bb
@@ -2,11 +2,9 @@ DESCRIPTION = "A database migration tool for SQLAlchemy"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=00f8f5c8aab58c3e1cd61525a6675174"
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "1ff0ae32975f4fd96028c39ed9bb3c867fe3af956bd7bb37343b54c9fe7445ef"
+SRC_URI[sha256sum] = "203503117415561e203aa14541740643a611f641517f0209fcae63e9fa09f1a2"
-PYPI_PACKAGE = "alembic"
 RDEPENDS:${PN} += "\
    python3-dateutil \
diff --git a/meta-python/recipes-devtools/python/python3-anyio_4.4.0.bb b/meta-python/recipes-devtools/python/python3-anyio_4.6.0.bb
index 28c76cbf5..57f071251 100644
--- a/meta-python/recipes-devtools/python/python3-anyio_4.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-anyio_4.6.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c0a769411d2af7894099e8ff75058c9f"
 inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "5aadc6a1bbb7cdb0bede386cac5e2940f5e2ff3aa20277e991cf028e0585ce94"
+SRC_URI[sha256sum] = "137b4559cbb034c477165047febb6ff83f390fc3b20bf181c1fc0a728cb8beeb"
 DEPENDS += " \
        python3-setuptools-scm-native \
diff --git a/meta-python/recipes-devtools/python/python3-apiflask_2.1.1.bb b/meta-python/recipes-devtools/python/python3-apiflask_2.2.1.bb
index 94f2e37a8..d6e88beec 100644
--- a/meta-python/recipes-devtools/python/python3-apiflask_2.1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-apiflask_2.2.1.bb
@@ -3,16 +3,14 @@ HOMEPAGE = "https://github.com/apiflask/apiflask"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5f89d1b0dec37448d4f4163dc3c40e64"
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
-PYPI_PACKAGE = "APIFlask"
+SRC_URI[sha256sum] = "9c7573fedbb75524396c5733d4b0c150d1839a5d52b905c15b6a36e030c44908"
-SRC_URI[sha256sum] = "88db5a539cc155e35d9636d99b434d00ca6c0b23e7c87c8321ec9dc980535366"
 RDEPENDS:${PN} += "\
+    python3-apispec \
    python3-flask \
+    python3-flask-httpauth \
    python3-flask-marshmallow \
    python3-webargs \
-    python3-flask-httpauth \
-    python3-apispec \
    "
diff --git a/meta-python/recipes-devtools/python/python3-apispec_6.6.1.bb b/meta-python/recipes-devtools/python/python3-apispec_6.7.0.bb
index 90d7ee271..670c791db 100644
--- a/meta-python/recipes-devtools/python/python3-apispec_6.6.1.bb
+++ b/meta-python/recipes-devtools/python/python3-apispec_6.7.0.bb
@@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a75956865b40c80a37c1e864716592b4"
 inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "f5caa47cee75fe03b9c50b5594048b4c052eeca2c212e0dac12dbb6175d9a659"
+SRC_URI[sha256sum] = "fa2cf1063bb227ed6f7f66b019f320d7dc0a7cb02acdf166a160e2381f4b2c39"
 RDEPENDS:${PN} += "python3-packaging"
diff --git a/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb b/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb
index ad07b3b08..eab39312a 100644
--- a/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb
+++ b/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb
@@ -6,7 +6,6 @@ SRC_URI += " \
        file://run-ptest \
 "
-SRC_URI[md5sum] = "d6bca12613174185dd9abc8a29f4f012"
 SRC_URI[sha256sum] = "7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"
 inherit pypi setuptools3 ptest
diff --git a/meta-python/recipes-devtools/python/python3-argcomplete_3.5.0.bb b/meta-python/recipes-devtools/python/python3-argcomplete_3.5.1.bb
index a5cf6298a..531399d36 100644
--- a/meta-python/recipes-devtools/python/python3-argcomplete_3.5.0.bb
+++ b/meta-python/recipes-devtools/python/python3-argcomplete_3.5.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/kislyuk/argcomplete"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93"
-SRC_URI[sha256sum] = "4349400469dccfb7950bb60334a680c58d88699bff6159df61251878dc6bf74b"
+SRC_URI[sha256sum] = "eb1ee355aa2557bd3d0145de7b06b2a45b0ce461e1e7813f5d066039ab4177b4"
 PYPI_PACKAGE = "argcomplete"
diff --git a/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb b/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb
index 017a7e954..64ed8ad8d 100644
--- a/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb
+++ b/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ea70b07c354e36056bd35e17c9c3face"
 inherit pypi setuptools3
-SRC_URI[md5sum] = "448635948823309312ea9f70b30b6c2d"
 SRC_URI[sha256sum] = "61f9ae9322e38ae64996848421afbdb018239a99c4e796fe064f172d6c98c3bf"
 DEPENDS += "python3-setuptools-scm-native"
diff --git a/meta-python/recipes-devtools/python/python3-asciitree_0.3.3.bb b/meta-python/recipes-devtools/python/python3-asciitree_0.3.3.bb
index 833732bd4..6b740e6f8 100644
--- a/meta-python/recipes-devtools/python/python3-asciitree_0.3.3.bb
+++ b/meta-python/recipes-devtools/python/python3-asciitree_0.3.3.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://github.com/mbr/asciitree"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a985ccb0df374f2a8cab75010bf8db73"
-SRC_URI[md5sum] = "2570b31e563b69da1aff54509db8ac6a"
 SRC_URI[sha256sum] = "4aa4b9b649f85e3fcb343363d97564aa1fb62e249677f2e18a96765145cc0f6e"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-astroid_3.3.2.bb b/meta-python/recipes-devtools/python/python3-astroid_3.3.5.bb
index e5f05bd0e..cfa58e7ee 100644
--- a/meta-python/recipes-devtools/python/python3-astroid_3.3.2.bb
+++ b/meta-python/recipes-devtools/python/python3-astroid_3.3.5.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1"
-SRC_URI[sha256sum] = "99e9b5b602cbb005434084309213d6af32bf7a9b743c836749168b8e2b330cbd"
+SRC_URI[sha256sum] = "5cfc40ae9f68311075d27ef68a4841bdc5cc7f6cf86671b49f00607d30188e2d"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.9.bb b/meta-python/recipes-devtools/python/python3-asyncinotify_4.2.0.bb
index 0946dd2a3..839d32596 100644
--- a/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.9.bb
+++ b/meta-python/recipes-devtools/python/python3-asyncinotify_4.2.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f75d2927d3c1ed2414ef72048f5ad640"
-SRC_URI[sha256sum] = "d0fc2c9af487b6ac2a3bd7db7b5139de54afcc3660720f80d7324b122a27c1c7"
+SRC_URI[sha256sum] = "dac1d75e16a4919c6eab84a90ff51218db622c5524a84a5c501a0b62ea7ec7ea"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb b/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb
index 01dfe5154..d73e83de5 100644
--- a/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb
@@ -6,7 +6,6 @@ inherit setuptools3 pypi features_check
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-SRC_URI[md5sum] = "60153055e76ceaacdfbaeafb03d61dd9"
 SRC_URI[sha256sum] = "fe3ceb2ba5f541330c07ca1bd7ae792468d625bad1acf5354a3a7a0b9fd87521"
 RDEPENDS:${PN} += "python3-asyncio python3-pygobject"
diff --git a/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb b/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb
index d1ac486c0..42a7cb987 100644
--- a/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=40e56b724d016484a7f790ec826d3ffc"
 PYPI_PACKAGE = "backcall"
-SRC_URI[md5sum] = "1f4c9a370c78743406296f48e56e8821"
 SRC_URI[sha256sum] = "5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"
 inherit pypi python_flit_core
diff --git a/meta-python/recipes-devtools/python/python3-bandit_1.7.9.bb b/meta-python/recipes-devtools/python/python3-bandit_1.7.10.bb
index 730bf116a..8e88d8c7c 100644
--- a/meta-python/recipes-devtools/python/python3-bandit_1.7.9.bb
+++ b/meta-python/recipes-devtools/python/python3-bandit_1.7.10.bb
@@ -2,7 +2,7 @@ SUMMARY = "Security oriented static analyser for python code."
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-SRC_URI[sha256sum] = "7c395a436743018f7be0a4cbb0a4ea9b902b6d87264ddecf8cfdc73b4f78ff61"
+SRC_URI[sha256sum] = "59ed5caf5d92b6ada4bf65bc6437feea4a9da1093384445fed4d472acc6cff7b"
 DEPENDS = "python3-pbr-native python3-git python3-pbr python3-pyyaml python3-six python3-stevedore"
diff --git a/meta-python/recipes-devtools/python/python3-betamax_0.9.0.bb b/meta-python/recipes-devtools/python/python3-betamax_0.9.0.bb
index a0454686e..68572d98b 100644
--- a/meta-python/recipes-devtools/python/python3-betamax_0.9.0.bb
+++ b/meta-python/recipes-devtools/python/python3-betamax_0.9.0.bb
@@ -3,13 +3,18 @@ HOMEPAGE = "https://github.com/betamaxpy/betamax"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=61c15f0c146c5fb1a8ce8ba2f310d73c"
+PV .= "+git"
+SRCREV = "8f3d284103676a43d1481b5cffae96f3a601e0be"
 SRC_URI += " \
        file://run-ptest \
+        git://github.com/betamaxpy/betamax;protocol=https;branch=main \
        file://0001-Drop-ptests-fixtures-and-recorde_modes.patch \
 "
-SRC_URI[sha256sum] = "82316e1679bc6879e3c83318d016b54b7c9225ff08c4462de4813e22038d5f94"
-inherit pypi setuptools3 ptest
+S = "${WORKDIR}/git"
+inherit setuptools3 ptest
 RDEPENDS:${PN} += " \
    python3-requests \
diff --git a/meta-python/recipes-devtools/python/python3-bitarray_2.9.2.bb b/meta-python/recipes-devtools/python/python3-bitarray_2.9.3.bb
index 7d7be0b1a..c19307cc9 100644
--- a/meta-python/recipes-devtools/python/python3-bitarray_2.9.2.bb
+++ b/meta-python/recipes-devtools/python/python3-bitarray_2.9.3.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray"
 LICENSE = "PSF-2.0"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d"
-SRC_URI[sha256sum] = "a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e"
+SRC_URI[sha256sum] = "9eff55cf189b0c37ba97156a00d640eb7392db58a8049be6f26ff2712b93fa89"
 inherit setuptools3 pypi
diff --git a/meta-python/recipes-devtools/python/python3-bleak_0.22.2.bb b/meta-python/recipes-devtools/python/python3-bleak_0.22.3.bb
index bb1d7c2b1..c0150c790 100644
--- a/meta-python/recipes-devtools/python/python3-bleak_0.22.2.bb
+++ b/meta-python/recipes-devtools/python/python3-bleak_0.22.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/hbldh/bleak"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bcbc2069a86cba1b5e47253679f66ed7"
-SRCREV = "c746071a3fcc3b5e69db6d6b23445ec3505d7730"
+SRCREV = "2e6890f68f6718b4f92e602b9b926aa3d107b556"
 PYPI_SRC_URI = "git://github.com/hbldh/bleak.git;protocol=https;branch=develop"
 inherit pypi python_poetry_core ptest
diff --git a/meta-python/recipes-devtools/python/python3-cantools_39.4.5.bb b/meta-python/recipes-devtools/python/python3-cantools_39.4.9.bb
index f4f16c155..bf1b4867c 100644
--- a/meta-python/recipes-devtools/python/python3-cantools_39.4.5.bb
+++ b/meta-python/recipes-devtools/python/python3-cantools_39.4.9.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd"
-SRC_URI[sha256sum] = "594f2ae80deadb8c6b08e8e1322d42e258f40d42c80d6886d84e0143f90b5a23"
+SRC_URI[sha256sum] = "5559da0a9b7a0f9e68eb8010b27615f7960be19656f4217374c76993c71f9167"
 PYPI_PACKAGE = "cantools"
diff --git a/meta-python/recipes-devtools/python/python3-cbor2_5.6.4.bb b/meta-python/recipes-devtools/python/python3-cbor2_5.6.5.bb
index 37c3ab647..6dd9f0cd1 100644
--- a/meta-python/recipes-devtools/python/python3-cbor2_5.6.4.bb
+++ b/meta-python/recipes-devtools/python/python3-cbor2_5.6.5.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a79e64179819c7ce293372c059f1dbd8"
 DEPENDS += "python3-setuptools-scm-native"
-SRC_URI[sha256sum] = "1c533c50dde86bef1c6950602054a0ffa3c376e8b0e20c7b8f5b108793f6983e"
+SRC_URI[sha256sum] = "b682820677ee1dbba45f7da11898d2720f92e06be36acec290867d5ebf3d7e09"
 SRC_URI += " \
        file://run-ptest \
 "
diff --git a/meta-python/recipes-devtools/python/python3-click-spinner_0.1.10.bb b/meta-python/recipes-devtools/python/python3-click-spinner_0.1.10.bb
index b3e1328c7..7f19cc345 100644
--- a/meta-python/recipes-devtools/python/python3-click-spinner_0.1.10.bb
+++ b/meta-python/recipes-devtools/python/python3-click-spinner_0.1.10.bb
@@ -4,7 +4,6 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489"
 SRC_URI += "file://0001-Update-Versioneer-to-0.22.patch"
-SRC_URI[md5sum] = "ab68ed404401421819c81cc6c0677a87"
 SRC_URI[sha256sum] = "87eacf9d7298973a25d7615ef57d4782aebf913a532bba4b28a37e366e975daf"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-whoosh/run-ptest b/meta-python/recipes-devtools/python/python3-configobj/run-ptest
index 8d2017d39..8d2017d39 100644..100755
--- a/meta-python/recipes-devtools/python/python3-whoosh/run-ptest
+++ b/meta-python/recipes-devtools/python/python3-configobj/run-ptest
diff --git a/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb b/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb
deleted file mode 100644
index 96e579c78..000000000
--- a/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "Config file reading, writing and validation."
-SECTION = "devel/python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6f99b84d9a94610c62e48fa2e59e72"
-PYPI_PACKAGE = "configobj"
-SRC_URI[sha256sum] = "6f704434a07dc4f4dc7c9a745172c1cad449feb548febd9f7fe362629c627a97"
-inherit pypi python_setuptools_build_meta
-RDEPENDS:${PN} += " \
-    python3-pprint \
-    python3-six \
-"
diff --git a/meta-python/recipes-devtools/python/python3-configobj_5.0.9.bb b/meta-python/recipes-devtools/python/python3-configobj_5.0.9.bb
new file mode 100644
index 000000000..d41d71a4e
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-configobj_5.0.9.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Config file reading, writing and validation."
+SECTION = "devel/python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e2df3cb285297a24cd1097dfe6e96f95"
+SRC_URI[sha256sum] = "03c881bbf23aa07bccf1b837005975993c4ab4427ba57f959afdd9d1a2386848"
+inherit pypi python_setuptools_build_meta ptest
+SRC_URI += " \
+        file://run-ptest \
+"
+RDEPENDS:${PN} += " \
+        python3-pprint \
+        python3-six \
+"
+RDEPENDS:${PN}-ptest += " \
+        python3-pytest \
+        python3-unittest-automake-output \
+"
+do_install_ptest() {
+        install -d ${D}${PTEST_PATH}/tests
+        cp -rf ${S}/src/tests/* ${D}${PTEST_PATH}/tests/
+}
diff --git a/meta-python/recipes-devtools/python/python3-coverage_7.6.1.bb b/meta-python/recipes-devtools/python/python3-coverage_7.6.2.bb
index 7749158f5..c87cfdd16 100644
--- a/meta-python/recipes-devtools/python/python3-coverage_7.6.1.bb
+++ b/meta-python/recipes-devtools/python/python3-coverage_7.6.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://coverage.readthedocs.io"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93"
-SRC_URI[sha256sum] = "953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d"
+SRC_URI[sha256sum] = "a5f81e68aa62bc0cfca04f7b19eaa8f9c826b53fc82ab9e2121976dc74f131f3"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-cytoolz_0.12.3.bb b/meta-python/recipes-devtools/python/python3-cytoolz_1.0.0.bb
index f9c9704d7..15fb1733a 100644
--- a/meta-python/recipes-devtools/python/python3-cytoolz_0.12.3.bb
+++ b/meta-python/recipes-devtools/python/python3-cytoolz_1.0.0.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d422ebce3e9c6447563bd410e9b22f2e"
-SRC_URI[sha256sum] = "4503dc59f4ced53a54643272c61dc305d1dbbfbd7d6bdf296948de9f34c3a282"
+SRC_URI[sha256sum] = "eb453b30182152f9917a5189b7d99046b6ce90cdf8aeb0feff4b2683e600defd"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-dbus-fast_2.24.2.bb b/meta-python/recipes-devtools/python/python3-dbus-fast_2.24.3.bb
index ccac69924..bf267ed86 100644
--- a/meta-python/recipes-devtools/python/python3-dbus-fast_2.24.2.bb
+++ b/meta-python/recipes-devtools/python/python3-dbus-fast_2.24.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/bluetooth-devices/dbus-fast"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=729e372b5ea0168438e4fd4a00a04947"
-SRC_URI[sha256sum] = "20c517dc70dbc940b8bf2e0f079abf3dfe821fdda3013641a17e3d8f18e131ae"
+SRC_URI[sha256sum] = "9042a1b565ecac4f8e04df79376de1d1d31e4c82eddb6e71e8b8d82d0c94dd3d"
 PYPI_PACKAGE = "dbus_fast"
diff --git a/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb b/meta-python/recipes-devtools/python/python3-dill_0.3.9.bb
index 3481ec06b..bc5a7e500 100644
--- a/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb
+++ b/meta-python/recipes-devtools/python/python3-dill_0.3.9.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/dill/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a41509b57cc475ed93f8cb1dbbfaeec1"
-SRC_URI[sha256sum] = "3ebe3c479ad625c4553aca177444d89b486b1d84982eeacded644afc0cf797ca"
+SRC_URI[sha256sum] = "81aa267dddf68cbfe8029c42ca9ec6a4ab3b22371d1c450abc54422577b4512c"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-distlib_0.3.8.bb b/meta-python/recipes-devtools/python/python3-distlib_0.3.9.bb
index 41a66479c..33e79d53e 100644
--- a/meta-python/recipes-devtools/python/python3-distlib_0.3.8.bb
+++ b/meta-python/recipes-devtools/python/python3-distlib_0.3.9.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/pypa/distlib"
 LICENSE = "PSF-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f6a11430d5cd6e2cd3832ee94f22ddfc"
-SRC_URI[sha256sum] = "1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64"
+SRC_URI[sha256sum] = "a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403"
 BBCLASSEXTEND = "native nativesdk"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-django-south_1.0.2.bb b/meta-python/recipes-devtools/python/python3-django-south_1.0.2.bb
index 10519111f..8237cf034 100644
--- a/meta-python/recipes-devtools/python/python3-django-south_1.0.2.bb
+++ b/meta-python/recipes-devtools/python/python3-django-south_1.0.2.bb
@@ -1,2 +1,16 @@
-require python-django-south.inc
+SUMMARY = "Migrations for Django"
-inherit setuptools3
+DESCRIPTION = "South is an intelligent database migrations library for the Django web framework. It is database-independent and DVCS-friendly, as well as a whole host of other features."
+HOMEPAGE = "http://south.aeracode.org/"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=17;endline=18;md5=2155d8ae21e7c23101d5febac696b27e"
+SRC_URI[sha256sum] = "d360bd31898f9df59f6faa786551065bba45b35e7ee3c39b381b4fbfef7392f4"
+PYPI_PACKAGE = "South"
+inherit pypi setuptools3
+BBCLASSEXTEND = "native nativesdk"
+RDEPENDS:${PN} += "\
+    python3-django \
+    "
diff --git a/meta-python/recipes-devtools/python/python-django.inc b/meta-python/recipes-devtools/python/python3-django.inc
index d9ab3fd21..d9ab3fd21 100644
--- a/meta-python/recipes-devtools/python/python-django.inc
+++ b/meta-python/recipes-devtools/python/python3-django.inc
diff --git a/meta-python/recipes-devtools/python/python3-django_4.2.16.bb b/meta-python/recipes-devtools/python/python3-django_4.2.16.bb
index 9254e8b00..564e8741e 100644
--- a/meta-python/recipes-devtools/python/python3-django_4.2.16.bb
+++ b/meta-python/recipes-devtools/python/python3-django_4.2.16.bb
@@ -1,4 +1,4 @@
-require python-django.inc
+require python3-django.inc
 inherit setuptools3
 SRC_URI[sha256sum] = "6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad"
diff --git a/meta-python/recipes-devtools/python/python3-django_5.0.9.bb b/meta-python/recipes-devtools/python/python3-django_5.0.9.bb
index b3fb301ed..2de483216 100644
--- a/meta-python/recipes-devtools/python/python3-django_5.0.9.bb
+++ b/meta-python/recipes-devtools/python/python3-django_5.0.9.bb
@@ -1,4 +1,4 @@
-require python-django.inc
+require python3-django.inc
 inherit python_setuptools_build_meta
 SRC_URI[sha256sum] = "6333870d342329b60174da3a60dbd302e533f3b0bb0971516750e974a99b5a39"
diff --git a/meta-python/recipes-devtools/python/python3-dnspython_2.6.1.bb b/meta-python/recipes-devtools/python/python3-dnspython_2.7.0.bb
index 13e31afe7..e9ca31c3a 100644
--- a/meta-python/recipes-devtools/python/python3-dnspython_2.6.1.bb
+++ b/meta-python/recipes-devtools/python/python3-dnspython_2.7.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.dnspython.org/"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34"
-SRC_URI[sha256sum] = "e8f0f9c23a7b7cb99ded64e6c3a6f3e701d78f50c55e002b839dea7225cff7cc"
+SRC_URI[sha256sum] = "ce9c432eda0dc91cf618a5cedf1a4e142651196bbcd2c80e89ed5a907e5cfaf1"
 inherit pypi python_hatchling ptest
diff --git a/meta-python/recipes-devtools/python/python3-docopt_0.6.2.bb b/meta-python/recipes-devtools/python/python3-docopt_0.6.2.bb
index a2432068c..2f03bd37b 100644
--- a/meta-python/recipes-devtools/python/python3-docopt_0.6.2.bb
+++ b/meta-python/recipes-devtools/python/python3-docopt_0.6.2.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=09b77fb74986791a3d4a0e746a37d88f"
 inherit setuptools3 pypi
-SRC_URI[md5sum] = "4bc74561b37fad5d3e7d037f82a4c3b1"
 SRC_URI[sha256sum] = "49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-dominate/58f7d7fdb171f80ed6ce97e6ca4409723975c47f.patch b/meta-python/recipes-devtools/python/python3-dominate/58f7d7fdb171f80ed6ce97e6ca4409723975c47f.patch
new file mode 100644
index 000000000..e3d0d485e
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-dominate/58f7d7fdb171f80ed6ce97e6ca4409723975c47f.patch
@@ -0,0 +1,40 @@
+From 58f7d7fdb171f80ed6ce97e6ca4409723975c47f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 3 Aug 2024 16:07:38 +0200
+Subject: [PATCH] Update tests for docstring dedenting in Python 3.13
+Update the `get_expected()` function to account for the fact that
+Python 3.13 automatically dedents all the docstrings, and therefore
+does not require explicitly removing the indent (which effectively
+removes too much indent).
+Fixes #199
+Upstream-Status: Submitted [https://github.com/Knio/dominate/pull/202]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tests/test_svg.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+diff --git a/tests/test_svg.py b/tests/test_svg.py
+index e5bbec3..ea7d98f 100644
+--- a/tests/test_svg.py
+++ b/tests/test_svg.py
+@@ -1,3 +1,5 @@
+import sys
+
+ import dominate.svg
+ from dominate.tags import *
+ from dominate.svg import *
+@@ -14,7 +16,10 @@ def base():
+ 
+ 
+ def get_expected(func):
+-  return func.__doc__.replace('\n  ', '\n').strip()
+  doc = func.__doc__
+  if sys.version_info < (3, 13):
+      doc = doc.replace('\n  ', '\n')
+  return doc.strip()
+ 
+ 
+ def output_test(func):
diff --git a/meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb b/meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb
index 054d5236e..cce304498 100644
--- a/meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb
+++ b/meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb
@@ -7,6 +7,7 @@ SRC_URI[sha256sum] = "558284687d9b8aae1904e3d6051ad132dd4a8c0cf551b37ea4e7e42a31
 inherit pypi ptest python_setuptools_build_meta
 SRC_URI += " \
+    file://58f7d7fdb171f80ed6ce97e6ca4409723975c47f.patch \
        file://run-ptest \
 "
diff --git a/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb b/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb
index 335461c43..6ec72d02a 100644
--- a/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb
+++ b/meta-python/recipes-devtools/python/python3-editor_1.0.4.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Programmatically open and editor, capture the result"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
-SRC_URI[md5sum] = "0e52648a4a6e7c89e3be44e9456530b4"
 SRC_URI[sha256sum] = "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b"
 PYPI_PACKAGE = "python-editor"
diff --git a/meta-python/recipes-devtools/python/python3-elementpath_4.4.0.bb b/meta-python/recipes-devtools/python/python3-elementpath_4.5.0.bb
index e095cb8a3..937d96860 100644
--- a/meta-python/recipes-devtools/python/python3-elementpath_4.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-elementpath_4.5.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf"
-SRC_URI[sha256sum] = "dfc4b8ca3d87966dcb0df40b5b6d04a98f053683271930fad9e7fa000924dfb2"
+SRC_URI[sha256sum] = "affdc8de95af1a4c10d1d2ed79c6fa56b59c26c7fce64b73497569e9dea46998"
 PYPI_PACKAGE = "elementpath"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb b/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb
index 0f548cf86..1137e744c 100644
--- a/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb
+++ b/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb
@@ -1,14 +1,20 @@
-SUMMARY = "The Ethereum hashing function, keccak256, sometimes (erroneously) called sha3."
+SUMMARY = "eth-hash: The Ethereum hashing function, keccak256, sometimes (erroneously) called sha3"
 HOMEPAGE = "https://github.com/ethereum/eth-hash"
-SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3d7bdfe69b1ffbde073ca6e96f5c53f7"
 SRC_URI[sha256sum] = "bacdc705bfd85dadd055ecd35fd1b4f846b671add101427e089a4ca2e8db310a"
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
-RDEPENDS:${PN} = "\
+PACKAGECONFIG ?= ""
-        python3-logging \
+PACKAGECONFIG[dev] = ",,,python3-build python3-bumpversion python3-ipython python3-pre-commit python3-pytest python3-pytest-xdist python3-sphinx python3-sphinx_rtd_theme python3-towncrier python3-tox python3-twine python3-wheel"
-        python3-pycryptodome \
+PACKAGECONFIG[docs] = ",,,python3-sphinx python3-sphinx_rtd_theme python3-towncrier"
-"
+PACKAGECONFIG[pycryptodome] = ",,,python3-pycryptodome"
+PACKAGECONFIG[pysha3python-version-smaller-3-dot-9] = ",,,python3-pysha3"
+PACKAGECONFIG[pysha3python-version-bigger--equals-3-dot-9] = ",,,python3-safe-pysha3"
+PACKAGECONFIG[test] = ",,,python3-pytest python3-pytest-xdist"
+RDEPENDS:${PN} += "python3-core python3-logging python3-pycryptodome"
+PYPI_PACKAGE = "eth-hash"
diff --git a/meta-python/recipes-devtools/python/python3-eventlet/d19ad6cc086684ee74db250f5fd35227c98e678a.patch b/meta-python/recipes-devtools/python/python3-eventlet/d19ad6cc086684ee74db250f5fd35227c98e678a.patch
new file mode 100644
index 000000000..f8a268309
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-eventlet/d19ad6cc086684ee74db250f5fd35227c98e678a.patch
@@ -0,0 +1,27 @@
+From d19ad6cc086684ee74db250f5fd35227c98e678a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Thu, 6 Jun 2024 10:29:29 +0200
+Subject: [PATCH] Add new thread attributes from Python 3.13
+Does not fix https://github.com/eventlet/eventlet/issues/964 yet
+Upstream-Status: Backport [https://github.com/eventlet/eventlet/pull/965]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ eventlet/green/thread.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+diff --git a/eventlet/green/thread.py b/eventlet/green/thread.py
+index 053a1c3c6..384b3c290 100644
+--- a/eventlet/green/thread.py
+++ b/eventlet/green/thread.py
+@@ -118,3 +118,10 @@ def stack_size(size=None):
+ 
+ if hasattr(__thread, 'daemon_threads_allowed'):
+     daemon_threads_allowed = __thread.daemon_threads_allowed
+
+if hasattr(__thread, 'start_joinable_thread'):
+    start_joinable_thread = __thread.start_joinable_thread
+    _shutdown = __thread._shutdown
+    _make_thread_handle = __thread._make_thread_handle
+    _ThreadHandle = __thread._ThreadHandle
+    _get_main_thread_ident = __thread._get_main_thread_ident
diff --git a/meta-python/recipes-devtools/python/python3-eventlet_0.36.1.bb b/meta-python/recipes-devtools/python/python3-eventlet_0.37.0.bb
index b521162d2..df23162e0 100644
--- a/meta-python/recipes-devtools/python/python3-eventlet_0.36.1.bb
+++ b/meta-python/recipes-devtools/python/python3-eventlet_0.37.0.bb
@@ -4,7 +4,8 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778"
-SRC_URI[sha256sum] = "d227fe76a63d9e6a6cef53beb8ad0b2dc40a5e7737c801f4b474cfae1db07bc5"
+SRC_URI += "file://d19ad6cc086684ee74db250f5fd35227c98e678a.patch"
+SRC_URI[sha256sum] = "fa49bf5a549cdbaa06919679979ea022ac8f8f3cf0499f26849a1cd8e64c30b1"
 inherit pypi python_hatchling
diff --git a/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb b/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb
index 2099d791d..3053ca5d7 100644
--- a/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb
+++ b/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb
@@ -3,7 +3,6 @@ SECTION = "devel/python"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c73b943dc75f6f65e007c56ac6515c8f"
-SRC_URI[md5sum] = "0b85b418018746d63ed66b55465697a9"
 SRC_URI[sha256sum] = "cdca0a65ad48e08320672affe38c3dd4ea15e27821e5e1db9fa2b34299bdd41e"
 SRC_URI += " file://0001-setup.py-Don-t-hardcode-swig-and-fann2-binary-locati.patch"
diff --git a/meta-python/recipes-devtools/python/python3-filelock_3.16.0.bb b/meta-python/recipes-devtools/python/python3-filelock_3.16.1.bb
index 0aac54a15..abafa1245 100644
--- a/meta-python/recipes-devtools/python/python3-filelock_3.16.0.bb
+++ b/meta-python/recipes-devtools/python/python3-filelock_3.16.1.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://py-filelock.readthedocs.io/"
 LICENSE = "Unlicense"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f"
-SRC_URI[sha256sum] = "81de9eb8453c769b63369f87f11131a7ab04e367f8d97ad39dc230daa07e3bec"
+SRC_URI[sha256sum] = "c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435"
 BBCLASSEXTEND = "native nativesdk"
 inherit pypi python_hatchling
diff --git a/meta-python/recipes-devtools/python/python3-flask-bootstrap_3.3.7.1.bb b/meta-python/recipes-devtools/python/python3-flask-bootstrap_3.3.7.1.bb
index 877c75436..7553ce74a 100644
--- a/meta-python/recipes-devtools/python/python3-flask-bootstrap_3.3.7.1.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-bootstrap_3.3.7.1.bb
@@ -1,2 +1,15 @@
+DESCRIPTION = "An extension that includes Bootstrap in your project, without any boilerplate code."
+LICENSE = "Apache-2.0 & MIT & BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=a03749709f06118a17349deb5a210619"
+SRC_URI[sha256sum] = "cb08ed940183f6343a64e465e83b3a3f13c53e1baabb8d72b5da4545ef123ac8"
+PYPI_PACKAGE = "Flask-Bootstrap"
 inherit pypi setuptools3
-require python-flask-bootstrap.inc
+RDEPENDS:${PN} += "\
+    python3-dominate \
+    python3-flask \
+    python3-visitor \
+    "
diff --git a/meta-python/recipes-devtools/python/python3-flask-jsonpify_1.5.0.bb b/meta-python/recipes-devtools/python/python3-flask-jsonpify_1.5.0.bb
index 76c6fb773..93ecf0845 100644
--- a/meta-python/recipes-devtools/python/python3-flask-jsonpify_1.5.0.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-jsonpify_1.5.0.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://README.rst;md5=bd59445a234a0c8250b39178d42e3148"
 PYPI_PACKAGE = "Flask-Jsonpify"
-SRC_URI[md5sum] = "8a10e37942c43d93d107644a3fe77d98"
 SRC_URI[sha256sum] = "8ac4c732aa5b11d9f6c2de58065d3b669f139518ca8f529bce943817e2fedbfb"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-flask-jwt_0.3.2.bb b/meta-python/recipes-devtools/python/python3-flask-jwt_0.3.2.bb
index 35bcbc00a..f7044b314 100644
--- a/meta-python/recipes-devtools/python/python3-flask-jwt_0.3.2.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-jwt_0.3.2.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ff00db41c47ec84b4567a8b3c246a959"
 PYPI_PACKAGE = "Flask-JWT"
-SRC_URI[md5sum] = "878ad79a12afa70ad38a12d5ffd2dc1e"
 SRC_URI[sha256sum] = "49c0672fbde0f1cd3374bd834918d28956e3c521c7e00089cdc5380d323bd0ad"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb b/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb
index 1aca3a161..66f3936cd 100644
--- a/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb
@@ -4,7 +4,6 @@ HOMEPAGE = " https://github.com/rduplain/flask-email"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5b16dfa6d3f275ace5985bb92949f770"
-SRC_URI[md5sum] = "04b35a42a44ec7aa724ec8ce55e2e08e"
 SRC_URI[sha256sum] = "22e5eb9a940bf407bcf30410ecc3708f3c56cc44b29c34e1726fe85006935f41"
 PYPI_PACKAGE = "Flask-Mail"
diff --git a/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb b/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb
index 3855909fb..3d5846148 100644
--- a/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Easily create navigation for Flask applications."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://PKG-INFO;md5=2729ee82259d601d90d28b0574d12416"
-SRC_URI[md5sum] = "4d51cfd06d58f8d0fe85775a6696c0e5"
 SRC_URI[sha256sum] = "44e40b755380a1e68ab521a2f9174de259a2c94ddcdaabf36b3aca2e110a33f4"
 PYPI_PACKAGE = "flask-nav"
diff --git a/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb b/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb
index 1cd4a4b69..1e751b9e5 100644
--- a/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb
@@ -5,7 +5,6 @@ SECTION = "devel/python"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://flask_pymongo/wrappers.py;beginline=1;endline=24;md5=424c4e1047d28e01b4e4634a069c019d"
-SRC_URI[md5sum] = "94df71e6800b1d7915cc91a74b70f959"
 SRC_URI[sha256sum] = "620eb02dc8808a5fcb90f26cab6cba9d6bf497b15032ae3ca99df80366e33314"
 PYPI_PACKAGE = "Flask-PyMongo"
diff --git a/meta-python/recipes-devtools/python/python3-flask-sijax_0.4.1.bb b/meta-python/recipes-devtools/python/python3-flask-sijax_0.4.1.bb
index e9a65c4ae..d518a1877 100644
--- a/meta-python/recipes-devtools/python/python3-flask-sijax_0.4.1.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-sijax_0.4.1.bb
@@ -1,4 +1,17 @@
+DESCRIPTION = "An extension for the Flask microframework that adds Sijax support."
+HOMEPAGE = "https://github.com/spantaleev/flask-sijax"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=266adc7b911b7c84b837bf77196e1ba6"
+SRC_URI[sha256sum] = "fb2bf2d4f75408185102195055d75549fee8d9c9e954dca2427186925cdc429f"
+PYPI_PACKAGE = "Flask-Sijax"
 inherit pypi setuptools3
-require python-flask-sijax.inc
-SRC_URI[sha256sum] = "fb2bf2d4f75408185102195055d75549fee8d9c9e954dca2427186925cdc429f"
-\ No newline at end of file
+RDEPENDS:${PN} += " \
+    python3-flask \
+    python3-sijax \
+    python3-werkzeug \
+"
diff --git a/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb b/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb
index 9ac321dec..a51ead3c8 100644
--- a/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Flexible and efficient upload handling for Flask"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b712ac634b39469660c9bdfb8d03421c"
-SRC_URI[md5sum] = "e5eee34aa92b64a4d22847672b3858a1"
 SRC_URI[sha256sum] = "53ecbd6033667d50ae02b63adebbaa33c7fc56c09e5293025810cf9d841ecb02"
 PYPI_PACKAGE = "Flask-Uploads"
diff --git a/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb b/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb
index ac449361a..65be459b7 100644
--- a/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb
@@ -6,7 +6,6 @@ HOMEPAGE = " https://github.com/lingthio/Flask-User"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=97de97cd9d6e23c88129d884588ce71a"
-SRC_URI[md5sum] = "f7965e66ca139c8436896da07e66c21f"
 SRC_URI[sha256sum] = "601abcc0343dfbae0c56273d98362d5cdc266ac84d20b3f65a212e4a2c83b302"
 PYPI_PACKAGE = "Flask-User"
diff --git a/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch b/meta-python/recipes-devtools/python/python3-flask-xstatic/remove-pip-requires.patch
index ba06d670e..ba06d670e 100644
--- a/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch
+++ b/meta-python/recipes-devtools/python/python3-flask-xstatic/remove-pip-requires.patch
diff --git a/meta-python/recipes-devtools/python/python3-flask-xstatic_0.0.1.bb b/meta-python/recipes-devtools/python/python3-flask-xstatic_0.0.1.bb
index 5412befdb..c4cad466a 100644
--- a/meta-python/recipes-devtools/python/python3-flask-xstatic_0.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-flask-xstatic_0.0.1.bb
@@ -1,2 +1,16 @@
+DESCRIPTION = "XStatic support for flask"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=659968f6ebd4b70b6c3190d20b4a924c"
+SRC_URI[sha256sum] = "226ea8e97065a9488b59bfe5c94af4c6e2ea70a25052e301fb231a1381490133"
+SRC_URI += "file://remove-pip-requires.patch"
+PYPI_PACKAGE = "Flask-XStatic"
+RDEPENDS:${PN} += "\
+    python3-flask \
+    python3-xstatic \
+    "
 inherit pypi setuptools3
-require python-flask-xstatic.inc
diff --git a/meta-python/recipes-devtools/python/python3-freezegun/1777174bb97c0b514033a09b820078b0d117f4a8.patch b/meta-python/recipes-devtools/python/python3-freezegun/1777174bb97c0b514033a09b820078b0d117f4a8.patch
new file mode 100644
index 000000000..4604da2b5
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-freezegun/1777174bb97c0b514033a09b820078b0d117f4a8.patch
@@ -0,0 +1,37 @@
+From 1777174bb97c0b514033a09b820078b0d117f4a8 Mon Sep 17 00:00:00 2001
+From: Bert Blommers <info@bertblommers.nl>
+Date: Fri, 28 Jun 2024 19:21:04 +0000
+Subject: [PATCH] Admin: Support Python 3.13
+Upstream-Status: Backport [https://github.com/spulec/freezegun/pull/550]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ .github/workflows/ci.yaml | 9 ++++++---
+ tests/test_datetimes.py   | 6 +++---
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+diff --git a/tests/test_datetimes.py b/tests/test_datetimes.py
+index a6f1989..b75ad3b 100644
+--- a/tests/test_datetimes.py
+++ b/tests/test_datetimes.py
+@@ -534,17 +534,17 @@ def test_method_decorator_works_on_unittest(self) -> None:
+     @freeze_time('2013-04-09', as_kwarg='frozen_time')
+     def test_method_decorator_works_on_unittest_kwarg_frozen_time(self, frozen_time: Any) -> None:
+         self.assertEqual(datetime.date(2013, 4, 9), datetime.date.today())
+-        self.assertEqual(datetime.date(2013, 4, 9), frozen_time.time_to_freeze.today())
+        assert frozen_time.time_to_freeze.today().strftime('%Y-%m-%d') == "2013-04-09"
+ 
+     @freeze_time('2013-04-09', as_kwarg='hello')
+     def test_method_decorator_works_on_unittest_kwarg_hello(self, **kwargs: Any) -> None:
+         self.assertEqual(datetime.date(2013, 4, 9), datetime.date.today())
+-        self.assertEqual(datetime.date(2013, 4, 9), kwargs.get('hello').time_to_freeze.today())  # type: ignore
+        assert kwargs.get("hello").time_to_freeze.today().strftime('%Y-%m-%d') == "2013-04-09"  # type: ignore
+ 
+     @freeze_time(lambda: datetime.date(year=2013, month=4, day=9), as_kwarg='frozen_time')
+     def test_method_decorator_works_on_unittest_kwarg_frozen_time_with_func(self, frozen_time: Any) -> None:
+         self.assertEqual(datetime.date(2013, 4, 9), datetime.date.today())
+-        self.assertEqual(datetime.date(2013, 4, 9), frozen_time.time_to_freeze.today())
+        assert frozen_time.time_to_freeze.today().strftime('%Y-%m-%d') == "2013-04-09"
+ 
+ 
+ @freeze_time('2013-04-09')
diff --git a/meta-python/recipes-devtools/python/python3-freezegun_1.5.1.bb b/meta-python/recipes-devtools/python/python3-freezegun_1.5.1.bb
index 8b5750df4..431843bde 100644
--- a/meta-python/recipes-devtools/python/python3-freezegun_1.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-freezegun_1.5.1.bb
@@ -9,6 +9,7 @@ inherit pypi python_setuptools_build_meta ptest
 SRC_URI += " \
        file://run-ptest \
+        file://1777174bb97c0b514033a09b820078b0d117f4a8.patch \
 "
 RDEPENDS:${PN}-ptest += " \
diff --git a/meta-python/recipes-devtools/python/python3-fsspec_2024.9.0.bb b/meta-python/recipes-devtools/python/python3-fsspec_2024.9.0.bb
index 49ca4b3e9..1073f9480 100644
--- a/meta-python/recipes-devtools/python/python3-fsspec_2024.9.0.bb
+++ b/meta-python/recipes-devtools/python/python3-fsspec_2024.9.0.bb
@@ -20,3 +20,5 @@ RDEPENDS:${PN}-ptest += "\
        python3-numpy \
        python3-requests \
 "
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-gcovr_7.2.bb b/meta-python/recipes-devtools/python/python3-gcovr_8.2.bb
index 517124742..bbafa36ac 100644
--- a/meta-python/recipes-devtools/python/python3-gcovr_7.2.bb
+++ b/meta-python/recipes-devtools/python/python3-gcovr_8.2.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "generate GCC code coverage reports"
 HOMEPAGE = "https://gcovr.com"
 SECTION = "devel/python"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5a58ca91c1758a53f896ba89d8aaac2"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b307623752f2e1189349885b95b326e5"
 SRC_URI = "git://github.com/gcovr/gcovr.git;branch=main;protocol=https"
-SRCREV = "c4b74b0859611283be646d590c7915e787911b6f"
+SRCREV = "045fb8d51806bd7f9e3df4e4edffa3bb816cf77f"
 S = "${WORKDIR}/git"
diff --git a/meta-python/recipes-devtools/python/python3-geojson/py3.13.patch b/meta-python/recipes-devtools/python/python3-geojson/py3.13.patch
new file mode 100644
index 000000000..45618fa6d
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-geojson/py3.13.patch
@@ -0,0 +1,38 @@
+From c13afff339e6b78f442785cc95f0eb66ddab3e7b Mon Sep 17 00:00:00 2001
+From: Bas Couwenberg <sebastic@xs4all.nl>
+Date: Fri, 4 Oct 2024 16:18:34 +0200
+Subject: [PATCH] Don't fail with Python 3.13. (#228)
+Upstream-Status: Backport [https://github.com/jazzband/geojson/commit/c13afff339e6b78f442785cc95f0eb66ddab3e7b]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ .github/workflows/test.yml | 2 +-
+ README.rst                 | 2 +-
+ setup.py                   | 5 +++--
+ tox.ini                    | 2 +-
+ 4 files changed, 6 insertions(+), 5 deletions(-)
+diff --git a/setup.py b/setup.py
+index 95b2823..004d3eb 100644
+--- a/setup.py
+++ b/setup.py
+@@ -17,8 +17,8 @@
+ 
+ 
+ major_version, minor_version = sys.version_info[:2]
+-if not (major_version == 3 and 7 <= minor_version <= 12):
+-    sys.stderr.write("Sorry, only Python 3.7 - 3.12 are "
+if not (major_version == 3 and 7 <= minor_version <= 13):
+    sys.stderr.write("Sorry, only Python 3.7 - 3.13 are "
+                      "supported at this time.\n")
+     exit(1)
+ 
+@@ -53,6 +53,7 @@
+         "Programming Language :: Python :: 3.10",
+         "Programming Language :: Python :: 3.11",
+         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
+         "Topic :: Scientific/Engineering :: GIS",
+     ]
+ )
diff --git a/meta-python/recipes-devtools/python/python3-geojson_3.1.0.bb b/meta-python/recipes-devtools/python/python3-geojson_3.1.0.bb
index 742f921e5..36f5fa09e 100644
--- a/meta-python/recipes-devtools/python/python3-geojson_3.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-geojson_3.1.0.bb
@@ -9,6 +9,7 @@ inherit pypi setuptools3 ptest
 SRC_URI += " \
        file://run-ptest \
+        file://py3.13.patch \
 "
 RDEPENDS:${PN}-ptest += " \
diff --git a/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch b/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch
deleted file mode 100644
index 1171322e2..000000000
--- a/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-From 43f132103cedfd92b85173bcdacfbabd5916d9fc Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Wed, 27 Dec 2023 14:52:16 +0100
-Subject: [PATCH] src: fix python 3.12 builds
-This is a backport for 3.1.x versions provided separately in https://github.com/aleaxit/gmpy/issues/446
-Upstream-Status: Inappropriate [can be dropped when 2.2.x is released]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
- src/gmpy2_convert.h       |  21 +++++++
- src/gmpy2_convert_gmp.c   | 129 +++++++++++++-------------------------
- src/gmpy2_convert_utils.c |   2 +-
- 3 files changed, 65 insertions(+), 87 deletions(-)
-diff --git a/src/gmpy2_convert.h b/src/gmpy2_convert.h
-index f887d47..3e8cb2b 100644
--- a/src/gmpy2_convert.h
-+++ b/src/gmpy2_convert.h
-@@ -142,6 +142,27 @@ extern "C" {
- #define IS_TYPE_COMPLEX_ONLY(x)     ((x > OBJ_TYPE_REAL) && \
-                                      (x < OBJ_TYPE_COMPLEX))
- 
-+/* Compatibility macros (to work with PyLongObject internals).
-+ */
-+
-+#if PY_VERSION_HEX >= 0x030C0000
-+#  define TAG_FROM_SIGN_AND_SIZE(is_neg, size) ((is_neg?2:(size==0)) | (((size_t)size) << 3))
-+#  define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (obj->long_value.lv_tag = TAG_FROM_SIGN_AND_SIZE(is_neg, size))
-+#elif PY_VERSION_HEX >= 0x030900A4
-+#  define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (Py_SET_SIZE(obj, (is_neg?-1:1)*size))
-+#else
-+#  define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (Py_SIZE(obj) = (is_neg?-1:1)*size)
-+#endif
-+
-+#if PY_VERSION_HEX >= 0x030C0000
-+#  define GET_OB_DIGIT(obj) obj->long_value.ob_digit
-+#  define _PyLong_IsNegative(obj) ((obj->long_value.lv_tag & 3) == 2)
-+#  define _PyLong_DigitCount(obj) (obj->long_value.lv_tag >> 3)
-+#else
-+#  define GET_OB_DIGIT(obj) obj->ob_digit
-+#  define _PyLong_IsNegative(obj) (Py_SIZE(obj) < 0)
-+#  define _PyLong_DigitCount(obj) (_PyLong_IsNegative(obj)? -Py_SIZE(obj):Py_SIZE(obj))
-+#endif
- 
- /* Since the macros are used in gmpy2's codebase, these functions are skipped
-  * until they are needed for the C API in the future.
-diff --git a/src/gmpy2_convert_gmp.c b/src/gmpy2_convert_gmp.c
-index cf0891e..8b8df81 100644
--- a/src/gmpy2_convert_gmp.c
-+++ b/src/gmpy2_convert_gmp.c
-@@ -59,33 +59,24 @@ GMPy_MPZ_From_PyIntOrLong(PyObject *obj, CTXT_Object *context)
-     }
- #endif
- 
-    switch (Py_SIZE(templong)) {
-    case -1:
-        mpz_set_si(result->z, -(sdigit)templong->ob_digit[0]);
-+    len = _PyLong_DigitCount(templong);
-+    negative = _PyLong_IsNegative(templong);
-+
-+    switch (len) {
-+    case 1:
-+        mpz_set_si(result->z, (sdigit)GET_OB_DIGIT(templong)[0]);
-         break;
-     case 0:
-         mpz_set_si(result->z, 0);
-         break;
-    case 1:
-        mpz_set_si(result->z, templong->ob_digit[0]);
-        break;
-     default:
-        mpz_set_si(result->z, 0);
-
-        if (Py_SIZE(templong) < 0) {
-            len = - Py_SIZE(templong);
-            negative = 1;
-        } else {
-            len = Py_SIZE(templong);
-            negative = 0;
-        }
-
-        mpz_import(result->z, len, -1, sizeof(templong->ob_digit[0]), 0,
-                   sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit);
-+        mpz_import(result->z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0,
-+                   sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT,
-+                   GET_OB_DIGIT(templong));
-+    }
- 
-        if (negative) {
-            mpz_neg(result->z, result->z);
-        }
-+    if (negative) {
-+        mpz_neg(result->z, result->z);
-     }
-     return result;
- }
-@@ -105,33 +96,24 @@ mpz_set_PyIntOrLong(mpz_t z, PyObject *obj)
-     }
- #endif
- 
-    switch (Py_SIZE(templong)) {
-    case -1:
-        mpz_set_si(z, -(sdigit)templong->ob_digit[0]);
-+    len = _PyLong_DigitCount(templong);
-+    negative = _PyLong_IsNegative(templong);
-+
-+    switch (len) {
-+    case 1:
-+        mpz_set_si(z, (sdigit)GET_OB_DIGIT(templong)[0]);
-         break;
-     case 0:
-         mpz_set_si(z, 0);
-         break;
-    case 1:
-        mpz_set_si(z, templong->ob_digit[0]);
-        break;
-     default:
-        mpz_set_si(z, 0);
-
-        if (Py_SIZE(templong) < 0) {
-            len = - Py_SIZE(templong);
-            negative = 1;
-        } else {
-            len = Py_SIZE(templong);
-            negative = 0;
-        }
-
-        mpz_import(z, len, -1, sizeof(templong->ob_digit[0]), 0,
-                   sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit);
-+        mpz_import(z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0,
-+                   sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT,
-+                   GET_OB_DIGIT(templong));
-+    }
- 
-        if (negative) {
-            mpz_neg(z, z);
-        }
-+    if (negative) {
-+        mpz_neg(z, z);
-     }
-     return;
- }
-@@ -186,12 +168,7 @@ GMPy_PyLong_From_MPZ(MPZ_Object *obj, CTXT_Object *context)
- 
-     /* Assume gmp uses limbs as least as large as the builtin longs do */
- 
-    if (mpz_sgn(obj->z) < 0) {
-        negative = 1;
-    } else {
-        negative = 0;
-    }
-
-+    negative = mpz_sgn(obj->z) < 0;
-     size = (mpz_sizeinbase(obj->z, 2) + PyLong_SHIFT - 1) / PyLong_SHIFT;
- 
-     if (!(result = _PyLong_New(size))) {
-@@ -200,31 +177,20 @@ GMPy_PyLong_From_MPZ(MPZ_Object *obj, CTXT_Object *context)
-         /* LCOV_EXCL_STOP */
-     }
- 
-    mpz_export(result->ob_digit, &count, -1, sizeof(result->ob_digit[0]), 0,
-               sizeof(result->ob_digit[0])*8 - PyLong_SHIFT, obj->z);
-+    mpz_export(GET_OB_DIGIT(result), &count, -1, sizeof(GET_OB_DIGIT(result)[0]), 0,
-+               sizeof(GET_OB_DIGIT(result)[0])*8 - PyLong_SHIFT, obj->z);
- 
-     if (count == 0) {
-        result->ob_digit[0] = 0;
-+        GET_OB_DIGIT(result)[0] = 0;
-     }
- 
-     /* long_normalize() is file-static so we must reimplement it */
-     /* longobjp = long_normalize(longobjp); */
-    while ((size>0) && (result->ob_digit[size-1] == 0)) {
-+    while ((size>0) && (GET_OB_DIGIT(result)[size-1] == 0)) {
-         size--;
-     }
-#if PY_VERSION_HEX >= 0x030900A4
-    Py_SET_SIZE(result, size);
-#else
-    Py_SIZE(result) = size;
-#endif
- 
-    if (negative) {
-#if PY_VERSION_HEX >= 0x030900A4
-        Py_SET_SIZE(result, - Py_SIZE(result));
-#else
-        Py_SIZE(result) = - Py_SIZE(result);
-#endif
-    }
-+    _PyLong_SetSignAndDigitCount(result, negative, size);
-     return (PyObject*)result;
- }
- 
-@@ -476,33 +442,24 @@ GMPy_XMPZ_From_PyIntOrLong(PyObject *obj, CTXT_Object *context)
-     }
- #endif
- 
-    switch (Py_SIZE(templong)) {
-    case -1:
-        mpz_set_si(result->z, -(sdigit)templong->ob_digit[0]);
-+    len = _PyLong_DigitCount(templong);
-+    negative = _PyLong_IsNegative(templong);
-+
-+    switch (len) {
-+    case 1:
-+        mpz_set_si(result->z, (sdigit)GET_OB_DIGIT(templong)[0]);
-         break;
-     case 0:
-         mpz_set_si(result->z, 0);
-         break;
-    case 1:
-        mpz_set_si(result->z, templong->ob_digit[0]);
-        break;
-     default:
-        mpz_set_si(result->z, 0);
-
-        if (Py_SIZE(templong) < 0) {
-            len = - Py_SIZE(templong);
-            negative = 1;
-        } else {
-            len = Py_SIZE(templong);
-            negative = 0;
-        }
-
-        mpz_import(result->z, len, -1, sizeof(templong->ob_digit[0]), 0,
-                   sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit);
-+        mpz_import(result->z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0,
-+                   sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT,
-+                   GET_OB_DIGIT(templong));
-+    }
- 
-        if (negative) {
-            mpz_neg(result->z, result->z);
-        }
-+    if (negative) {
-+        mpz_neg(result->z, result->z);
-     }
-     return result;
- }
-@@ -639,7 +596,7 @@ GMPy_MPQ_From_PyStr(PyObject *s, int base, CTXT_Object *context)
-     }
- 
-     cp = PyBytes_AsString(ascii_str);
-    
-+
-     {
-         char *whereslash = strchr((char*)cp, '/');
-         char *wheredot = strchr((char*)cp, '.');
-diff --git a/src/gmpy2_convert_utils.c b/src/gmpy2_convert_utils.c
-index d676eaf..8908d17 100644
--- a/src/gmpy2_convert_utils.c
-+++ b/src/gmpy2_convert_utils.c
-@@ -123,7 +123,7 @@ static unsigned long
- GMPy_Integer_AsUnsignedLongWithType_v2(PyObject *x, int xtype)
- {
-     if IS_TYPE_PyInteger(xtype) {
-        if (Py_SIZE(x) < 0) {
-+        if (_PyLong_IsNegative(((PyLongObject*)x))) {
-             VALUE_ERROR("n must be > 0");
-             return (unsigned long)-1;
-         }
diff --git a/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb b/meta-python/recipes-devtools/python/python3-gmpy2_2.2.1.bb
index d9e9bd50e..15599bfad 100644
--- a/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb
+++ b/meta-python/recipes-devtools/python/python3-gmpy2_2.2.1.bb
@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 DEPENDS += "gmp mpfr libmpc"
-PYPI_PACKAGE = "gmpy2"
+SRC_URI[sha256sum] = "e83e07567441b78cb87544910cb3cc4fe94e7da987e93ef7622e76fb96650432"
-SRC_URI[sha256sum] = "bc297f1fd8c377ae67a4f493fc0f926e5d1b157e5c342e30a4d84dc7b9f95d96"
-inherit pypi setuptools3 python3native
+inherit pypi python_setuptools_build_meta python3native
-SRC_URI += "file://0001-src-fix-python-3.12-builds.patch"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-gnupg_0.5.2.bb b/meta-python/recipes-devtools/python/python3-gnupg_0.5.3.bb
index b69e2c465..8c231dce1 100644
--- a/meta-python/recipes-devtools/python/python3-gnupg_0.5.2.bb
+++ b/meta-python/recipes-devtools/python/python3-gnupg_0.5.3.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dabe659eadd6d97325b1582e41cfc11"
 PYPI_PACKAGE = "python-gnupg"
-SRC_URI[sha256sum] = "01d8013931c9fa3f45824bbea7054c03d6e11f258a72e7e086e168dbcb91854c"
+SRC_URI[sha256sum] = "290d8ddb9cd63df96cfe9284b9b265f19fd6e145e5582dc58fd7271f026d0a47"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-google-auth_2.30.0.bb b/meta-python/recipes-devtools/python/python3-google-auth_2.35.0.bb
index c51be1650..f0ef3c677 100644
--- a/meta-python/recipes-devtools/python/python3-google-auth_2.30.0.bb
+++ b/meta-python/recipes-devtools/python/python3-google-auth_2.35.0.bb
@@ -5,21 +5,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 inherit pypi setuptools3 ptest
-SRC_URI[sha256sum] = "ab630a1320f6720909ad76a7dbdb6841cdf5c66b328d690027e4867bdfb16688"
+SRC_URI[sha256sum] = "f4c64ed4e01e8e8b646ef34c018f8bf3338df0c8e37d8b3bba40e7f574a3278a"
 SRC_URI += " \
        file://run-ptest \
 "
+PYPI_PACKAGE = "google_auth"
 RDEPENDS:${PN}-ptest += " \
+        python3-aioresponses \
        python3-cryptography \
        python3-flask \
        python3-freezegun \
        python3-grpcio \
        python3-mock \
-        python3-oauth2client \
        python3-pyopenssl \
        python3-pytest \
+        python3-pytest-asyncio \
        python3-pytest-localserver \
        python3-pyu2f \
        python3-requests \
diff --git a/meta-python/recipes-devtools/python/python3-gpsd-py3_0.3.0.bb b/meta-python/recipes-devtools/python/python3-gpsd-py3_0.3.0.bb
index 50c1ebd15..e3da33a23 100644
--- a/meta-python/recipes-devtools/python/python3-gpsd-py3_0.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-gpsd-py3_0.3.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "This is a library for polling gpsd in Python3"
 HOMEPAGE = "https://github.com/MartijnBraam/gpsd-py3"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://setup.py;beginline=10;endline=10;md5=c2d9994c57f0444e39f1dab19af50254"
-SRC_URI[md5sum] = "041ce56e8879e2104b4d54c8119cd529"
 SRC_URI[sha256sum] = "2908d3bd78dfb6720ecfe22f97e139b5a4a198f38df3a77215cf644a33513192"
 PYPI_PACKAGE = "gpsd-py3"
diff --git a/meta-python/recipes-devtools/python/python3-greenlet_3.0.3.bb b/meta-python/recipes-devtools/python/python3-greenlet_3.1.1.bb
index a79db0049..c7a38b9a1 100644
--- a/meta-python/recipes-devtools/python/python3-greenlet_3.0.3.bb
+++ b/meta-python/recipes-devtools/python/python3-greenlet_3.1.1.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT & PSF-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \
                    file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a"
-SRC_URI[sha256sum] = "43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491"
+SRC_URI[sha256sum] = "4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-grpcio-channelz_1.62.2.bb b/meta-python/recipes-devtools/python/python3-grpcio-channelz_1.66.2.bb
index ed5ede425..dce7737b2 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio-channelz_1.62.2.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio-channelz_1.66.2.bb
@@ -8,8 +8,9 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62
 inherit pypi setuptools3
 DEPENDS += "python3-grpcio"
+PYPI_PACKAGE = "grpcio_channelz"
-SRC_URI[sha256sum] = "6e4ac2c43d76b245c5f66d98f523db08786b186128a655ee6f20a30a7e68e4f9"
+SRC_URI[sha256sum] = "4904c7837523436624895d9062694f290b7f33383b296a1ec7c497b6e4c7ed19"
 RDEPENDS:${PN} = "python3-grpcio"
diff --git a/meta-python/recipes-devtools/python/python3-grpcio-reflection_1.62.2.bb b/meta-python/recipes-devtools/python/python3-grpcio-reflection_1.66.2.bb
index 478c5b33e..c89d69bbd 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio-reflection_1.62.2.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio-reflection_1.66.2.bb
@@ -8,8 +8,9 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62
 inherit pypi setuptools3
 DEPENDS += "python3-grpcio"
+PYPI_PACKAGE = "grpcio_reflection"
-SRC_URI[sha256sum] = "2dd44806d68d0006636529bda573012b19a42281478c2d051cdaaebb91e2516c"
+SRC_URI[sha256sum] = "add827e2deb56e96803c82ace1d4e77fa0c8ec3747d6398e9951f739d71067d4"
 RDEPENDS:${PN} = "python3-grpcio"
diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.2.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.66.2.bb
index e05b8734d..6765bed04 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.2.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.66.2.bb
@@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62
 inherit pypi setuptools3
+PYPI_PACKAGE = "grpcio_tools"
 DEPENDS += "python3-grpcio"
 SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \
            file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \
            "
-SRC_URI[sha256sum] = "5fd5e1582b678e6b941ee5f5809340be5e0724691df5299aae8226640f94e18f"
+SRC_URI[sha256sum] = "4a36e07913d26ba5ccfd2685ba63ca97f26b08c249d2cc9e74dda37efa49d7e4"
 RDEPENDS:${PN} = "python3-grpcio"
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch
index 5cd94dee9..a2bd294a0 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch
@@ -1,4 +1,4 @@
-From 252aa78526287fe033c5656cd166e551fa5daa88 Mon Sep 17 00:00:00 2001
+From 0760579b4890b48ea3ab36e48f1f6fb3e7ed05f5 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 30 Jan 2023 10:31:10 -0800
 Subject: [PATCH] Include missing <cstdint> header
@@ -11,7 +11,6 @@ int32_t.
 Upstream-Status: Submitted [https://code-review.googlesource.com/c/re2/+/60970]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 third_party/re2/util/pcre.h | 1 +
 1 file changed, 1 insertion(+)
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch
index 82f15f88c..63ec2e23d 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch
@@ -1,4 +1,4 @@
-From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001
+From ee0e37b02d0d28279e103653688bf7203275ec47 Mon Sep 17 00:00:00 2001
 From: aurel32 <aurelien@aurel32.net>
 Date: Fri, 22 Mar 2024 14:21:13 -0700
 Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support
@@ -77,6 +77,3 @@ index 5e232c1..83552fc 100644
 #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY
 #endif
 #endif
-- 
-2.44.0
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch
index d830d9228..ff5a8f298 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch
@@ -1,4 +1,4 @@
-From 3359a87a71307336100b84e66b69bad385cd3cfc Mon Sep 17 00:00:00 2001
+From eee5daeb5b53b0c4a013aa5887a726434ec81600 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <martin.jansa@gmail.com>
 Date: Mon, 6 May 2024 01:36:39 +0200
 Subject: [PATCH] crypto: use _Generic only if !defined(__cplusplus)
@@ -43,18 +43,17 @@ third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in
 1166 |   return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
      |          ^~~~~~~~~~~~~~~~~~~
+Upstream-Status: Submitted [https://boringssl-review.googlesource.com/c/boringssl/+/68227 crypto: use _Generic only if !defined(__cplusplus)]
 Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
 ---
-Upstream-Status: Submitted [https://boringssl-review.googlesource.com/c/boringssl/+/68227 crypto: use _Generic only if !defined(__cplusplus)]
 crypto/internal.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/crypto/internal.h b/crypto/internal.h
-index a77102d76..30d6826dd 100644
+index f93c2e5..2fca2fb 100644
 --- a/crypto/internal.h
 +++ b/crypto/internal.h
-@@ -1176,7 +1176,7 @@ static inline uint64_t CRYPTO_rotr_u64(uint64_t value, int shift) {
+@@ -1193,7 +1193,7 @@ static inline uint64_t CRYPTO_rotr_u64(uint64_t value, int shift) {
 
 // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry
 // bit. |carry| must be zero or one.
@@ -63,7 +62,7 @@ index a77102d76..30d6826dd 100644
 
 #define CRYPTO_GENERIC_ADDC(x, y, carry, out_carry) \
   (_Generic((x),                                    \
-@@ -1228,7 +1228,7 @@ static inline uint64_t CRYPTO_addc_u64(uint64_t x, uint64_t y, uint64_t carry,
+@@ -1245,7 +1245,7 @@ static inline uint64_t CRYPTO_addc_u64(uint64_t x, uint64_t y, uint64_t carry,
 
 // CRYPTO_subc_* returns |x - y - borrow|, and sets |*out_borrow| to the borrow
 // bit. |borrow| must be zero or one.
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch
index 0b512b1d0..39f9fafba 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch
@@ -1,4 +1,4 @@
-From b3bca013007a4a66703573d243e433f22e1e6684 Mon Sep 17 00:00:00 2001
+From e2c78c555ab3d9509c4ade511e2f711eb7188626 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Wed, 15 May 2024 16:55:09 +0800
 Subject: [PATCH] target.h: define proper macro for ppc/ppc64
@@ -18,7 +18,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 1 file changed, 4 insertions(+)
 diff --git a/third_party/boringssl-with-bazel/src/include/openssl/target.h b/third_party/boringssl-with-bazel/src/include/openssl/target.h
-index 29b1dc6..d779813 100644
+index 2760f52..e743402 100644
 --- a/third_party/boringssl-with-bazel/src/include/openssl/target.h
 +++ b/third_party/boringssl-with-bazel/src/include/openssl/target.h
 @@ -54,6 +54,10 @@
@@ -32,6 +32,3 @@ index 29b1dc6..d779813 100644
 #else
 // The list above enumerates the platforms that BoringSSL supports. For these
 // platforms we keep a reasonable bar of not breaking them: automated test
-- 
-2.25.1
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
index 34ef7874e..584723e6d 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
@@ -1,4 +1,4 @@
-From 671618df3e48619f0c7a5a3acd8982374a5e43db Mon Sep 17 00:00:00 2001
+From f84421d8ee06890e2c98c0f7c9ec6c73f88e77c3 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 12 Feb 2023 21:25:04 -0800
 Subject: [PATCH] zlib: Include unistd.h for open/close C APIs
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch
index f39a9616d..1daebfa19 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch
@@ -1,4 +1,4 @@
-From 102dcce6610e6606fffd3a4986f84eb52177f8c8 Mon Sep 17 00:00:00 2001
+From a2ec96a96ff7ba016e800212a942b9f29f255415 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 13 Mar 2021 10:26:25 -0800
 Subject: [PATCH] An all-in-one patch that fixes several issues:
diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.66.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.66.2.bb
index fb91f345b..7c5176736 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio_1.66.1.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio_1.66.2.bb
@@ -13,7 +13,7 @@ SRC_URI += "file://0001-Include-missing-cstdint-header.patch \
           file://0001-target.h-define-proper-macro-for-ppc-ppc64.patch \
           file://0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \
           "
-SRC_URI[sha256sum] = "35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2"
+SRC_URI[sha256sum] = "563588c587b75c34b928bc428548e5b00ea38c46972181a4d8b75ba7e3f24231"
 RDEPENDS:${PN} = "python3-protobuf"
diff --git a/meta-python/recipes-devtools/python/python3-gunicorn_23.0.0.bb b/meta-python/recipes-devtools/python/python3-gunicorn_23.0.0.bb
index 8d825c865..3c819a934 100644
--- a/meta-python/recipes-devtools/python/python3-gunicorn_23.0.0.bb
+++ b/meta-python/recipes-devtools/python/python3-gunicorn_23.0.0.bb
@@ -11,9 +11,11 @@ SRC_URI += " \
        file://run-ptest \
 "
+# python-misc for wsgiref
 RDEPENDS:${PN}-ptest += " \
    python3-eventlet \
    python3-gevent \
+    python3-misc \
    python3-pytest \
    python3-unittest-automake-output \
 "
diff --git a/meta-python/recipes-devtools/python/python3-h5py/0001-setup_build.py-avoid-absolute-path.patch b/meta-python/recipes-devtools/python/python3-h5py/0001-setup_build.py-avoid-absolute-path.patch
index 0b8555734..de2f09ec8 100644
--- a/meta-python/recipes-devtools/python/python3-h5py/0001-setup_build.py-avoid-absolute-path.patch
+++ b/meta-python/recipes-devtools/python/python3-h5py/0001-setup_build.py-avoid-absolute-path.patch
@@ -1,4 +1,4 @@
-From 6f8cee826ef9309c174aa97cb6af2ba532ed9dba Mon Sep 17 00:00:00 2001
+From 59d1cc34739a18a32d3250973af2357c41d8d156 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Thu, 28 Jan 2021 18:44:10 -0800
 Subject: [PATCH] setup_build.py: avoid absolute path
@@ -9,16 +9,15 @@ Upstream-Status: Submitted [https://github.com/h5py/h5py/pull/1803]
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
 ---
 setup_build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/setup_build.py b/setup_build.py
-index 78c6677..64db7f7 100644
+index a041fa6..4d44215 100644
 --- a/setup_build.py
 +++ b/setup_build.py
-@@ -21,7 +21,7 @@ from setup_configure import BuildConfig
+@@ -20,7 +20,7 @@ from setup_configure import BuildConfig
 
 
 def localpath(*args):
diff --git a/meta-python/recipes-devtools/python/python3-h5py_3.11.0.bb b/meta-python/recipes-devtools/python/python3-h5py_3.12.1.bb
index 1cf5f5638..a84dd2882 100644
--- a/meta-python/recipes-devtools/python/python3-h5py_3.11.0.bb
+++ b/meta-python/recipes-devtools/python/python3-h5py_3.12.1.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c"
-SRC_URI[sha256sum] = "7b7e8f78072a2edec87c9836f25f34203fd492a4475709a18b417a33cfb21fa9"
+SRC_URI[sha256sum] = "326d70b53d31baa61f00b8aa5f95c2fcb9621a3ee8365d770c551a13dbbcbfdf"
 SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch"
diff --git a/meta-python/recipes-devtools/python/python3-html2text_2024.2.26.bb b/meta-python/recipes-devtools/python/python3-html2text_2024.2.26.bb
index 4a7ce1e5b..55f4c8b0a 100644
--- a/meta-python/recipes-devtools/python/python3-html2text_2024.2.26.bb
+++ b/meta-python/recipes-devtools/python/python3-html2text_2024.2.26.bb
@@ -12,13 +12,13 @@ SRC_URI += " \
        file://run-ptest \
 "
+RDEPENDS:${PN} += "python3-html"
 RDEPENDS:${PN}-ptest += " \
    python3-pytest \
    python3-unittest-automake-output \
 "
-RDEPENDS:${PN} += "python3-cgitb"
 do_install_ptest() {
        install -d ${D}${PTEST_PATH}/test
        cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/
diff --git a/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb b/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb
index d6272a07c..94fbe0455 100644
--- a/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb
@@ -2,7 +2,6 @@ SUMMARY = "HTML parser based on the WHATWG HTML specifcation"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ba5ada9e6fead1fdc32f43c9f10ba7c"
-SRC_URI[md5sum] = "6748742e2ec4cb99287a6bc82bcfe2b0"
 SRC_URI[sha256sum] = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-httpcore_1.0.5.bb b/meta-python/recipes-devtools/python/python3-httpcore_1.0.6.bb
index 6b0f8af4d..43c5629a2 100644
--- a/meta-python/recipes-devtools/python/python3-httpcore_1.0.5.bb
+++ b/meta-python/recipes-devtools/python/python3-httpcore_1.0.6.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1c1f23b073da202e1f4f9e426490210c"
 inherit pypi python_hatchling
-SRC_URI[sha256sum] = "34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61"
+SRC_URI[sha256sum] = "73f6dbd6eb8c21bbf7ef8efad555481853f5f6acdeaff1edb0694289269ee17f"
 DEPENDS += "\
    python3-hatch-fancy-pypi-readme-native \
diff --git a/meta-python/recipes-devtools/python/python3-httptools_0.6.1.bb b/meta-python/recipes-devtools/python/python3-httptools_0.6.2.bb
index 4192697df..73378baff 100644
--- a/meta-python/recipes-devtools/python/python3-httptools_0.6.1.bb
+++ b/meta-python/recipes-devtools/python/python3-httptools_0.6.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0a2d82955bf3facdf04cb882655e840e"
 inherit pypi setuptools3 ptest
-SRC_URI[sha256sum] = "c6e26c30455600b95d94b1b836085138e82f177351454ee841c148f93a9bad5a"
+SRC_URI[sha256sum] = "ae694efefcb61317c79b2fa1caebc122060992408e389bb00889567e463a47f1"
 SRC_URI += " \
        file://run-ptest \
diff --git a/meta-python/recipes-devtools/python/python3-huey_2.5.1.bb b/meta-python/recipes-devtools/python/python3-huey_2.5.2.bb
index 471fd6cc2..7829555b9 100644
--- a/meta-python/recipes-devtools/python/python3-huey_2.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-huey_2.5.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4"
 PYPI_PACKAGE = "huey"
-SRC_URI[sha256sum] = "8a323783ab434a095a4e72b8c48c5b8f957f9031fa860474a390a0927e957112"
+SRC_URI[sha256sum] = "df33db474c05414ed40ee2110e9df692369871734da22d74ffb035a4bd74047f"
 RDEPENDS:${PN} += " \
        python3-datetime \
diff --git a/meta-python/recipes-devtools/python/python3-humanize_4.10.0.bb b/meta-python/recipes-devtools/python/python3-humanize_4.11.0.bb
index a8668e148..ede3dc417 100644
--- a/meta-python/recipes-devtools/python/python3-humanize_4.10.0.bb
+++ b/meta-python/recipes-devtools/python/python3-humanize_4.11.0.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d"
-SRC_URI[sha256sum] = "06b6eb0293e4b85e8d385397c5868926820db32b9b654b932f57fa41c23c9978"
+SRC_URI[sha256sum] = "e66f36020a2d5a974c504bd2555cf770621dbdbb6d82f94a6857c0b1ea2608be"
 inherit pypi python_hatchling
diff --git a/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb b/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb
index 9fbd5157a..7804152d9 100644
--- a/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb
+++ b/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb
@@ -4,12 +4,12 @@ LICENSE = "LGPL-2.1-or-later"
 SECTION = "devel/python"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-inherit setuptools3 pypi
+inherit python_setuptools_build_meta pypi
 SRC_URI += "file://0001-Do-not-override-const-qualifier.patch"
 SRC_URI[sha256sum] = "3278827b803cf006a1df251f3e13374c7d26db779e5a33329cc11789b804bc2d"
-PYPI_PACKAGE = "inflate64"
+DEPENDS += "python3-setuptools-scm-native"
 RDEPENDS:${PN} += "\
    python3-core \
diff --git a/meta-python/recipes-devtools/python/python3-inflection_0.5.1.bb b/meta-python/recipes-devtools/python/python3-inflection_0.5.1.bb
index 5c6f4e235..ba1d0ec53 100644
--- a/meta-python/recipes-devtools/python/python3-inflection_0.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-inflection_0.5.1.bb
@@ -4,7 +4,6 @@ LICENSE = "MIT"
 SECTION = "devel/python"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2fb6fa1a6f1792d78de19ad1bb653c31"
-SRC_URI[md5sum] = "c3287d4f0e3bdf625a52d655cc514403"
 SRC_URI[sha256sum] = "1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417"
 inherit pypi setuptools3 ptest
diff --git a/meta-python/recipes-devtools/python/python3-ipaddress_1.0.23.bb b/meta-python/recipes-devtools/python/python3-ipaddress_1.0.23.bb
index 796213fc6..643878934 100644
--- a/meta-python/recipes-devtools/python/python3-ipaddress_1.0.23.bb
+++ b/meta-python/recipes-devtools/python/python3-ipaddress_1.0.23.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "https://github.com/phihag/ipaddress"
 LICENSE = "Python-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7f538584cc3407bf76042def7168548a"
-SRC_URI[md5sum] = "aaee67a8026782af1831148beb0d9060"
 SRC_URI[sha256sum] = "b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-ipy_1.01.bb b/meta-python/recipes-devtools/python/python3-ipy_1.01.bb
index 36d0b9ae2..6e65d622a 100644
--- a/meta-python/recipes-devtools/python/python3-ipy_1.01.bb
+++ b/meta-python/recipes-devtools/python/python3-ipy_1.01.bb
@@ -9,7 +9,6 @@ HOMEPAGE = "https://github.com/autocracy/python-ipy"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=848d24919845901b4f48bae5f13252e6"
-SRC_URI[md5sum] = "d6cf83e7f418ebbd23324ba1c658b907"
 SRC_URI[sha256sum] = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a"
 inherit pypi setuptools3_legacy ptest
diff --git a/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb b/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb
index 3261d8047..2a25d1d91 100644
--- a/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb
@@ -8,7 +8,6 @@ PYPI_PACKAGE = "ipython_genutils"
 UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/ipython_genutils"
 UPSTREAM_CHECK_REGEX = "/ipython_genutils/(?P<pver>(\d+[\.\-_]*)+)"
-SRC_URI[md5sum] = "5a4f9781f78466da0ea1a648f3e1f79f"
 SRC_URI[sha256sum] = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"
 inherit setuptools3 pypi
diff --git a/meta-python/recipes-devtools/python/python3-ipython_8.27.0.bb b/meta-python/recipes-devtools/python/python3-ipython_8.28.0.bb
index 94e731b88..f290971cb 100644
--- a/meta-python/recipes-devtools/python/python3-ipython_8.27.0.bb
+++ b/meta-python/recipes-devtools/python/python3-ipython_8.28.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://ipython.org"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f"
-SRC_URI[sha256sum] = "0b99a2dc9f15fd68692e898e5568725c6d49c527d36a9fb5960ffbdeaa82ff7e"
+SRC_URI[sha256sum] = "0d0d15ca1e01faeb868ef56bc7ee5a0de5bd66885735682e8a322ae289a13d1a"
 RDEPENDS:${PN} = "\
    python3-setuptools \
diff --git a/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb b/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb
index afabe14a8..d20c9ad42 100644
--- a/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb
+++ b/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=bd236e1f590973467a427bb354be0f46"
 inherit pypi setuptools3 ptest
-SRC_URI[md5sum] = "e05bdb60fa80f25bc60e73e0c6b7c5dc"
 SRC_URI[sha256sum] = "472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8"
 RDEPENDS:${PN} += "python3-compression python3-io python3-pprint python3-shell"
diff --git a/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb b/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
index b9c1c4e38..c3c39ad38 100644
--- a/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Kconfiglib is a Kconfig implementation in Python"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=712177a72a3937909543eda3ad1bfb7c"
-SRC_URI[md5sum] = "4ad68618824d4bad1d1de1d7eb838bba"
 SRC_URI[sha256sum] = "bed2cc2216f538eca4255a83a4588d8823563cdd50114f86cf1a2674e602c93c"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-keras-preprocessing_1.1.2.bb b/meta-python/recipes-devtools/python/python3-keras-preprocessing_1.1.2.bb
index 749b6c8c9..5a2d7d950 100644
--- a/meta-python/recipes-devtools/python/python3-keras-preprocessing_1.1.2.bb
+++ b/meta-python/recipes-devtools/python/python3-keras-preprocessing_1.1.2.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1744b320500cc2e3112964d00cce7aa4"
 inherit pypi setuptools3
-SRC_URI[md5sum] = "d2a0e10437cfa5c2d09458a84fb58d05"
 SRC_URI[sha256sum] = "add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3"
 PYPI_PACKAGE = "Keras_Preprocessing"
diff --git a/meta-python/recipes-devtools/python/python3-libconf_2.0.1.bb b/meta-python/recipes-devtools/python/python3-libconf_2.0.1.bb
index 80bc59d97..a4ee7bddd 100644
--- a/meta-python/recipes-devtools/python/python3-libconf_2.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-libconf_2.0.1.bb
@@ -5,7 +5,6 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=05f696c084eaaf5d75bc150f70975758"
-SRC_URI[md5sum] = "e212611cbf6a696e05742a983b3a0c57"
 SRC_URI[sha256sum] = "2f907258953ba60a95a82d5633726b47c81f2d5cf8d8801b092579016d757f4a"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb b/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb
index 5ad2a5995..8c05df38e 100644
--- a/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb
+++ b/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb
@@ -5,7 +5,6 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d94c10c546b419eddc6296157ec40747"
-SRC_URI[md5sum] = "34b48098c1fba26de79a0d67a17a588a"
 SRC_URI[sha256sum] = "e9ca006a4df2488a60bd9a740011ee948d81904be2364f017e560169508f560f"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb b/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb
index af738e08e..37025cb4d 100644
--- a/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb
+++ b/meta-python/recipes-devtools/python/python3-lockfile_0.12.2.bb
@@ -6,7 +6,6 @@ HOMEPAGE = "https://pypi.org/project/lockfile/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2340dffbbfea534b58f1349984eeef72"
-SRC_URI[md5sum] = "a6a1a82957a23afdf44cfdd039b65ff9"
 SRC_URI[sha256sum] = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb b/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb
index 97b3e7236..288ce0c84 100644
--- a/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Generator for random text that looks like Latin"
 HOMEPAGE = "https://github.com/sfischer13/python-lorem"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5301c01b2bcdeedba23645f94db2f179"
-SRC_URI[md5sum] = "e3f0064a94c13e19780eb724affdb426"
 SRC_URI[sha256sum] = "785f4109a241fc2891e59705e85d065f6e6d3ed6ad91750a8cb54d4f3e59d934"
 SRC_URI += "\
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-address-openssl-3.x-build-issue.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-address-openssl-3.x-build-issue.patch
deleted file mode 100644
index c67e50803..000000000
--- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-address-openssl-3.x-build-issue.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0d824e5c2ab13e761ffaeabdccf9513d5b8f280d Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 8 Oct 2021 11:18:35 +0200
-Subject: [PATCH] setup.py: address openssl 3.x build issue
-swig throws:
-| /home/alex/development/poky/build-metaoe/tmp/work/x86_64-linux/python3-m2crypto-native/0.38.0-r0/recipe-sysroot-native/usr/include/openssl/macros.h:155: Error: CPP #error ""OPENSSL_API_COMPAT expresses an impossible API compatibility level"". Use the -cpperraswarn option to continue swig processing.
-I'm not sure why; upstream should take a look.
-Upstream-Status: Inappropriate [workaround]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/setup.py b/setup.py
-index 2c65404..74704bc 100644
--- a/setup.py
-+++ b/setup.py
-@@ -192,6 +192,7 @@ class _M2CryptoBuildExt(build_ext.build_ext):
- 
-         self.swig_opts.append('-includeall')
-         self.swig_opts.append('-modern')
-+        self.swig_opts.append('-cpperraswarn')
-         self.swig_opts.append('-builtin')
- 
-         # These two lines are a workaround for
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
deleted file mode 100644
index 0baadfcaa..000000000
--- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From dfb83a41aaeae326e9b6f02b233af375bc7b8815 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Fri, 29 Mar 2013 15:17:17 +0100
-Subject: [PATCH] setup.py: link in sysroot, not in host directories
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-Upstream-Status: Pending [Unknown]
---
- setup.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
--- a/setup.py
-+++ b/setup.py
-@@ -135,6 +135,7 @@ class _M2CryptoBuildExt(build_ext.build_
-         self.set_undefined_options('build', ('bundledlls', 'bundledlls'))
- 
-         self.libraries = ['ssl', 'crypto']
-+        self.openssl = os.environ.get( "STAGING_DIR" )
-         if sys.platform == 'win32':
-             self.libraries = ['ssleay32', 'libeay32']
-             if self.openssl and openssl_version(self.openssl,
-@@ -159,8 +160,8 @@ class _M2CryptoBuildExt(build_ext.build_
- 
-         if self.openssl is not None:
-             log.debug('self.openssl = %s', self.openssl)
-            openssl_library_dir = os.path.join(self.openssl, 'lib')
-            openssl_include_dir = os.path.join(self.openssl, 'include')
-+            openssl_library_dir = os.environ.get( "STAGING_LIBDIR" )
-+            openssl_include_dir = os.environ.get( "STAGING_INCDIR" )
- 
-             self.library_dirs.append(openssl_library_dir)
-             self.include_dirs.append(openssl_include_dir)
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/avoid-host-contamination.patch b/meta-python/recipes-devtools/python/python3-m2crypto/avoid-host-contamination.patch
deleted file mode 100644
index 3cd6f7c27..000000000
--- a/meta-python/recipes-devtools/python/python3-m2crypto/avoid-host-contamination.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Filter out '/usr/include' for swig to avoid host contamination issue.
-Upstream-Status: Inappropriate [cross compile specific]
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/setup.py b/setup.py
-index 5a12981..389d49f 100644
--- a/setup.py
-+++ b/setup.py
-@@ -153,7 +153,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
-             self.swig_opts.append('-py3')
- 
-         # swig seems to need the default header file directories
-        self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()])
-+        self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()
-+                                            if i != '/usr/include'])
- 
-         log.debug('self.include_dirs = %s', self.include_dirs)
-         log.debug('self.library_dirs = %s', self.library_dirs)
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch b/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch
deleted file mode 100644
index 77ef7e557..000000000
--- a/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Do not compute platform, this does not work in cross compile environment
-since it pokes at the system for getting architecture values
-Upstream-Status: Inappropriate
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/setup.py
-+++ b/setup.py
-@@ -169,24 +169,6 @@ class _M2CryptoBuildExt(build_ext.build_
-             log.debug('self.include_dirs = %s', self.include_dirs)
-             log.debug('self.library_dirs = %s', self.library_dirs)
- 
-        if platform.system() == "Linux":
-            # For RedHat-based distros, the '-D__{arch}__' option for
-            # Swig needs to be normalized, particularly on i386.
-            mach = platform.machine().lower()
-            if mach in ('i386', 'i486', 'i586', 'i686'):
-                arch = '__i386__'
-            elif mach in ('ppc64', 'powerpc64', 'ppc64le', 'ppc64el'):
-                arch = '__powerpc64__'
-            elif mach in ('ppc', 'powerpc'):
-                arch = '__powerpc__'
-            else:
-                arch = '__%s__' % mach
-            self.swig_opts.append('-D%s' % arch)
-            if mach in ('ppc64le', 'ppc64el'):
-                self.swig_opts.append('-D_CALL_ELF=2')
-            if mach in ('arm64_be'):
-                self.swig_opts.append('-D__AARCH64EB__')
-
-         self.swig_opts.extend(['-I%s' % i for i in self.include_dirs])
- 
-         # Some Linux distributor has added the following line in
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.42.0.bb
index 1d8c22d19..6b178cd12 100644
--- a/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb
+++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.42.0.bb
@@ -4,17 +4,9 @@ HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e"
-FILESEXTRAPATHS:prepend := "${THISDIR}/python-m2crypto:"
+SRC_URI[sha256sum] = "42b62df2caf623161b1d643a7235464c2fe2a3105049ebc498a6d47dc08f64b4"
-SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \
+inherit pypi siteinfo python_setuptools_build_meta
-            file://cross-compile-platform.patch \
-            file://avoid-host-contamination.patch \
-            file://0001-setup.py-address-openssl-3.x-build-issue.patch \
-            "
-SRC_URI[sha256sum] = "bbfd113ec55708c05816252a4f09e4237df4f3bbfc8171cbbc33057d257bbb30"
-PYPI_PACKAGE = "M2Crypto"
-inherit pypi siteinfo setuptools3
 DEPENDS += "openssl swig-native"
 RDEPENDS:${PN} += "\
diff --git a/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb b/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb
index 7ebf9f141..f212f8d8d 100644
--- a/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb
@@ -8,12 +8,10 @@ HOMEPAGE = "https://github.com/supervisor/meld3"
 LICENSE = "BSD-4-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9e7581cef5645475fcefebdc15ed7abf"
-SRC_URI[md5sum] = "1add16caefc9e6b82ef4f40532cb4918"
 SRC_URI[sha256sum] = "3ea266994f1aa83507679a67b493b852c232a7905e29440a6b868558cad5e775"
 inherit pypi setuptools3
 RDEPENDS:${PN} += " \
-    python3-cgitb \
    python3-xml \
 "
diff --git a/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb b/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb
index 966ff86de..a3bbd5d1a 100644
--- a/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb
+++ b/meta-python/recipes-devtools/python/python3-msm_0.8.8.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "https://github.com/MycroftAI/mycroft-skills-manager"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa"
-SRC_URI[md5sum] = "cf1fc0d1d86af68003cae53c71ec6288"
 SRC_URI[sha256sum] = "a502aee54917cd394217b31c977a1ba3d9541a0120e0a045c49fd77b328e4a29"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-multidict_6.0.5.bb b/meta-python/recipes-devtools/python/python3-multidict_6.1.0.bb
index 6346152ae..1132e9ba5 100644
--- a/meta-python/recipes-devtools/python/python3-multidict_6.0.5.bb
+++ b/meta-python/recipes-devtools/python/python3-multidict_6.1.0.bb
@@ -8,7 +8,7 @@ inherit pypi python_setuptools_build_meta ptest
 PV .= "+git"
-SRCREV = "a9b281b2ef4ab25d95d6b268aa88c428e75c3696"
+SRCREV = "4140e63780dc6dd600a1837cb9b4c5198c3dcd68"
 PYPI_SRC_URI = "git://github.com/aio-libs/multidict;branch=master;protocol=https"
 S = "${WORKDIR}/git"
diff --git a/meta-python/recipes-devtools/python/python3-nmap_1.6.0.bb b/meta-python/recipes-devtools/python/python3-nmap_1.9.1.bb
index 2293e3ddf..25e382088 100644
--- a/meta-python/recipes-devtools/python/python3-nmap_1.6.0.bb
+++ b/meta-python/recipes-devtools/python/python3-nmap_1.9.1.bb
@@ -8,7 +8,7 @@ DEPENDS += "python3-wheel-native"
 PYPI_PACKAGE = "python3-nmap"
-SRC_URI[sha256sum] = "892b5091cde429fabfb8ba63382b2db8fd795193ba147558d0a7d5534c956255"
+SRC_URI[sha256sum] = "8465cfb013f5cdfa8a1050c40cdae600b581ee32f1864ec404927aee49b4262c"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-outcome/run-ptest b/meta-python/recipes-devtools/python/python3-outcome/run-ptest
new file mode 100644
index 000000000..8d2017d39
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-outcome/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+pytest --automake
diff --git a/meta-python/recipes-devtools/python/python3-outcome_1.3.0.post0.bb b/meta-python/recipes-devtools/python/python3-outcome_1.3.0.post0.bb
new file mode 100644
index 000000000..971430187
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-outcome_1.3.0.post0.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Capture the outcome of Python function calls."
+HOMEPAGE = "https://github.com/python-trio/outcome"
+LICENSE = "Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fa7b86389e58dd4087a8d2b833e5fe96 \
+                    file://LICENSE.APACHE2;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    file://LICENSE.MIT;md5=e62ba5042d5983462ad229f5aec1576c"
+SRC_URI[sha256sum] = "9dcf02e65f2971b80047b377468e72a268e15c0af3cf1238e6ff14f7f91143b8"
+inherit pypi setuptools3 ptest
+SRC_URI += " \
+        file://run-ptest \
+"
+RDEPENDS:${PN}-ptest += " \
+        python3-pytest \
+        python3-pytest-asyncio \
+        python3-unittest-automake-output \
+        python3-outcome \
+"
+RDEPENDS:${PN} += " \
+        python3-asyncio \
+        python3-attrs \
+        python3-core \
+        python3-pytest \
+        python3-typing-extensions \
+"
+do_install_ptest() {
+        install -d ${D}${PTEST_PATH}/tests
+        cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
diff --git a/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb b/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb
index 3af9349d4..8535cd445 100644
--- a/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb
+++ b/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "https://github.com/MycroftAI/padaos"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://README.md;md5=b51c3e8e53a7cd95c13c5aab6cbc8e67"
-SRC_URI[md5sum] = "dbf852015ef87a6694549779fb475b52"
 SRC_URI[sha256sum] = "2ac05fcbc826873c574568aa5ce09945d6ea987bee10399e766eb8f7c6356d72"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-padatious_0.4.8.bb b/meta-python/recipes-devtools/python/python3-padatious_0.4.8.bb
index fef6376ef..3e4cb1c90 100644
--- a/meta-python/recipes-devtools/python/python3-padatious_0.4.8.bb
+++ b/meta-python/recipes-devtools/python/python3-padatious_0.4.8.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "https://github.com/MycroftAI/padatious"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://README.md;md5=cc85c733dffe81e8a7fde2e8f8a6a404"
-SRC_URI[md5sum] = "7dd2f1830737dc142aa199f77dacf32e"
 SRC_URI[sha256sum] = "e471f251b94e8cadf6e4214f0f3b7b36678848aaa8c51cd5638ab23ecb716f75"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb b/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb
index 1fc967d95..de33e4eb6 100644
--- a/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb
+++ b/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "https://github.com/krig/parallax/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=52c67ffa6102f288a0347f8c5802fd18"
-SRC_URI[md5sum] = "e312397b083426af84db7076dc2a28d7"
 SRC_URI[sha256sum] = "c16703202ff67aed4740c0727df304abe9f3e7851e653533b24de21b338d9081"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-paramiko_3.4.1.bb b/meta-python/recipes-devtools/python/python3-paramiko_3.5.0.bb
index 498bb6d01..8ccf939f7 100644
--- a/meta-python/recipes-devtools/python/python3-paramiko_3.4.1.bb
+++ b/meta-python/recipes-devtools/python/python3-paramiko_3.5.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/paramiko/paramiko/"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5"
-SRC_URI[sha256sum] = "8b15302870af7f6652f2e038975c1d2973f06046cb5d7d65355668b3ecbece0c"
+SRC_URI[sha256sum] = "ad11e540da4f55cedda52931f1a3f812a8238a7af7f62a60de538cd80bb28124"
 PYPI_PACKAGE = "paramiko"
diff --git a/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb b/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb
index 8b66e2592..6f862804c 100644
--- a/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb
+++ b/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb
@@ -9,7 +9,6 @@ HOMEPAGE = "https://foss.heptapod.net/python-libs/passlib/wikis/home"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c8449c5e10474d113ab787ed2753bafe"
-SRC_URI[md5sum] = "3a229cbd00dfb33e99885b43325e0591"
 SRC_URI[sha256sum] = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-pastedeploy_3.1.0.bb b/meta-python/recipes-devtools/python/python3-pastedeploy_3.1.0.bb
index 27f32bf1a..e3405939c 100644
--- a/meta-python/recipes-devtools/python/python3-pastedeploy_3.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pastedeploy_3.1.0.bb
@@ -3,19 +3,22 @@ HOMEPAGE = "https://pylonsproject.org/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://license.txt;md5=1798f29d55080c60365e6283cb49779c"
-inherit pypi
+inherit pypi python_setuptools_build_meta
 PYPI_PACKAGE = "PasteDeploy"
 SRC_URI[sha256sum] = "9ddbaf152f8095438a9fe81f82c78a6714b92ae8e066bed418b6a7ff6a095a95"
-S = "${WORKDIR}/PasteDeploy-${PV}"
-inherit setuptools3
 # Uncomment this line to enable all the optional features.
 #PACKAGECONFIG ?= "paste docs"
 PACKAGECONFIG[paste] = ",,,python3-paste"
 PACKAGECONFIG[docs] = ",,,python3-sphinx python3-pylons-sphinx-themes"
-DEPENDS= "python3 python3-setuptools-scm-native python3-pytest-runner-native"
+RDEPENDS:${PN} += " \
-RDEPENDS:${PN} += "python3-core  python3-misc python3-netclient python3-pkgutil python3-setuptools python3-threading python3-core"
+        python3-core \
+        python3-misc \
+        python3-netclient \
+        python3-pkgutil \
+        python3-setuptools \
+        python3-threading \
+"
diff --git a/meta-python/recipes-devtools/python/python3-pdm-backend_2.3.3.bb b/meta-python/recipes-devtools/python/python3-pdm-backend_2.4.2.bb
index e78f1957a..903caad6e 100644
--- a/meta-python/recipes-devtools/python/python3-pdm-backend_2.3.3.bb
+++ b/meta-python/recipes-devtools/python/python3-pdm-backend_2.4.2.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 SECTION = "devel/python"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4a564297b3c5b629a528b92fd8ff61ea"
-SRC_URI[sha256sum] = "a8616f628ec84353d7a0ba86b228dcf01bab5debc9e4d1a29e5311a52425d594"
+SRC_URI[sha256sum] = "1f833e527ae172f34b4b84e2fcf1f65859a2a5ca746e496d8313b3ea6539969f"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb b/meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb
new file mode 100644
index 000000000..f20f11ff4
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb
@@ -0,0 +1,13 @@
+SUMMARY = "pdm plugin to publish locked dependencies as optional-dependencies"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=19382cdf9c143df4f00b9caa0b60c75a"
+SRC_URI[sha256sum] = "b784135abf62b93ce0a11332ee24723a2699b7f266fddb7950a5b70c93df6214"
+inherit pypi python_setuptools_build_meta
+DEPENDS += " python3-pdm-backend-native"
+PYPI_PACKAGE = "pdm_build_locked"
+BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-pdm_2.16.1.bb b/meta-python/recipes-devtools/python/python3-pdm_2.19.2.bb
index 91ec75938..29c70d18e 100644
--- a/meta-python/recipes-devtools/python/python3-pdm_2.16.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pdm_2.19.2.bb
@@ -4,12 +4,13 @@ LICENSE = "MIT"
 SECTION = "devel/python"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2eb31a2cc1a758c34b499f287dd04ef2"
-SRC_URI[sha256sum] = "b8680028b3aff3af8e15b483467da36bb9f02fcd402cf939da8ab6375d955131"
+SRC_URI[sha256sum] = "efb39264569181d0375536ef81c556648f16b540d429a53715730490a2283567"
 inherit pypi python_setuptools_build_meta
 DEPENDS += " \
    python3-pdm-backend-native \
+    python3-pdm-build-locked-native \
 "
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb b/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb
index 68507e248..6c7fe4df3 100644
--- a/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb
@@ -4,7 +4,6 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://README.rst;md5=d8ebbbe831259ce010179d2f310b0f3e"
-SRC_URI[md5sum] = "a03bb494859e87b42601b61b1b043a0c"
 SRC_URI[sha256sum] = "603a46e5c358ce20ac4807a0eeafac7505d1125a4c1bd8378757ada06f61bed8"
 inherit pypi setuptools3
@@ -13,5 +12,4 @@ RDEPENDS:${PN} += "python3-prettytable \
            python3-cmd2 \
            python3-pyparsing"
-SRC_URI[md5sum] = "603821d06db945c71d811b5a8d78423c"
 SRC_URI[sha256sum] = "fe249b52e20498e59e0b5c5256aa52ee99fc295b26ec9eaa85776ffdb9fe6374"
diff --git a/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb b/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb
index b7fa69ffa..ffd5b1c92 100644
--- a/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb
+++ b/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "https://github.com/matthewscholefield/petact"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://README.md;md5=c8533d4ba77519398cdae0173db799a1"
-SRC_URI[md5sum] = "47e9a6abc91b4022953e4007ddae9e68"
 SRC_URI[sha256sum] = "5dcb0d44f86a601e41a2def9770993cd0ea45c76d37eb3f35e3dd61aa50350e6"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb b/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb
index bb16c78ce..8eb55c460 100644
--- a/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb
+++ b/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=905c08218089ffebea3a64c82fc4d7d0"
 PYPI_PACKAGE = "pickleshare"
-SRC_URI[md5sum] = "44ab782615894a812ab96669a122a634"
 SRC_URI[sha256sum] = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"
 inherit setuptools3 pypi
diff --git a/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb b/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb
index c90f55105..55667ac81 100644
--- a/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb
+++ b/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb
@@ -4,7 +4,6 @@ HOMEPAGE = "https://github.com/trbs/pid/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=83d53cbd3105063f20305bc313464e29"
-SRC_URI[md5sum] = "af607e6e2a51129e3fef516b7994c85b"
 SRC_URI[sha256sum] = "0e33670e83f6a33ebb0822e43a609c3247178d4a375ff50a4689e266d853eb66"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-pint/0001-dataclass-frozen-True-for-Python-3.13-compatibility.patch b/meta-python/recipes-devtools/python/python3-pint/0001-dataclass-frozen-True-for-Python-3.13-compatibility.patch
new file mode 100644
index 000000000..6f9b0f5bc
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pint/0001-dataclass-frozen-True-for-Python-3.13-compatibility.patch
@@ -0,0 +1,116 @@
+From dc729d5b6574e1c44ec12e13b68c2b900e4a7ba1 Mon Sep 17 00:00:00 2001
+From: Simon Willison <swillison@gmail.com>
+Date: Fri, 12 Jul 2024 17:23:21 -0700
+Subject: [PATCH] @dataclass(frozen=True) for Python 3.13 compatibility
+Upstream-Status: Submitted [https://github.com/hgrecco/pint/pull/2037]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ pint/errors.py | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+diff --git a/pint/errors.py b/pint/errors.py
+index 59d3b45..f080f52 100644
+--- a/pint/errors.py
+++ b/pint/errors.py
+@@ -81,12 +81,12 @@ class WithDefErr:
+         return DefinitionError(self.name, self.__class__, msg)
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class PintError(Exception):
+     """Base exception for all Pint errors."""
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class DefinitionError(ValueError, PintError):
+     """Raised when a definition is not properly constructed."""
+ 
+@@ -102,7 +102,7 @@ class DefinitionError(ValueError, PintError):
+         return self.__class__, tuple(getattr(self, f.name) for f in fields(self))
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class DefinitionSyntaxError(ValueError, PintError):
+     """Raised when a textual definition has a syntax error."""
+ 
+@@ -115,7 +115,7 @@ class DefinitionSyntaxError(ValueError, PintError):
+         return self.__class__, tuple(getattr(self, f.name) for f in fields(self))
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class RedefinitionError(ValueError, PintError):
+     """Raised when a unit or prefix is redefined."""
+ 
+@@ -130,7 +130,7 @@ class RedefinitionError(ValueError, PintError):
+         return self.__class__, tuple(getattr(self, f.name) for f in fields(self))
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class UndefinedUnitError(AttributeError, PintError):
+     """Raised when the units are not defined in the unit registry."""
+ 
+@@ -150,13 +150,13 @@ class UndefinedUnitError(AttributeError, PintError):
+         return self.__class__, tuple(getattr(self, f.name) for f in fields(self))
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class PintTypeError(TypeError, PintError):
+     def __reduce__(self):
+         return self.__class__, tuple(getattr(self, f.name) for f in fields(self))
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class DimensionalityError(PintTypeError):
+     """Raised when trying to convert between incompatible units."""
+ 
+@@ -183,7 +183,7 @@ class DimensionalityError(PintTypeError):
+         return self.__class__, tuple(getattr(self, f.name) for f in fields(self))
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class OffsetUnitCalculusError(PintTypeError):
+     """Raised on ambiguous operations with offset units."""
+ 
+@@ -208,7 +208,7 @@ class OffsetUnitCalculusError(PintTypeError):
+         return self.__class__, tuple(getattr(self, f.name) for f in fields(self))
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class LogarithmicUnitCalculusError(PintTypeError):
+     """Raised on inappropriate operations with logarithmic units."""
+ 
+@@ -233,7 +233,7 @@ class LogarithmicUnitCalculusError(PintTypeError):
+         return self.__class__, tuple(getattr(self, f.name) for f in fields(self))
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class UnitStrippedWarning(UserWarning, PintError):
+     msg: str
+ 
+@@ -241,13 +241,13 @@ class UnitStrippedWarning(UserWarning, PintError):
+         return self.__class__, tuple(getattr(self, f.name) for f in fields(self))
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class UnexpectedScaleInContainer(Exception):
+     def __reduce__(self):
+         return self.__class__, tuple(getattr(self, f.name) for f in fields(self))
+ 
+ 
+-@dataclass(frozen=False)
+@dataclass(frozen=True)
+ class UndefinedBehavior(UserWarning, PintError):
+     msg: str
+ 
diff --git a/meta-python/recipes-devtools/python/python3-pint/run-ptest b/meta-python/recipes-devtools/python/python3-pint/run-ptest
index 5cec71169..8d2017d39 100644
--- a/meta-python/recipes-devtools/python/python3-pint/run-ptest
+++ b/meta-python/recipes-devtools/python/python3-pint/run-ptest
@@ -1,3 +1,3 @@
 #!/bin/sh
-pytest
+pytest --automake
diff --git a/meta-python/recipes-devtools/python/python3-pint_0.24.1.bb b/meta-python/recipes-devtools/python/python3-pint_0.24.3.bb
index 8959a72ff..337f58720 100644
--- a/meta-python/recipes-devtools/python/python3-pint_0.24.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pint_0.24.3.bb
@@ -6,14 +6,9 @@ SECTION = "devel/python"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bccf824202692270a1e0829a62e3f47b"
-PYPI_PACKAGE := "Pint"
+inherit pypi ptest python_setuptools_build_meta
-inherit ptest python_setuptools_build_meta
+SRC_URI[sha256sum] = "d54771093e8b94c4e0a35ac638c2444ddf3ef685652bab7675ffecfa0c5c5cdf"
-SRCREV = "4c2caccfc6cdac1f80a9bfa15ebea1ca49836881"
-SRC_URI = "git://github.com/hgrecco/pint;protocol=https;branch=master"
-S = "${WORKDIR}/git"
-#SRC_URI[sha256sum] = "e1509b91606dbc52527c600a4ef74ffac12fff70688aff20e9072409346ec9b4"
 DEPENDS += "python3-setuptools-scm-native"
@@ -21,18 +16,25 @@ BBCLASSEXTEND = "native nativesdk"
 SRC_URI += " \
        file://run-ptest \
+        file://0001-dataclass-frozen-True-for-Python-3.13-compatibility.patch \
 "
 RDEPENDS:${PN} += " \
-    python3-setuptools \
+        python3-setuptools \
-    python3-packaging \
+        python3-packaging \
 "
+# python3-misc for timeit.py 
 RDEPENDS:${PN}-ptest += " \
        python3-appdirs \
+        python3-attrs \
        python3-flexcache \
        python3-flexparser \
+        python3-misc \
        python3-pytest \
+        python3-pytest-benchmark \
+        python3-pytest-subtests \
+        python3-statistics \
+        python3-unittest-automake-output \
 "
 do_install_ptest() {
diff --git a/meta-python/recipes-devtools/python/python3-platformdirs_4.3.1.bb b/meta-python/recipes-devtools/python/python3-platformdirs_4.3.6.bb
index a994197ef..02d8c3cec 100644
--- a/meta-python/recipes-devtools/python/python3-platformdirs_4.3.1.bb
+++ b/meta-python/recipes-devtools/python/python3-platformdirs_4.3.6.bb
@@ -7,7 +7,7 @@ SRC_URI += " \
    file://run-ptest \
 "
-SRC_URI[sha256sum] = "63b79589009fa8159973601dd4563143396b35c5f93a58b36f9049ff046949b1"
+SRC_URI[sha256sum] = "357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907"
 inherit pypi python_hatchling ptest
diff --git a/meta-python/recipes-devtools/python/python3-portion/run-ptest b/meta-python/recipes-devtools/python/python3-portion/run-ptest
new file mode 100644
index 000000000..8d2017d39
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-portion/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+pytest --automake
diff --git a/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb b/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb
deleted file mode 100644
index a5e26f302..000000000
--- a/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Python data structure and operations for intervals"
-HOMEPAGE = "https://github.com/AlexandreDecan/portion"
-SECTION = "devel/python"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab"
-inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "5289b40d98959b16b3f6927781678935d3df1b7c14947f5d7778e5e04dd9a065"
-RDEPENDS:${PN} = "\
-    python3-sortedcontainers \
-"
-BBCLASSEXTEND = "native"
diff --git a/meta-python/recipes-devtools/python/python3-portion_2.5.0.bb b/meta-python/recipes-devtools/python/python3-portion_2.5.0.bb
new file mode 100644
index 000000000..269473e93
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-portion_2.5.0.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Python data structure and operations for intervals"
+HOMEPAGE = "https://github.com/AlexandreDecan/portion"
+SECTION = "devel/python"
+LICENSE = "LGPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404"
+inherit pypi python_setuptools_build_meta ptest
+SRC_URI[sha256sum] = "80ae7bab71f4844e3eb33c57954d76a3bd4cb351039b6e260e779325aeb4a487"
+SRC_URI += " \
+        file://run-ptest \
+"
+RDEPENDS:${PN} += "\
+        python3-sortedcontainers \
+"
+RDEPENDS:${PN}-ptest += " \
+        python3-pytest \
+        python3-unittest-automake-output \
+"
+do_install_ptest() {
+        install -d ${D}${PTEST_PATH}/tests
+        # This file tests README.md and deleted as redundant.
+        rm -f ${S}/tests/test_doc.py
+        cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
+BBCLASSEXTEND = "native"
diff --git a/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb b/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb
index 1fb72de12..ea453366a 100644
--- a/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb
+++ b/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "https://github.com/MycroftAI/mycroft-precise"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://README.md;md5=2ad29e930f3107d52d2a55728bf62116"
-SRC_URI[md5sum] = "a2434be110444192e804f4dada0ccecf"
 SRC_URI[sha256sum] = "1a464209fb4bf0a3f5d5a428310cb2a70487a01a6bc3a960d1dda90af896b80d"
 inherit pypi setuptools3 ptest
diff --git a/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.47.bb b/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.48.bb
index 9997785dc..3ed18905f 100644
--- a/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.47.bb
+++ b/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.48.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f"
-SRC_URI[sha256sum] = "1e1b29cb58080b1e69f207c893a1a7bf16d127a5c30c9d17a25a5d77792e5360"
+SRC_URI[sha256sum] = "d6623ab0477a80df74e646bdbc93621143f5caf104206aa29294d53de1a03d90"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-propcache/run-ptest b/meta-python/recipes-devtools/python/python3-propcache/run-ptest
new file mode 100644
index 000000000..8d2017d39
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-propcache/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+pytest --automake
diff --git a/meta-python/recipes-devtools/python/python3-propcache_0.2.0.bb b/meta-python/recipes-devtools/python/python3-propcache_0.2.0.bb
new file mode 100644
index 000000000..69e0bed4b
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-propcache_0.2.0.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Fast property caching"
+HOMEPAGE = "https://github.com/aio-libs/propcache"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+SRC_URI[sha256sum] = "df81779732feb9d01e5d513fad0122efb3d53bbc75f61b2a4f29a020bc985e70"
+inherit pypi python_setuptools_build_meta ptest
+SRC_URI += " \
+        file://run-ptest \
+"
+DEPENDS += " \
+        python3-expandvars-native \
+        python3-cython-native \
+"
+RDEPENDS:${PN}-ptest += " \
+        python3-pytest \
+        python3-pytest-xdist \
+        python3-unittest-automake-output \
+"
+do_install_ptest() {
+        install -d ${D}${PTEST_PATH}/tests
+        cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
diff --git a/meta-python/recipes-devtools/python/python3-ptyprocess/a44312974bd9084aa568d2e18ce5b2a7e0e45983.patch b/meta-python/recipes-devtools/python/python3-ptyprocess/a44312974bd9084aa568d2e18ce5b2a7e0e45983.patch
new file mode 100644
index 000000000..0f1542341
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-ptyprocess/a44312974bd9084aa568d2e18ce5b2a7e0e45983.patch
@@ -0,0 +1,35 @@
+From a44312974bd9084aa568d2e18ce5b2a7e0e45983 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Mon, 23 Oct 2023 15:18:02 +0200
+Subject: [PATCH] Remove unittest.makeSuite, gone from Python 3.13
+See https://docs.python.org/3.13/whatsnew/3.13.html
+"""
+Removed the following unittest functions, deprecated in Python 3.11:
+    unittest.findTestCases()
+    unittest.makeSuite()
+    unittest.getTestCaseNames()
+"""
+The removed call does not seem to have any effect when the file is executed
+directly, run trough unittest discover or pytest.
+Upstream-Status: Backport [https://github.com/pexpect/ptyprocess/pull/75]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tests/test_invalid_binary.py | 3 ---
+ 1 file changed, 3 deletions(-)
+diff --git a/tests/test_invalid_binary.py b/tests/test_invalid_binary.py
+index cf28098..545f9f7 100755
+--- a/tests/test_invalid_binary.py
+++ b/tests/test_invalid_binary.py
+@@ -69,6 +69,3 @@ def test_invalid_binary(self):
+ 
+ if __name__ == '__main__':
+     unittest.main()
+-
+-suite = unittest.makeSuite(InvalidBinaryChars,'test')
+-
diff --git a/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb b/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb
index 4abec0a01..e0c5e4719 100644
--- a/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb
+++ b/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cfdcd51fa7d5808da4e74346ee394490"
 SRCNAME = "ptyprocess"
+SRC_URI += "file://a44312974bd9084aa568d2e18ce5b2a7e0e45983.patch"
 SRC_URI[sha256sum] = "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"
 inherit pypi python_flit_core
diff --git a/meta-python/recipes-devtools/python/python3-pyasn1-modules/0001-Stop-using-pyasn1.compat.octets.patch b/meta-python/recipes-devtools/python/python3-pyasn1-modules/0001-Stop-using-pyasn1.compat.octets.patch
new file mode 100644
index 000000000..d9751b718
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyasn1-modules/0001-Stop-using-pyasn1.compat.octets.patch
@@ -0,0 +1,171 @@
+From d20c89d017a572755484b1bc41eac20285e68550 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <mail@heiko-becker.de>
+Date: Wed, 25 Sep 2024 22:38:42 +0200
+Subject: [PATCH] Stop using pyasn1.compat.octets
+It was removed from pyasn1 in
+https://github.com/pyasn1/pyasn1/commit/6f770ba886a8931c35cb090a5c3a6d67f5a41bd9
+Fixes #19.
+Upstream-Status: Submitted [https://github.com/pyasn1/pyasn1-modules/pull/22]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tests/test_pem.py     | 3 +--
+ tests/test_rfc3770.py | 3 +--
+ tests/test_rfc4073.py | 3 +--
+ tests/test_rfc4334.py | 3 +--
+ tests/test_rfc5755.py | 3 +--
+ tests/test_rfc6032.py | 7 +++----
+ tests/test_rfc6120.py | 1 -
+ 7 files changed, 8 insertions(+), 15 deletions(-)
+diff --git a/tests/test_pem.py b/tests/test_pem.py
+index dbcca5a..e0fe334 100644
+--- a/tests/test_pem.py
+++ b/tests/test_pem.py
+@@ -7,7 +7,6 @@
+ import sys
+ import unittest
+ 
+-from pyasn1.compat.octets import ints2octs
+ from pyasn1_modules import pem
+ 
+ 
+@@ -93,7 +92,7 @@ GGbx7DI=
+             24, 102, 241, 236, 50
+         ]
+ 
+-        self.assertEqual(ints2octs(expected), binary)
+        self.assertEqual(bytes(expected), binary)
+ 
+ 
+ suite = unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])
+diff --git a/tests/test_rfc3770.py b/tests/test_rfc3770.py
+index 667ab24..93d4093 100644
+--- a/tests/test_rfc3770.py
+++ b/tests/test_rfc3770.py
+@@ -10,7 +10,6 @@ import unittest
+ 
+ from pyasn1.codec.der.decoder import decode as der_decoder
+ from pyasn1.codec.der.encoder import encode as der_encoder
+-from pyasn1.compat.octets import str2octs
+ 
+ from pyasn1_modules import pem
+ from pyasn1_modules import rfc5480
+@@ -79,7 +78,7 @@ DAlVlhox680Jxy5J8Pkx
+                 self.assertEqual(extn['extnValue'], der_encoder(extnValue))
+ 
+                 if extn['extnID'] == rfc3770.id_pe_wlanSSID:
+-                    self.assertIn(str2octs('Example'), extnValue)
+                    self.assertIn(b'Example', extnValue)
+ 
+                 if extn['extnID'] == rfc5280.id_ce_extKeyUsage:
+                     self.assertIn(rfc3770.id_kp_eapOverLAN, extnValue)
+diff --git a/tests/test_rfc4073.py b/tests/test_rfc4073.py
+index 4bd5e5f..3b516cc 100644
+--- a/tests/test_rfc4073.py
+++ b/tests/test_rfc4073.py
+@@ -10,7 +10,6 @@ import unittest
+ 
+ from pyasn1.codec.der.decoder import decode as der_decoder
+ from pyasn1.codec.der.encoder import encode as der_encoder
+-from pyasn1.compat.octets import str2octs
+ 
+ from pyasn1_modules import pem
+ from pyasn1_modules import rfc2634
+@@ -131,7 +130,7 @@ buWO3egPDL8Kf7tBhzjIKLw=
+ 
+             self.assertIn(next_ci['contentType'], rfc5652.cmsContentTypesMap)
+             self.assertEqual(rfc5652.id_data, next_ci['contentType'])
+-            self.assertIn(str2octs('Content-Type: text'), next_ci['content'])
+            self.assertIn(b'Content-Type: text', next_ci['content'])
+ 
+             for attr in ci['content']['attrs']:
+                 self.assertIn(attr['attrType'], rfc5652.cmsAttributesMap)
+diff --git a/tests/test_rfc4334.py b/tests/test_rfc4334.py
+index 9ba5fdf..e180d67 100644
+--- a/tests/test_rfc4334.py
+++ b/tests/test_rfc4334.py
+@@ -10,7 +10,6 @@ import unittest
+ 
+ from pyasn1.codec.der.decoder import decode as der_decoder
+ from pyasn1.codec.der.encoder import encode as der_encoder
+-from pyasn1.compat.octets import str2octs
+ 
+ from pyasn1_modules import pem
+ from pyasn1_modules import rfc5280
+@@ -67,7 +66,7 @@ DAlVlhox680Jxy5J8Pkx
+                 self.assertEqual(extn['extnValue'], der_encoder(extnValue))
+ 
+                 if extn['extnID'] == rfc4334.id_pe_wlanSSID:
+-                    self.assertIn( str2octs('Example'), extnValue)
+                    self.assertIn(b'Example', extnValue)
+             
+                 if extn['extnID'] == rfc5280.id_ce_extKeyUsage:
+                     self.assertIn(rfc4334.id_kp_eapOverLAN, extnValue)
+diff --git a/tests/test_rfc5755.py b/tests/test_rfc5755.py
+index cf4a05f..46908e2 100644
+--- a/tests/test_rfc5755.py
+++ b/tests/test_rfc5755.py
+@@ -10,7 +10,6 @@ import unittest
+ 
+ from pyasn1.codec.der.decoder import decode as der_decoder
+ from pyasn1.codec.der.encoder import encode as der_encoder
+-from pyasn1.compat.octets import str2octs
+ 
+ from pyasn1_modules import pem
+ from pyasn1_modules import rfc5280
+@@ -85,7 +84,7 @@ Q4eikPk4LQey
+             count += 1
+             if attr['type'] == rfc5755.id_aca_authenticationInfo:
+                 self.assertEqual(
+-                    str2octs('password'), attr['values'][0]['authInfo'])
+                    b'password', attr['values'][0]['authInfo'])
+ 
+         self.assertEqual(5, count)
+ 
+diff --git a/tests/test_rfc6032.py b/tests/test_rfc6032.py
+index 287bad8..2327416 100644
+--- a/tests/test_rfc6032.py
+++ b/tests/test_rfc6032.py
+@@ -10,7 +10,6 @@ import unittest
+ 
+ from pyasn1.codec.der.decoder import decode as der_decoder
+ from pyasn1.codec.der.encoder import encode as der_encoder
+-from pyasn1.compat.octets import str2octs
+ 
+ from pyasn1_modules import pem
+ from pyasn1_modules import rfc5652
+@@ -64,7 +63,7 @@ YIZIAWUCAQVCMRAEDnB0Zi1rZGMtODEyMzc0
+         self.assertFalse(rest)
+         self.assertTrue(keyid.prettyPrint())
+         self.assertEqual(attrVal0, der_encoder(keyid))
+-        self.assertEqual(str2octs('ptf-kdc-812374'), keyid)
+        self.assertEqual(b'ptf-kdc-812374', keyid)
+ 
+     def testOpenTypes(self):
+         substrate = pem.readBase64fromText(self.encrypted_key_pkg_pem_text)
+@@ -86,8 +85,8 @@ YIZIAWUCAQVCMRAEDnB0Zi1rZGMtODEyMzc0
+             self.assertNotEqual('0x', attr['attrValues'][0].prettyPrint()[:2])
+ 
+             if attr['attrType'] == rfc6032.id_aa_KP_contentDecryptKeyID:
+-                self.assertEqual(str2octs(
+-                    'ptf-kdc-812374'), attr['attrValues'][0])
+                self.assertEqual(
+                    b'ptf-kdc-812374', attr['attrValues'][0])
+ 
+ 
+ suite = unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])
+diff --git a/tests/test_rfc6120.py b/tests/test_rfc6120.py
+index bdedab8..a621745 100644
+--- a/tests/test_rfc6120.py
+++ b/tests/test_rfc6120.py
+@@ -10,7 +10,6 @@ import unittest
+ 
+ from pyasn1.codec.der.decoder import decode as der_decoder
+ from pyasn1.codec.der.encoder import encode as der_encoder
+-from pyasn1.compat.octets import str2octs
+ 
+ from pyasn1_modules import pem
+ from pyasn1_modules import rfc5280
diff --git a/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.0.bb b/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.1.bb
index 48372d917..03097801b 100644
--- a/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.1.bb
@@ -6,7 +6,8 @@ HOMEPAGE = "https://github.com/etingof/pyasn1-modules"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=190f79253908c986e6cacf380c3a5f6d"
-SRC_URI[sha256sum] = "831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6"
+SRC_URI += "file://0001-Stop-using-pyasn1.compat.octets.patch"
+SRC_URI[sha256sum] = "c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c"
 PYPI_PACKAGE = "pyasn1_modules"
diff --git a/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb b/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb
index a38e10eec..188700be2 100644
--- a/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb
+++ b/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543"
 SRC_URI += "file://0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch \
            file://py-3.11.patch "
-SRC_URI[md5sum] = "afbe8429bb82d2c46a3d0f5f4f898f9d"
 SRC_URI[sha256sum] = "c8f04d2e78951eaa9de486b4d49381704e8943d0a6e6e58f55fcd7b8582e90de"
 PYPI_PACKAGE = "PyBluez"
diff --git a/meta-python/recipes-devtools/python/python3-pychromecast/0001-Allow-newer-version-of-wheel-and-setuptools.patch b/meta-python/recipes-devtools/python/python3-pychromecast/0001-Allow-newer-version-of-wheel-and-setuptools.patch
index 447f67907..3d5d043f1 100644
--- a/meta-python/recipes-devtools/python/python3-pychromecast/0001-Allow-newer-version-of-wheel-and-setuptools.patch
+++ b/meta-python/recipes-devtools/python/python3-pychromecast/0001-Allow-newer-version-of-wheel-and-setuptools.patch
@@ -1,4 +1,4 @@
-From 5ee73f91b7f13dd5c700c69e7fc43cecab5868da Mon Sep 17 00:00:00 2001
+From 41da1605df6d781bdf01c0ecefea88bba7758c21 Mon Sep 17 00:00:00 2001
 From: Tom Geelen <t.f.g.geelen@gmail.com>
 Date: Sun, 7 Apr 2024 22:39:35 +0000
 Subject: [PATCH] Allow newer version of wheel and setuptools
@@ -10,7 +10,7 @@ Signed-off-by: Tom Geelen <t.f.g.geelen@gmail.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/pyproject.toml b/pyproject.toml
-index 56df5bd..17ca62d 100644
+index 545297e..84a92c2 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
 @@ -1,5 +1,5 @@
diff --git a/meta-python/recipes-devtools/python/python3-pychromecast_14.0.1.bb b/meta-python/recipes-devtools/python/python3-pychromecast_14.0.4.bb
index dee4bf6eb..6f06f53a1 100644
--- a/meta-python/recipes-devtools/python/python3-pychromecast_14.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pychromecast_14.0.4.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5"
 SRC_URI += "file://0001-Allow-newer-version-of-wheel-and-setuptools.patch"
-SRC_URI[sha256sum] = "e16e0a7f9488319191b8b4fa21ca0beb4bf12eeda5c9bf640241188f2bea0a3e"
+SRC_URI[sha256sum] = "1fc05d63db152fe6f71efdee77d14228dc4c55e99d734de4757455800b1f3ba4"
 PYPI_PACKAGE = "PyChromecast"
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc b/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc
index 531632f32..05863c870 100644
--- a/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc
+++ b/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc
@@ -29,7 +29,7 @@ SRC_URI += " \
    crate://crates.io/icu_provider/1.5.0 \
    crate://crates.io/icu_provider_macros/1.5.0 \
    crate://crates.io/idna/0.5.0 \
-    crate://crates.io/idna/1.0.1 \
+    crate://crates.io/idna/1.0.2 \
    crate://crates.io/indexmap/2.2.6 \
    crate://crates.io/indoc/2.0.5 \
    crate://crates.io/itoa/1.0.11 \
@@ -48,29 +48,29 @@ SRC_URI += " \
    crate://crates.io/percent-encoding/2.3.1 \
    crate://crates.io/portable-atomic/1.6.0 \
    crate://crates.io/proc-macro2/1.0.86 \
-    crate://crates.io/pyo3/0.22.2 \
+    crate://crates.io/pyo3/0.22.5 \
-    crate://crates.io/pyo3-build-config/0.22.2 \
+    crate://crates.io/pyo3-build-config/0.22.5 \
-    crate://crates.io/pyo3-ffi/0.22.2 \
+    crate://crates.io/pyo3-ffi/0.22.5 \
-    crate://crates.io/pyo3-macros/0.22.2 \
+    crate://crates.io/pyo3-macros/0.22.5 \
-    crate://crates.io/pyo3-macros-backend/0.22.2 \
+    crate://crates.io/pyo3-macros-backend/0.22.5 \
    crate://crates.io/python3-dll-a/0.2.10 \
    crate://crates.io/quote/1.0.36 \
    crate://crates.io/radium/0.7.0 \
-    crate://crates.io/regex/1.10.5 \
+    crate://crates.io/regex/1.11.0 \
-    crate://crates.io/regex-automata/0.4.7 \
+    crate://crates.io/regex-automata/0.4.8 \
-    crate://crates.io/regex-syntax/0.8.4 \
+    crate://crates.io/regex-syntax/0.8.5 \
    crate://crates.io/rustversion/1.0.17 \
    crate://crates.io/ryu/1.0.18 \
-    crate://crates.io/serde/1.0.204 \
+    crate://crates.io/serde/1.0.213 \
-    crate://crates.io/serde_derive/1.0.204 \
+    crate://crates.io/serde_derive/1.0.213 \
-    crate://crates.io/serde_json/1.0.121 \
+    crate://crates.io/serde_json/1.0.132 \
    crate://crates.io/smallvec/1.13.2 \
    crate://crates.io/speedate/0.14.4 \
    crate://crates.io/stable_deref_trait/1.2.0 \
    crate://crates.io/static_assertions/1.1.0 \
    crate://crates.io/strum/0.26.3 \
    crate://crates.io/strum_macros/0.26.4 \
-    crate://crates.io/syn/2.0.68 \
+    crate://crates.io/syn/2.0.82 \
    crate://crates.io/synstructure/0.13.1 \
    crate://crates.io/tap/1.0.1 \
    crate://crates.io/target-lexicon/0.12.14 \
@@ -84,7 +84,7 @@ SRC_URI += " \
    crate://crates.io/url/2.5.2 \
    crate://crates.io/utf16_iter/1.0.5 \
    crate://crates.io/utf8_iter/1.0.4 \
-    crate://crates.io/uuid/1.9.1 \
+    crate://crates.io/uuid/1.11.0 \
    crate://crates.io/version_check/0.9.5 \
    crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
    crate://crates.io/write16/1.0.0 \
@@ -127,7 +127,7 @@ SRC_URI[icu_properties_data-1.5.0.sha256sum] = "67a8effbc3dd3e4ba1afa8ad918d5684
 SRC_URI[icu_provider-1.5.0.sha256sum] = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
 SRC_URI[icu_provider_macros-1.5.0.sha256sum] = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-SRC_URI[idna-1.0.1.sha256sum] = "44a986806a1cc899952ba462bc1f28afbfd5850ab6cb030ccb20dd02cc527a24"
+SRC_URI[idna-1.0.2.sha256sum] = "bd69211b9b519e98303c015e21a007e293db403b6c85b9b124e133d25e242cdd"
 SRC_URI[indexmap-2.2.6.sha256sum] = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 SRC_URI[indoc-2.0.5.sha256sum] = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 SRC_URI[itoa-1.0.11.sha256sum] = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
@@ -146,29 +146,29 @@ SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa
 SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
 SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-SRC_URI[pyo3-0.22.2.sha256sum] = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433"
+SRC_URI[pyo3-0.22.5.sha256sum] = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51"
-SRC_URI[pyo3-build-config-0.22.2.sha256sum] = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8"
+SRC_URI[pyo3-build-config-0.22.5.sha256sum] = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179"
-SRC_URI[pyo3-ffi-0.22.2.sha256sum] = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6"
+SRC_URI[pyo3-ffi-0.22.5.sha256sum] = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d"
-SRC_URI[pyo3-macros-0.22.2.sha256sum] = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206"
+SRC_URI[pyo3-macros-0.22.5.sha256sum] = "e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e"
-SRC_URI[pyo3-macros-backend-0.22.2.sha256sum] = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372"
+SRC_URI[pyo3-macros-backend-0.22.5.sha256sum] = "ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce"
 SRC_URI[python3-dll-a-0.2.10.sha256sum] = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b"
 SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+SRC_URI[regex-1.11.0.sha256sum] = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
-SRC_URI[regex-automata-0.4.7.sha256sum] = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+SRC_URI[regex-automata-0.4.8.sha256sum] = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
-SRC_URI[regex-syntax-0.8.4.sha256sum] = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 SRC_URI[rustversion-1.0.17.sha256sum] = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-SRC_URI[serde-1.0.204.sha256sum] = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+SRC_URI[serde-1.0.213.sha256sum] = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
-SRC_URI[serde_derive-1.0.204.sha256sum] = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+SRC_URI[serde_derive-1.0.213.sha256sum] = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
-SRC_URI[serde_json-1.0.121.sha256sum] = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
+SRC_URI[serde_json-1.0.132.sha256sum] = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 SRC_URI[speedate-0.14.4.sha256sum] = "08a20480dbd4c693f0b0f3210f2cee5bfa21a176c1fa4df0e65cc0474e7fa557"
 SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 SRC_URI[strum-0.26.3.sha256sum] = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 SRC_URI[strum_macros-0.26.4.sha256sum] = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-SRC_URI[syn-2.0.68.sha256sum] = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+SRC_URI[syn-2.0.82.sha256sum] = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
 SRC_URI[synstructure-0.13.1.sha256sum] = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 SRC_URI[target-lexicon-0.12.14.sha256sum] = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
@@ -182,7 +182,7 @@ SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd8
 SRC_URI[url-2.5.2.sha256sum] = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
 SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-SRC_URI[uuid-1.9.1.sha256sum] = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
+SRC_URI[uuid-1.11.0.sha256sum] = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch
deleted file mode 100644
index 5d732d5be..000000000
--- a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e07c41b3bad75948201a2201387225694c2fb501 Mon Sep 17 00:00:00 2001
-From: Boxy <rust@boxyuwu.dev>
-Date: Wed, 7 Aug 2024 17:11:02 +0100
-Subject: [PATCH] dont embed `RUSTFLAGS` in final binary (#1396)
-Upstream-Status: Backport [https://github.com/pydantic/pydantic-core/pull/1396]
-See discussion upstream in:
-https://github.com/pydantic/pydantic-core/issues/1365
-Backport fix from:
-https://github.com/pydantic/pydantic-core/commit/e07c41b3bad75948201a2201387225694c2fb501
-Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
- build.rs   | 9 +++++++++
- src/lib.rs | 5 ++++-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-diff --git a/build.rs b/build.rs
-index d1093c74..f8f66901 100644
--- a/build.rs
-+++ b/build.rs
-@@ -36,6 +36,15 @@ fn main() {
-         println!("cargo:rustc-cfg=has_coverage_attribute");
-     }
-     println!("cargo:rustc-check-cfg=cfg(has_coverage_attribute)");
-+
-+    if std::env::var("RUSTFLAGS")
-+        .unwrap_or_default()
-+        .contains("-Cprofile-use=")
-+    {
-+        println!("cargo:rustc-cfg=specified_profile_use");
-+    }
-+    println!("cargo:rustc-check-cfg=cfg(specified_profile_use)");
-+
-     generate_self_schema();
-     println!("cargo:rustc-env=PROFILE={}", std::env::var("PROFILE").unwrap());
- }
-diff --git a/src/lib.rs b/src/lib.rs
-index eb598424..eb486da6 100644
--- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -98,7 +98,10 @@ pub fn build_info() -> String {
-     format!(
-         "profile={} pgo={}",
-         env!("PROFILE"),
-        option_env!("RUSTFLAGS").unwrap_or("").contains("-Cprofile-use="),
-+        // We use a `cfg!` here not `env!`/`option_env!` as those would
-+        // embed `RUSTFLAGS` into the generated binary which causes problems
-+        // with reproducable builds.
-+        cfg!(specified_profile_use),
-     )
- }
- 
-- 
-2.46.0
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core_2.21.0.bb b/meta-python/recipes-devtools/python/python3-pydantic-core_2.25.0.bb
index b24e141f6..59873e867 100644
--- a/meta-python/recipes-devtools/python/python3-pydantic-core_2.21.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pydantic-core_2.25.0.bb
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c"
 require ${BPN}-crates.inc
 SRC_URI += "file://run-ptest"
-SRC_URI += "file://0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch"
-SRC_URI[sha256sum] = "79c747f9916e5b6cb588dfd994d9ac15a93e43eb07467d9e6f24d892c176bbf5"
+SRC_URI[sha256sum] = "f19d3a1d8998cc2bdab9190cead6becbb3c88d10bdfad947266132f077ce349e"
 DEPENDS = "python3-maturin-native python3-typing-extensions"
diff --git a/meta-python/recipes-devtools/python/python3-pydantic_2.8.2.bb b/meta-python/recipes-devtools/python/python3-pydantic_2.9.2.bb
index de610d781..b776d05dc 100644
--- a/meta-python/recipes-devtools/python/python3-pydantic_2.8.2.bb
+++ b/meta-python/recipes-devtools/python/python3-pydantic_2.9.2.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=09280955509d1c4ca14bae02f21d49a6"
 inherit pypi python_hatchling
-SRC_URI[sha256sum] = "6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a"
+SRC_URI[sha256sum] = "d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f" 
 DEPENDS += "python3-hatch-fancy-pypi-readme-native"
@@ -24,12 +24,15 @@ RDEPENDS:${PN} += "\
    python3-image \
    python3-io \
    python3-json \
+    python3-jsonschema \
    python3-logging \
    python3-netclient \
    python3-numbers \
    python3-profile \
    python3-pydantic-core \
    python3-typing-extensions \
+    python3-tzdata \
+    python3-zoneinfo \
 "
 inherit ptest
@@ -38,6 +41,8 @@ RDEPENDS:${PN}-ptest += "\
    python3-cloudpickle \
    python3-dirty-equals \
    python3-email-validator \
+    python3-html \
+    python3-hypothesis \
    python3-pydoc \
    python3-pytest \
    python3-pytest-mock \
diff --git a/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb b/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb
index 5754fd2ad..cfdacf53b 100644
--- a/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb
@@ -20,7 +20,7 @@ RDEPENDS:${PN} = "python3-pygobject \
                  python3-io \
                  python3-logging"
-RDEPENDS:${PN}-ptest += "bash"
+RDEPENDS:${PN}-ptest += "bash python3-xml"
 do_install_ptest() {
        install -d ${D}${PTEST_PATH}/tests
diff --git a/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb b/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb
index 02ebeaad7..f902c705e 100644
--- a/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb
@@ -7,7 +7,6 @@ RDEPENDS:${PN} = "\
    python3-pyserial \
 "
-SRC_URI[md5sum] = "159673cfb56c72ceafc30fe91eedd847"
 SRC_URI[sha256sum] = "cc180d1b30c85a2bbca62c15fef1b871db048cdcfa80959968356d97bd3ff08e"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb b/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb
index c0cca98ff..61e2b205c 100644
--- a/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pyjks_20.0.0.bb
@@ -6,7 +6,6 @@ HOMEPAGE = "http://github.com/kurtbrose/pyjks"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9694d6cc724caf7f7386be88a4a81958"
-SRC_URI[md5sum] = "1a6bce95484f1f62f8ff59755972c632"
 SRC_URI[sha256sum] = "0378cec15fb11b2ed27ba54dad9fd987d48e6f62f49fcff138f5f7a8b312b044"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-pylint/0001-Adjust-test-expectations-for-ptest.patch b/meta-python/recipes-devtools/python/python3-pylint/0001-Adjust-test-expectations-for-ptest.patch
index 8edecbf1b..769cd145e 100644
--- a/meta-python/recipes-devtools/python/python3-pylint/0001-Adjust-test-expectations-for-ptest.patch
+++ b/meta-python/recipes-devtools/python/python3-pylint/0001-Adjust-test-expectations-for-ptest.patch
@@ -12,33 +12,31 @@ Signed-off-by: Dan McGregor <dan.mcgregor@vecima.com>
 tests/functional/w/wrong_import_order.txt | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
-diff --git a/tests/functional/w/wrong_import_order.txt b/tests/functional/w/wrong_import_order.txt
-index 068d2140d..9594ff9e0 100644
 --- a/tests/functional/w/wrong_import_order.txt
 +++ b/tests/functional/w/wrong_import_order.txt
-@@ -3,14 +3,14 @@ wrong-import-order:14:0:14:10::"standard import ""sys"" should be placed before
+@@ -3,14 +3,14 @@ wrong-import-order:14:0:14:10::"standard
- wrong-import-order:15:0:15:15::"standard import ""datetime"" should be placed before third party imports ""six"", ""astroid.are_exclusive""":UNDEFINED
+ wrong-import-order:15:0:15:15::"standard import ""datetime"" should be placed before third party imports ""six"", ""astroid.are_exclusive""":UNDEFINED
- wrong-import-order:18:0:18:22::"third party import ""totally_missing"" should be placed before local import ""package.Class""":UNDEFINED
+ wrong-import-order:18:0:18:22::"third party import ""totally_missing"" should be placed before local import ""package.Class""":UNDEFINED
- wrong-import-order:20:0:20:14::"third party import ""astroid"" should be placed before local imports ""package.Class"", "".package""":UNDEFINED
+ wrong-import-order:20:0:20:14::"third party import ""astroid"" should be placed before local imports ""package.Class"", "".package""":UNDEFINED
-wrong-import-order:22:0:22:22::"first party import ""pylint.checkers"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
+-wrong-import-order:22:0:22:22::"first party import ""pylint.checkers"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
-wrong-import-order:23:0:23:25::"first party import ""pylint.config"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
+-wrong-import-order:23:0:23:25::"first party import ""pylint.config"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
-wrong-import-order:24:0:24:17::"first party import ""pylint.sys"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
+-wrong-import-order:24:0:24:17::"first party import ""pylint.sys"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
-wrong-import-order:25:0:25:28::"first party import ""pylint.pyreverse"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
+-wrong-import-order:25:0:25:28::"first party import ""pylint.pyreverse"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
-wrong-import-order:30:0:30:40::"third party import ""six.moves.urllib.parse.quote"" should be placed before first party imports ""pylint.checkers"", ""pylint.config"", ""pylint.sys"", ""pylint.pyreverse"" and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+-wrong-import-order:30:0:30:40::"third party import ""six.moves.urllib.parse.quote"" should be placed before first party imports ""pylint.checkers"", ""pylint.config"", ""pylint.sys"", ""pylint.pyreverse"" and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-wrong-import-order:31:0:31:23::"first party import ""pylint.constants"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+-wrong-import-order:31:0:31:23::"first party import ""pylint.constants"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-wrong-import-order:32:0:32:19::"standard import ""re"" should be placed before third party imports ""six"", ""astroid.are_exclusive"", ""unused_import"", ""totally_missing"", ""astroid"", ""six.moves.urllib.parse.quote"", first party imports ""pylint.checkers"", ""pylint.config"", ""pylint.sys"", ""pylint.pyreverse"", ""pylint.constants"", and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+-wrong-import-order:32:0:32:19::"standard import ""re"" should be placed before third party imports ""six"", ""astroid.are_exclusive"", ""unused_import"", ""totally_missing"", ""astroid"", ""six.moves.urllib.parse.quote"", first party imports ""pylint.checkers"", ""pylint.config"", ""pylint.sys"", ""pylint.pyreverse"", ""pylint.constants"", and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-wrong-import-order:32:0:32:19::"third party import ""requests"" should be placed before first party imports ""pylint.checkers"", ""pylint.config"", ""pylint.sys"", ""pylint.pyreverse"", ""pylint.constants"" and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+-wrong-import-order:32:0:32:19::"third party import ""requests"" should be placed before first party imports ""pylint.checkers"", ""pylint.config"", ""pylint.sys"", ""pylint.pyreverse"", ""pylint.constants"" and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-wrong-import-order:33:0:33:24::"first party import ""pylint.exceptions"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+-wrong-import-order:33:0:33:24::"first party import ""pylint.exceptions"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-wrong-import-order:34:0:34:21::"first party import ""pylint.message"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+-wrong-import-order:34:0:34:21::"first party import ""pylint.message"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-wrong-import-order:35:0:35:11::"standard import ""time"" should be placed before third party imports ""six"", ""astroid.are_exclusive"", ""unused_import"" (...) ""astroid"", ""six.moves.urllib.parse.quote"", ""requests"", first party imports ""pylint.checkers"", ""pylint.config"", ""pylint.sys"" (...) ""pylint.constants"", ""pylint.exceptions"", ""pylint.message"", and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+-wrong-import-order:35:0:35:11::"standard import ""time"" should be placed before third party imports ""six"", ""astroid.are_exclusive"", ""unused_import"" (...) ""astroid"", ""six.moves.urllib.parse.quote"", ""requests"", first party imports ""pylint.checkers"", ""pylint.config"", ""pylint.sys"" (...) ""pylint.constants"", ""pylint.exceptions"", ""pylint.message"", and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-+wrong-import-order:22:0:22:22::"third party import ""pylint.checkers"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
+wrong-import-order:22:0:22:22::"third party import ""pylint.checkers"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
-+wrong-import-order:23:0:23:25::"third party import ""pylint.config"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
+wrong-import-order:23:0:23:25::"third party import ""pylint.config"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
-+wrong-import-order:24:0:24:17::"third party import ""pylint.sys"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
+wrong-import-order:24:0:24:17::"third party import ""pylint.sys"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
-+wrong-import-order:25:0:25:28::"third party import ""pylint.pyreverse"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
+wrong-import-order:25:0:25:28::"third party import ""pylint.pyreverse"" should be placed before local imports ""package.Class"", "".package"", "".package2""":UNDEFINED
-+wrong-import-order:30:0:30:40::"third party import ""six.moves.urllib.parse.quote"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+wrong-import-order:30:0:30:40::"third party import ""six.moves.urllib.parse.quote"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-+wrong-import-order:31:0:31:23::"third party import ""pylint.constants"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+wrong-import-order:31:0:31:23::"third party import ""pylint.constants"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-+wrong-import-order:32:0:32:19::"standard import ""re"" should be placed before third party imports ""six"", ""astroid.are_exclusive"", ""unused_import"" (...) ""pylint.pyreverse"", ""six.moves.urllib.parse.quote"", ""pylint.constants"" and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+wrong-import-order:32:0:32:19::"standard import ""re"" should be placed before third party imports ""six"", ""astroid.are_exclusive"", ""unused_import"" (...) ""pylint.pyreverse"", ""six.moves.urllib.parse.quote"", ""pylint.constants"" and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-+wrong-import-order:32:0:32:19::"third party import ""requests"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+wrong-import-order:32:0:32:19::"third party import ""requests"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-+wrong-import-order:33:0:33:24::"third party import ""pylint.exceptions"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+wrong-import-order:33:0:33:24::"third party import ""pylint.exceptions"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-+wrong-import-order:34:0:34:21::"third party import ""pylint.message"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+wrong-import-order:34:0:34:21::"third party import ""pylint.message"" should be placed before local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
-+wrong-import-order:35:0:35:11::"standard import ""time"" should be placed before third party imports ""six"", ""astroid.are_exclusive"", ""unused_import"" (...) ""requests"", ""pylint.exceptions"", ""pylint.message"" and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
+wrong-import-order:35:0:35:11::"standard import ""time"" should be placed before third party imports ""six"", ""astroid.are_exclusive"", ""unused_import"" (...) ""requests"", ""pylint.exceptions"", ""pylint.message"" and local imports ""package.Class"", "".package"", "".package2"" (...) ""package3.Class3"", "".package4"", ""package4.Class4""":UNDEFINED
diff --git a/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb b/meta-python/recipes-devtools/python/python3-pylint_3.3.1.bb
index eae30dfbf..1b2e033f1 100644
--- a/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb
+++ b/meta-python/recipes-devtools/python/python3-pylint_3.3.1.bb
@@ -3,14 +3,16 @@ HOMEPAGE= "http://www.pylint.org/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9"
+SRCREV = "76bce72bc57cc8089e439cc9d22fed5806341ed4"
 SRC_URI += "git://github.com/pylint-dev/pylint;branch=main;protocol=https \
-           file://0001-Adjust-test-expectations-for-ptest.patch \
+            file://0001-Adjust-test-expectations-for-ptest.patch \
-           file://run-ptest \
+            file://run-ptest \
           "
-SRCREV = "769ffd20bbf321a6cf23f5e7221a0b8221f51482"
 inherit python_setuptools_build_meta ptest
+S = "${WORKDIR}/git"
 RDEPENDS:${PN} += "\
    python3-astroid \
    python3-difflib \
@@ -43,13 +45,11 @@ RDEPENDS:${PN}-ptest += " \
    python3-unittest-automake-output \
    "
-S = "${WORKDIR}/git"
 do_install_ptest() {
    install -d ${D}${PTEST_PATH}/tests
    cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
    install -Dm 0644 ${S}/tests/.pylint_primer_tests/.gitkeep ${D}${PTEST_PATH}/tests/.pylint_primer_tests/.gitkeep
-    sed -i 's#/usr/bin/python$#/usr/bin/python3#g' ${D}${PTEST_PATH}/tests/data/ascript
+    sed -i 's#/usr/bin/python$#/usr/bin/python3#g' ${D}${PTEST_PATH}/tests/data/a_script
    # regression_distutil_import_error_73.py fails to run see
    # https://lists.openembedded.org/g/openembedded-devel/topic/103181847
    rm ${D}${PTEST_PATH}/tests/functional/r/regression_02/regression_distutil_import_error_73.py
diff --git a/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb b/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb
index 1ac95e8be..49f4f7da8 100644
--- a/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pylyrics_1.1.0.bb
@@ -3,7 +3,6 @@ SUMMARY = "Pythonic Implementation of lyrics.wikia.com"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://setup.py;beginline=14;endline=14;md5=95d480cd6f8471abaeae21bd0ed277ba"
-SRC_URI[md5sum] = "1f3c997edeba149a8fb2b861cbad89c3"
 SRC_URI[sha256sum] = "c5f36e8ef0ed3b487a9242ce34c19f9684e418a5bbffd5d367dc1d1604b4cd0b"
 PYPI_PACKAGE = "PyLyrics"
diff --git a/meta-python/recipes-devtools/python/python3-pymisp_2.4.197.bb b/meta-python/recipes-devtools/python/python3-pymisp_2.5.0.bb
index f20716026..83b3c82ab 100644
--- a/meta-python/recipes-devtools/python/python3-pymisp_2.4.197.bb
+++ b/meta-python/recipes-devtools/python/python3-pymisp_2.5.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/MISP/PyMISP"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20"
-SRC_URI[sha256sum] = "840881779d1762803e9329ae5129a88abb0e6110afb43c9e3e6e3877e5931a6c"
+SRC_URI[sha256sum] = "d3bfc7a337e4382026343f05aa442bfdecc3e11a4f3a5479ad0e6087dcde7e78"
 inherit python_poetry_core pypi
diff --git a/meta-python/recipes-devtools/python/python3-pymodbus_3.7.2.bb b/meta-python/recipes-devtools/python/python3-pymodbus_3.7.3.bb
index b240837d4..9e4c80ebf 100644
--- a/meta-python/recipes-devtools/python/python3-pymodbus_3.7.2.bb
+++ b/meta-python/recipes-devtools/python/python3-pymodbus_3.7.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/riptideio/pymodbus/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=eba8057aa82c058d2042b4b0a0e9cc63"
-SRC_URI[sha256sum] = "6cc63a14c8cca83f5b6d9dae3319565061bd49503ee7282df681201c16357eef"
+SRC_URI[sha256sum] = "603490162382fe34258992e3b8fe8d2da573a08aa49257ee7ab7b5b1d1a6653c"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-pymongo_4.8.0.bb b/meta-python/recipes-devtools/python/python3-pymongo_4.10.1.bb
index fcce456d8..393c0d201 100644
--- a/meta-python/recipes-devtools/python/python3-pymongo_4.8.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pymongo_4.10.1.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://github.com/mongodb/mongo-python-driver"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-SRC_URI[sha256sum] = "454f2295875744dc70f1881e4b2eb99cdad008a33574bc8aaf120530f66c0cde"
+SRC_URI[sha256sum] = "a9de02be53b6bb98efe0b9eda84ffa1ec027fcb23a2de62c4f941d9a2f2f3330"
 inherit pypi python_setuptools_build_meta python_hatchling
diff --git a/meta-python/recipes-devtools/python/python3-pyperf_2.7.0.bb b/meta-python/recipes-devtools/python/python3-pyperf_2.8.0.bb
index f3ebfe2d9..9857701b5 100644
--- a/meta-python/recipes-devtools/python/python3-pyperf_2.7.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pyperf_2.8.0.bb
@@ -13,7 +13,7 @@ Features: \
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8"
-SRC_URI[sha256sum] = "4201c6601032f374e9c900c6d2544a2f5891abedc1a96eec0e7b2338a6247589"
+SRC_URI[sha256sum] = "b30a20465819daf102b6543b512f6799a5a879ff2a123981e6cd732d0e6a7a79"
 DEPENDS += "python3-six-native"
diff --git a/meta-python/recipes-devtools/python/python3-pyproj/rpath.patch b/meta-python/recipes-devtools/python/python3-pyproj/rpath.patch
index 347996a80..6e230d105 100644
--- a/meta-python/recipes-devtools/python/python3-pyproj/rpath.patch
+++ b/meta-python/recipes-devtools/python/python3-pyproj/rpath.patch
@@ -6,7 +6,7 @@ Upstream-Status: Inappropriate [OE-Specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 --- a/setup.py
 +++ b/setup.py
-@@ -194,9 +194,6 @@ def get_extension_modules():
+@@ -193,9 +193,6 @@ def get_extension_modules():
     ext_options = {
         "include_dirs": include_dirs,
         "library_dirs": library_dirs,
diff --git a/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb b/meta-python/recipes-devtools/python/python3-pyproj_3.7.0.bb
index cad9464cc..0a8b71084 100644
--- a/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pyproj_3.7.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Python interface to PROJ (cartographic projections and coordinate transformations library)"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=873757af01d2d221eedb422c4c1dd163"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3f3574263859ef2dc9bd7817d51adbaa"
 DEPENDS = "python3-cython proj"
 DEPENDS:append:class-target = " python3-cython-native proj-native"
@@ -8,7 +8,7 @@ inherit pypi python_setuptools_build_meta
 SRC_URI += "file://rpath.patch"
-SRC_URI[sha256sum] = "44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf"
+SRC_URI[sha256sum] = "bf658f4aaf815d9d03c8121650b6f0b8067265c36e31bc6660b98ef144d81813"
 RDEPENDS:${PN} = " \
    python3-certifi \
diff --git a/meta-python/recipes-devtools/python/python3-pyproject-api_1.7.1.bb b/meta-python/recipes-devtools/python/python3-pyproject-api_1.7.2.bb
index fd9bea480..ee8949add 100644
--- a/meta-python/recipes-devtools/python/python3-pyproject-api_1.7.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pyproject-api_1.7.2.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://pyproject-api.readthedocs.io"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7"
-SRC_URI[sha256sum] = "7ebc6cd10710f89f4cf2a2731710a98abce37ebff19427116ff2174c9236a827"
+SRC_URI[sha256sum] = "dc5b0e0f6e291a4f22b46e182c9c6d4915c62b1f089b8de1b73f2d06ae453593"
 PYPI_PACKAGE = "pyproject_api"
diff --git a/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb b/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb
index cf9885df7..a12fa0ac4 100644
--- a/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb
+++ b/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb
@@ -28,6 +28,8 @@ SRC_URI += " \
 RDEPENDS:${PN}-ptest += " \
    python3-fcntl \
+    python3-html \
+    python3-netclient \
    python3-pytest \
    python3-sqlite3 \
    python3-unittest-automake-output \
diff --git a/meta-python/recipes-devtools/python/python3-pytest-aiohttp_1.0.5.bb b/meta-python/recipes-devtools/python/python3-pytest-aiohttp_1.0.5.bb
new file mode 100644
index 000000000..977ce807f
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-aiohttp_1.0.5.bb
@@ -0,0 +1,11 @@
+SUMMARY = "pytest plugin for aiohttp support"
+HOMEPAGE = "https://github.com/aio-libs/pytest-aiohttp"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c251ea89d32d196dddd14c669ed3d482"
+DEPENDS = "python3-setuptools-scm-native"
+SRC_URI[sha256sum] = "880262bc5951e934463b15e3af8bb298f11f7d4d3ebac970aab425aff10a780a"
+inherit pypi python_setuptools_build_meta
+PYPI_PACKAGE = "pytest-aiohttp"
diff --git a/meta-python/recipes-devtools/python/python3-pytest-codspeed_2.2.1.bb b/meta-python/recipes-devtools/python/python3-pytest-codspeed_2.2.1.bb
new file mode 100644
index 000000000..b7b5461f6
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-codspeed_2.2.1.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Pytest plugin to create CodSpeed benchmarks"
+HOMEPAGE = "https://codspeed.io/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2856cbe664e8843cd4fd4c1d1d85c2c3"
+DEPENDS = "python3-hatchling-native"
+SRC_URI[sha256sum] = "0adc24baf01c64a6ca0a0b83b3cd704351708997e09ec086b7776c32227d4e0a"
+inherit pypi python_hatchling
+PYPI_PACKAGE = "pytest_codspeed"
+RDEPENDS:${PN} = "python3-cffi python3-filelock python3-pytest"
diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch b/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch
deleted file mode 100644
index f024e79d9..000000000
--- a/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e184fb950ad3b52c5c16438d39fe4d516c784e30 Mon Sep 17 00:00:00 2001
-From: Trevor Gamblin <tgamblin@baylibre.com>
-Date: Thu, 12 Oct 2023 17:32:40 -0400
-Subject: [PATCH] test_pytest_mock: skip args introspection tests
-Disable these two tests for now so that python3-pytest-mock can have
-successful ptest runs.
-Upstream-Status: Inappropriate [OE-Specific]
-Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
- tests/test_pytest_mock.py | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py
-index 3d53241..157b6c3 100644
--- a/tests/test_pytest_mock.py
-+++ b/tests/test_pytest_mock.py
-@@ -581,6 +581,7 @@ def test_assert_called_wrapper(mocker: MockerFixture) -> None:
-     stub.assert_called()
- 
- 
-+@pytest.mark.skip("Async not correctly detected, skip for now")
- @pytest.mark.usefixtures("needs_assert_rewrite")
- def test_assert_called_args_with_introspection(mocker: MockerFixture) -> None:
-     stub = mocker.stub()
-@@ -597,6 +598,7 @@ def test_assert_called_args_with_introspection(mocker: MockerFixture) -> None:
-         stub.assert_called_once_with(*wrong_args)
- 
- 
-+@pytest.mark.skip("Async not correctly detected, skip for now")
- @pytest.mark.usefixtures("needs_assert_rewrite")
- def test_assert_called_kwargs_with_introspection(mocker: MockerFixture) -> None:
-     stub = mocker.stub()
-- 
-2.41.0
diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest b/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest
index 8d2017d39..51ae892b0 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest
+++ b/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest
@@ -1,3 +1,3 @@
 #!/bin/sh
+# see https://github.com/pytest-dev/pytest-mock/issues/102 for reasons to use plain asserts
-pytest --automake
+pytest --automake --assert=plain
diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock_3.14.0.bb b/meta-python/recipes-devtools/python/python3-pytest-mock_3.14.0.bb
index fe2479c83..b968cf1cd 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-mock_3.14.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pytest-mock_3.14.0.bb
@@ -5,28 +5,27 @@ LIC_FILES_CHKSUM = " \
    file://LICENSE;md5=b2ddb1e69238461b7e4ef2a84d874109 \
 "
-SRC_URI = " \
+SRC_URI += " \
-    git://github.com/pytest-dev/pytest-mock;branch=main;protocol=https \
-    file://0001-test_pytest_mock-skip-args-introspection-tests.patch \
    file://run-ptest \
 "
-SRCREV = "8733134b6194395e9cd3c745adcc9a9c09b0279e"
+SRC_URI[sha256sum] = "2719255a1efeceadbc056d6bf3df3d1c5015530fb40cf347c0f9afac88410bd0" 
-inherit python_setuptools_build_meta ptest
+inherit pypi python_setuptools_build_meta ptest
+PYPI_PACKAGE = "pytest-mock"
 DEPENDS += "python3-setuptools-scm-native"
-RDEPENDS:${PN} += " \
+RDEPENDS:${PN}-ptest += " \
-    python3-asyncio \
+    python3-misc \
    python3-mock \
    python3-pytest \
    python3-pytest-asyncio \
-    python3-unittest \
+    python3-threading \
+    python3-tox \
    python3-unittest-automake-output \
 "
-S = "${WORKDIR}/git"
 do_install_ptest() {
    install -d ${D}${PTEST_PATH}/tests
    cp -rf ${S}/tests ${D}${PTEST_PATH}/
diff --git a/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb b/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb
index dff6af4e0..b161b016b 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb
+++ b/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb
@@ -4,7 +4,6 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9872c3a37cc9baf79a464cd168282be5"
-SRC_URI[md5sum] = "79b997d418fb85c2529ab50cd4333689"
 SRC_URI[sha256sum] = "e7d91813a9aa991db87dacdef8cfd3f1657632d731d56d06238c5ffb63ab36d8"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-python-multipart/run-ptest b/meta-python/recipes-devtools/python/python3-python-multipart/run-ptest
new file mode 100644
index 000000000..8d2017d39
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-python-multipart/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+pytest --automake
diff --git a/meta-python/recipes-devtools/python/python3-python-multipart_0.0.12.bb b/meta-python/recipes-devtools/python/python3-python-multipart_0.0.12.bb
new file mode 100644
index 000000000..b3c018629
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-python-multipart_0.0.12.bb
@@ -0,0 +1,24 @@
+SUMMARY = "A streaming multipart parser for Python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3d98f0d58b28321924a89ab60c82410e"
+SRC_URI[sha256sum] = "045e1f98d719c1ce085ed7f7e1ef9d8ccc8c02ba02b5566d5f7521410ced58cb"
+inherit pypi python_hatchling ptest
+PYPI_PACKAGE = "python_multipart"
+SRC_URI += " \
+        file://run-ptest \
+"
+RDEPENDS:${PN}-ptest += " \
+        python3-pytest \
+        python3-pyyaml \
+        python3-unittest-automake-output \
+"
+do_install_ptest() {
+        install -d ${D}${PTEST_PATH}/tests
+        cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
diff --git a/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb b/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb
index 171708596..49390df83 100644
--- a/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb
+++ b/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb
@@ -4,7 +4,6 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=cfff423699bdaef24331933ac4f56078"
-SRC_URI[md5sum] = "e59dd36a559dd2a876e4c149c69e947b"
 SRC_URI[sha256sum] = "8eecf7c8d0adcff3b375b09fe403407aa9b645c499e5ab8cac670ac4a35f61e7"
 inherit pypi setuptools3 ptest
diff --git a/meta-python/recipes-devtools/python/python3-pyunormalize_15.1.0.bb b/meta-python/recipes-devtools/python/python3-pyunormalize_16.0.0.bb
index 6992ca24c..19463bc22 100644
--- a/meta-python/recipes-devtools/python/python3-pyunormalize_15.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pyunormalize_16.0.0.bb
@@ -1,8 +1,8 @@
 SUMMARY = "Unicode normalization forms (NFC, NFKC, NFD, NFKD). A library independent from the Python core Unicode database."
 HOMEPAGE = "https://github.com/mlodewijck/pyunormalize"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dc15b678c3bac1f5b2c873591a330eae"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c2ee871081d4e4c24f32e37c413c73"
-SRC_URI[sha256sum] = "cf4a87451a0f1cb76911aa97f432f4579e1f564a2f0c84ce488c73a73901b6c1"
+SRC_URI[sha256sum] = "2e1dfbb4a118154ae26f70710426a52a364b926c9191f764601f5a8cb12761f7"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-pyyaml-include_2.1.bb b/meta-python/recipes-devtools/python/python3-pyyaml-include_2.2.bb
index 058699fdf..a93a2391d 100644
--- a/meta-python/recipes-devtools/python/python3-pyyaml-include_2.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pyyaml-include_2.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/tanbro/pyyaml-include"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS += "python3-setuptools-scm-native"
-SRCREV = "dc16153b28f5cab997814c0ce9b43dc4c58507e7"
+SRCREV = "c5be2b7dfc4aaa91e44dbeb6fa42adc80936ef9d"
 SRC_URI = " \
            git://github.com/tanbro/pyyaml-include;protocol=https;branch=main \
@@ -21,6 +21,7 @@ do_install_ptest() {
 RDEPENDS:${PN} += " \
    python3-pyyaml \
+    python3-fsspec \
 "
 RDEPENDS:${PN}-ptest += " \
    python3-fsspec \
diff --git a/meta-python/recipes-devtools/python/python3-pyzstd_0.16.1.bb b/meta-python/recipes-devtools/python/python3-pyzstd_0.16.2.bb
index a4aae4aca..c1abd59f6 100644
--- a/meta-python/recipes-devtools/python/python3-pyzstd_0.16.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pyzstd_0.16.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aedb5a2679cd1552fb61c181ef974b9e"
 PYPI_PACKAGE = "pyzstd"
-SRC_URI[sha256sum] = "ed50c08233878c155c73ab2622e115cd9e46c0f1c2e2ddd76f2e7ca24933f195"
+SRC_URI[sha256sum] = "179c1a2ea1565abf09c5f2fd72f9ce7c54b2764cf7369e05c0bfd8f1f67f63d2"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb b/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb
index 79a38983d..54ae1c313 100644
--- a/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb
+++ b/meta-python/recipes-devtools/python/python3-raven_6.10.0.bb
@@ -6,7 +6,6 @@ HOMEPAGE = "https://github.com/getsentry/raven-python"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b9a4414e08f0571d55184531cefc131b"
-SRC_URI[md5sum] = "3676f31dadfa61526444dd0245c78a38"
 SRC_URI[sha256sum] = "3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54"
 PYPI_PACKAGE = "raven"
diff --git a/meta-python/recipes-devtools/python/python3-redis_5.0.8.bb b/meta-python/recipes-devtools/python/python3-redis_5.1.1.bb
index 1dddd04bc..a7ccc9558 100644
--- a/meta-python/recipes-devtools/python/python3-redis_5.0.8.bb
+++ b/meta-python/recipes-devtools/python/python3-redis_5.1.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=609ded3add9111c4c6e102f1d421d3f8"
 # Prefix archive to avoid clashing with the main redis archives
 PYPI_ARCHIVE_NAME_PREFIX="pypi-"
-SRC_URI[sha256sum] = "0c5b10d387568dfe0698c6fad6615750c24170e548ca2deac10c649d463e9870"
+SRC_URI[sha256sum] = "f6c997521fedbae53387307c5d0bf784d9acc28d9f1d058abeac566ec4dbed72"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-regex_2024.7.24.bb b/meta-python/recipes-devtools/python/python3-regex_2024.9.11.bb
index b6e09fc83..8fbae0cdc 100644
--- a/meta-python/recipes-devtools/python/python3-regex_2024.7.24.bb
+++ b/meta-python/recipes-devtools/python/python3-regex_2024.9.11.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069"
 inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "9cfd009eed1a46b27c14039ad5bbc5e71b6367c5b2e6d5f5da0ea91600817506"
+SRC_URI[sha256sum] = "6c188c307e8433bcb63dc1915022deb553b4203a70722fc542c363bf120a01fd"
 RDEPENDS:${PN} += " \
        python3-stringold \
diff --git a/meta-python/recipes-devtools/python/python3-requests-ftp_0.3.1.bb b/meta-python/recipes-devtools/python/python3-requests-ftp_0.3.1.bb
index 6df8e7e0b..119c62ea3 100644
--- a/meta-python/recipes-devtools/python/python3-requests-ftp_0.3.1.bb
+++ b/meta-python/recipes-devtools/python/python3-requests-ftp_0.3.1.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://github.com/Lukasa/requests-ftp"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=6683a23c9968b97709441dc884d46df6"
-SRC_URI[md5sum] = "1a52ad1219e696b5abd5449d1ccc0294"
 SRC_URI[sha256sum] = "7504ceb5cba8a5c0135ed738596820a78c5f2be92d79b29f96ba99b183d8057a"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch b/meta-python/recipes-devtools/python/python3-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch
index 8a646874e..8a646874e 100644
--- a/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch
+++ b/meta-python/recipes-devtools/python/python3-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch
diff --git a/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb b/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb
index e374979cb..21f588bc1 100644
--- a/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb
@@ -3,9 +3,6 @@ HOMEPAGE = "https://github.com/naimetti/rfc3986-validator"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a21b13b5a996f08f7e0b088aa38ce9c6"
-FILESEXTRAPATHS:prepend := "${THISDIR}/python-rfc3986-validator:"
-SRC_URI[md5sum] = "47f7657b790aaf6011a1ab3d86c6be95"
 SRC_URI[sha256sum] = "3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055"
 PYPI_PACKAGE = "rfc3986_validator"
diff --git a/meta-python/recipes-devtools/python/python3-robotframework_7.0.1.bb b/meta-python/recipes-devtools/python/python3-robotframework_7.1.bb
index 9e81e8e7b..979aba681 100644
--- a/meta-python/recipes-devtools/python/python3-robotframework_7.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-robotframework_7.1.bb
@@ -13,7 +13,7 @@ inherit pypi setuptools3
 PYPI_PACKAGE_EXT = "zip"
-SRC_URI[sha256sum] = "58d01b84cd7eccea69f2dbe13cbcbff1299e551168d3b88c25617b0c9d6ddc75"
+SRC_URI[sha256sum] = "34796d387e182b36f05d82f3bbc802bd6a30192ebf1e03c76d2086d0d04faaff"
 RDEPENDS:${PN} += " \
    python3-shell \
diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.27.bb
index 94c83e495..a3254de07 100644
--- a/meta-python/recipes-devtools/python/python3-scrypt_0.8.24.bb
+++ b/meta-python/recipes-devtools/python/python3-scrypt_0.8.27.bb
@@ -5,7 +5,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt"
 SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch"
-SRC_URI[sha256sum] = "98ffde45e4a95461d73ded54ba7a26857679920d4f8ff320f6f7ade6e29531bd"
+SRC_URI[sha256sum] = "a7b637848ed518c1ea2b31a9ecaaa3f49616598d8442de8706cf1f01fbabf0a7"
 inherit pypi ptest setuptools3 dos2unix
diff --git a/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb b/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb
index a1d6a3c0d..babe05e1d 100644
--- a/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb
@@ -4,7 +4,6 @@ HOMEPAGE = "https://pypi.org/project/service-identity"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8a0f079f4e6a215d6bd6f9d97cab4d5f"
-SRC_URI[md5sum] = "5e5c195d8fcedc72f9068be2ad9b5a13"
 SRC_URI[sha256sum] = "6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34"
 inherit pypi python_setuptools_build_meta ptest
diff --git a/meta-python/recipes-devtools/python/python3-setproctitle/run-ptest b/meta-python/recipes-devtools/python/python3-setproctitle/run-ptest
new file mode 100644
index 000000000..e29e57ee3
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-setproctitle/run-ptest
@@ -0,0 +1,4 @@
+#!/bin/sh
+# https://github.com/dvarrazzo/py-setproctitle/issues/141
+pytest --automake -k 'not test_unicode'
diff --git a/meta-python/recipes-devtools/python/python3-setproctitle_1.3.3.bb b/meta-python/recipes-devtools/python/python3-setproctitle_1.3.3.bb
new file mode 100644
index 000000000..d0373b46d
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-setproctitle_1.3.3.bb
@@ -0,0 +1,34 @@
+SUMMARY = "A Python module to customize the process title"
+DESCRIPTION = "The setproctitle module allows a process to change its \
+title (as displayed by system tools such as ps, top or MacOS Activity \
+Monitor)."
+HOMEPAGE = "https://github.com/dvarrazzo/py-setproctitle"
+BUGTRACKER = "https://github.com/dvarrazzo/py-setproctitle/issues"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=86d2d41b5f4f023f43466f8cb7adebaa"
+inherit pypi setuptools3 ptest
+SRC_URI[sha256sum] = "c913e151e7ea01567837ff037a23ca8740192880198b7fbb90b16d181607caae"
+SRC_URI += " \
+    file://run-ptest \
+"
+RDEPENDS:${PN}-ptest += "\
+    packagegroup-core-buildessential \
+    procps-ps \
+    python3-dev \
+    python3-multiprocessing \
+    python3-pytest \
+    python3-unittest-automake-output \
+"
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
+BBCLASSEXTEND = "native nativesdk"
+INSANE_SKIP:${PN}-ptest = "dev-deps"
diff --git a/meta-python/recipes-devtools/python/python3-sh_2.0.7.bb b/meta-python/recipes-devtools/python/python3-sh_2.1.0.bb
index 8f8d970a9..948235fd7 100644
--- a/meta-python/recipes-devtools/python/python3-sh_2.0.7.bb
+++ b/meta-python/recipes-devtools/python/python3-sh_2.1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/amoffat/sh"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5317094292296f03405f59ae5f6544b6"
-SRC_URI[sha256sum] = "029d45198902bfb967391eccfd13a88d92f7cebd200411e93f99ebacc6afbb35"
+SRC_URI[sha256sum] = "7e27301c574bec8ca5bf6f211851357526455ee97cd27a7c4c6cc5e2375399cb"
 PYPI_PACKAGE = "sh"
diff --git a/meta-python/recipes-devtools/python/python3-simpleeval_0.9.13.bb b/meta-python/recipes-devtools/python/python3-simpleeval_1.0.0.bb
index af2c4a1e2..686f54b41 100644
--- a/meta-python/recipes-devtools/python/python3-simpleeval_0.9.13.bb
+++ b/meta-python/recipes-devtools/python/python3-simpleeval_1.0.0.bb
@@ -1,9 +1,9 @@
 SUMMARY = "A simple, safe single expression evaluator library"
 HOMEPAGE = "https://pypi.org/project/simpleeval/"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=dc9277482effe59b734b004cbcc1fee7"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=83843c8f0f3beb18af2f282faecbdebe"
-SRC_URI[sha256sum] = "4a30f9cc01825fe4c719c785e3762623e350c4840d5e6855c2a8496baaa65fac"
+SRC_URI[sha256sum] = "f3d259deeb751d34c63e56747bab384efad63a2dbdb4f130281c42279788ac3c"
 inherit pypi python_setuptools_build_meta ptest
diff --git a/meta-python/recipes-devtools/python/python3-speaklater_1.3.bb b/meta-python/recipes-devtools/python/python3-speaklater_1.3.bb
index 5948dc859..9d9166831 100644
--- a/meta-python/recipes-devtools/python/python3-speaklater_1.3.bb
+++ b/meta-python/recipes-devtools/python/python3-speaklater_1.3.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Media asset management for Python, with glue code for various fra
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b810770075a29bf44b96607440e7c801"
-SRC_URI[md5sum] = "e8d5dbe36e53d5a35cff227e795e8bbf"
 SRC_URI[sha256sum] = "59fea336d0eed38c1f0bf3181ee1222d0ef45f3a9dd34ebe65e6bfffdd6a65a9"
 PYPI_PACKAGE = "speaklater"
diff --git a/meta-python/recipes-devtools/python/python3-spidev_3.6.bb b/meta-python/recipes-devtools/python/python3-spidev_3.6.bb
index e3fdc435a..807ee5b78 100644
--- a/meta-python/recipes-devtools/python/python3-spidev_3.6.bb
+++ b/meta-python/recipes-devtools/python/python3-spidev_3.6.bb
@@ -12,4 +12,4 @@ SRCNAME = "spidev"
 SRC_URI[sha256sum] = "14dbc37594a4aaef85403ab617985d3c3ef464d62bc9b769ef552db53701115b"
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.32.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.35.bb
index bb319d566..202350dcd 100644
--- a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.32.bb
+++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.35.bb
@@ -4,10 +4,11 @@ HOMEPAGE = "http://www.sqlalchemy.org/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c78b979ae6c20775a28a287d32092cbb"
-SRC_URI[sha256sum] = "c1b88cc8b02b6a5f0efb0345a03672d4c897dc7d92585176f88c67346f565ea8"
+SRC_URI[sha256sum] = "e11d7ea4d24f0a262bccf9a7cd6284c976c5369dac21db237cff59586045ab9f"
-PYPI_PACKAGE = "SQLAlchemy"
+inherit pypi python_setuptools_build_meta
-inherit pypi setuptools3
+DEPENDS += "python3-cython-native"
 RDEPENDS:${PN} += " \
    python3-asyncio \
diff --git a/meta-python/recipes-devtools/python/python3-sqlparse_0.5.1.bb b/meta-python/recipes-devtools/python/python3-sqlparse_0.5.1.bb
index 62de2327c..daf67607f 100644
--- a/meta-python/recipes-devtools/python/python3-sqlparse_0.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-sqlparse_0.5.1.bb
@@ -16,6 +16,7 @@ export HOST_SYS
 inherit pypi ptest python_hatchling
 RDEPENDS:${PN}-ptest += "\
+    python3-mypy \
    python3-pytest \
    python3-unittest-automake-output \
    python3-unixadmin \
diff --git a/meta-python/recipes-devtools/python/python3-starlette/run-ptest b/meta-python/recipes-devtools/python/python3-starlette/run-ptest
new file mode 100644
index 000000000..09bdf7ced
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-starlette/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+pytest --automake --forked --deselect tests/test_staticfiles.py::test_staticfiles_with_invalid_dir_permissions_returns_401
diff --git a/meta-python/recipes-devtools/python/python3-starlette_0.39.2.bb b/meta-python/recipes-devtools/python/python3-starlette_0.39.2.bb
new file mode 100644
index 000000000..87080e9fe
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-starlette_0.39.2.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Starlette is a lightweight ASGI framework/toolkit, which is ideal for building async web services in Python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=11e8c8dbfd5fa373c703de492140ff7a"
+SRC_URI[sha256sum] = "caaa3b87ef8518ef913dac4f073dea44e85f73343ad2bdc17941931835b2a26a"
+inherit pypi python_hatchling ptest
+PYPI_PACKAGE = "starlette"
+SRC_URI += " \
+        file://run-ptest \
+"
+RDEPENDS:${PN}-ptest += " \
+        python3-attrs \
+        python3-ctypes \
+        python3-httpx \
+        python3-itsdangerous \
+        python3-jinja2 \
+        python3-outcome \
+        python3-pytest \
+        python3-pytest-asyncio \
+        python3-pytest-forked \
+        python3-python-multipart \
+        python3-sortedcontainers \
+        python3-terminal \
+        python3-trio \
+        python3-typing-extensions \
+        python3-unittest-automake-output \
+        python3-pyyaml \
+"
+do_install_ptest() {
+        install -d ${D}${PTEST_PATH}/tests
+        cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
+RDEPENDS:${PN} += " \
+        python3-anyio \
+"
diff --git a/meta-python/recipes-devtools/python/python3-stevedore_5.2.0.bb b/meta-python/recipes-devtools/python/python3-stevedore_5.3.0.bb
index 7cc0a2e52..7c9c3ebbf 100644
--- a/meta-python/recipes-devtools/python/python3-stevedore_5.2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-stevedore_5.3.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://docs.openstack.org/stevedore/latest/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI[sha256sum] = "46b93ca40e1114cea93d738a6c1e365396981bb6bb78c27045b7587c9473544d"
+SRC_URI[sha256sum] = "9a64265f4060312828151c204efbe9b7a9852a0d9228756344dbc7e4023e375a"
 DEPENDS += "python3-pbr-native"
diff --git a/meta-python/recipes-devtools/python/python3-sympy_1.13.2.bb b/meta-python/recipes-devtools/python/python3-sympy_1.13.3.bb
index 02577964c..a0f670072 100644
--- a/meta-python/recipes-devtools/python/python3-sympy_1.13.2.bb
+++ b/meta-python/recipes-devtools/python/python3-sympy_1.13.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/sympy/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ea48085d7dff75b49271b25447e8cdca"
-SRC_URI[sha256sum] = "401449d84d07be9d0c7a46a64bd54fe097667d5e7181bfe67ec777be9e01cb13"
+SRC_URI[sha256sum] = "b27fd2c6530e0ab39e275fc9b683895367e51d5da91baa8d3d64db2565fec4d9"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb b/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb
index c1e7c8e1f..e359e2d88 100644
--- a/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb
+++ b/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "https://github.com/jquast/telnetlib3"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fc2166986ad8169d334a342e0d8db8e0"
-SRC_URI[md5sum] = "2dfac7e10ed63c408da50ea712415f87"
 SRC_URI[sha256sum] = "dbcbc16456a0e03a62431be7cfefff00515ab2f4ce2afbaf0d3a0e51a98c948d"
 PYPI_PACKAGE = "telnetlib3"
diff --git a/meta-python/recipes-devtools/python/python3-termcolor_2.4.0.bb b/meta-python/recipes-devtools/python/python3-termcolor_2.5.0.bb
index ea6b68399..6df8341c8 100644
--- a/meta-python/recipes-devtools/python/python3-termcolor_2.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-termcolor_2.5.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=e5f5f7c9b280511f124dba5dda3d180e"
 inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "aab9e56047c8ac41ed798fa36d892a37aca6b3e9159f3e0c24bc64a9b3ac7b7a"
+SRC_URI[sha256sum] = "998d8d27da6d48442e8e1f016119076b690d962507531df4890fcd2db2ef8a6f"
 DEPENDS += " \
        python3-toml-native \
diff --git a/meta-python/recipes-devtools/python/python3-tinyrecord_0.2.0.bb b/meta-python/recipes-devtools/python/python3-tinyrecord_0.2.0.bb
index 1d99ae2f3..16415ebee 100644
--- a/meta-python/recipes-devtools/python/python3-tinyrecord_0.2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-tinyrecord_0.2.0.bb
@@ -8,7 +8,6 @@ HOMEPAGE = "https://github.com/eugene-eeo/tinyrecord"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ee157eec4b228c8d5b7a6e0feab2864a"
-SRC_URI[md5sum] = "cbaae3f4599b12e3bea67ca4a75eca99"
 SRC_URI[sha256sum] = "eb6dc23601be359ee00f5a3d31a46adf3bad0a16f8d60af216cd67982ca75cf4"
 PYPI_PACKAGE = "tinyrecord"
diff --git a/meta-python/recipes-devtools/python/python3-tomli_2.0.1.bb b/meta-python/recipes-devtools/python/python3-tomli_2.0.2.bb
index 9401ed897..443b2af38 100644
--- a/meta-python/recipes-devtools/python/python3-tomli_2.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-tomli_2.0.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5"
 inherit pypi python_flit_core
-SRC_URI[sha256sum] = "de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
+SRC_URI[sha256sum] = "d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-toolz_0.12.1.bb b/meta-python/recipes-devtools/python/python3-toolz_1.0.0.bb
index f1763ee51..ec67a4b16 100644
--- a/meta-python/recipes-devtools/python/python3-toolz_0.12.1.bb
+++ b/meta-python/recipes-devtools/python/python3-toolz_1.0.0.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca09cab178326d18433aae982d1edf5d"
-SRC_URI[sha256sum] = "ecca342664893f177a13dac0e6b41cbd8ac25a358e5f215316d43e2100224f4d"
+SRC_URI[sha256sum] = "2c86e3d9a04798ac556793bced838816296a2f085017664e4995cb40a1047a02"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-trio_0.27.0.bb b/meta-python/recipes-devtools/python/python3-trio_0.27.0.bb
new file mode 100644
index 000000000..524e439d4
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-trio_0.27.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "A friendly Python library for async concurrency and I/O"
+HOMEPAGE = "https://github.com/python-trio/trio"
+LICENSE = "Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=447ea202d14d2aee40d8a2c26c865da9 \
+                    file://LICENSE.APACHE2;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    file://LICENSE.MIT;md5=5f229c828e5a6f0a2ce90c7d3c054721"
+SRC_URI[sha256sum] = "1dcc95ab1726b2da054afea8fd761af74bad79bd52381b84eae408e983c76831"
+inherit pypi python_setuptools_build_meta
+RDEPENDS:${PN} = " \
+        python3-idna \
+        python3-sniffio \
+        python3-attrs \
+        python3-outcome \
+        python3-sortedcontainers \
+"
diff --git a/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb b/meta-python/recipes-devtools/python/python3-trustme_1.2.0.bb
index dab18f28b..69db7e618 100644
--- a/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-trustme_1.2.0.bb
@@ -4,9 +4,9 @@ HOMEPAGE = "https://pypi.org/project/trustme"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d5a7af1a4b73e57431e25d15a2da745a"
-SRC_URI[sha256sum] = "5375ad7fb427074bec956592e0d4ee2a4cf4da68934e1ba4bcf4217126bc45e6"
+SRC_URI[sha256sum] = "ed2264fb46c35459e6de9e454ed4bab73be44b6a2a26ad417f9b6854aebb644a"
-inherit pypi setuptools3 ptest
+inherit pypi python_hatchling python_setuptools_build_meta ptest
 SRC_URI += " \
        file://run-ptest \
@@ -32,5 +32,4 @@ RDEPENDS:${PN}-ptest += " \
 do_install_ptest() {
        install -d ${D}${PTEST_PATH}/tests
        cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-        cp -rf ${S}/setup.py ${D}${PTEST_PATH}
 }
diff --git a/meta-python/recipes-devtools/python/python3-twisted_24.7.0.bb b/meta-python/recipes-devtools/python/python3-twisted_24.10.0.bb
index e0472d1d8..056ddf428 100644
--- a/meta-python/recipes-devtools/python/python3-twisted_24.7.0.bb
+++ b/meta-python/recipes-devtools/python/python3-twisted_24.10.0.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://twisted.org"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c5d2c2493b848f83864bdedd67bbf5"
-SRC_URI[sha256sum] = "5a60147f044187a127ec7da96d170d49bcce50c6fd36f594e60f4587eff4d394"
+SRC_URI[sha256sum] = "02951299672595fea0f70fa2d5f7b5e3d56836157eda68859a6ad6492d36756e"
 inherit pypi python_hatchling
diff --git a/meta-python/recipes-devtools/python/python3-txdbus_1.1.2.bb b/meta-python/recipes-devtools/python/python3-txdbus_1.1.2.bb
index 1232f5e99..01c069291 100644
--- a/meta-python/recipes-devtools/python/python3-txdbus_1.1.2.bb
+++ b/meta-python/recipes-devtools/python/python3-txdbus_1.1.2.bb
@@ -4,7 +4,6 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://README.rst;beginline=32;endline=32;md5=2141358b0bce85fc45216ba91735ad50"
-SRC_URI[md5sum] = "d397357dee78750385f92ca9c6c1f063"
 SRC_URI[sha256sum] = "8375a5fb68a12054f0def91af800c821fb2232949337756ed975f88d8ea2bc97"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-typer/run-ptest b/meta-python/recipes-devtools/python/python3-typer/run-ptest
index 94b40789b..94b6c0fc2 100644
--- a/meta-python/recipes-devtools/python/python3-typer/run-ptest
+++ b/meta-python/recipes-devtools/python/python3-typer/run-ptest
@@ -3,4 +3,5 @@
 # Ignore the test_tutorial and test_completion.
 # Because it needs the docs_src package what is not in Yocto.
 # And the tests are not that useful for Yocto.
-pytest --automake --ignore tests/test_tutorial --ignore tests/test_completion
+# for test_rich_markup_mode.py see https://github.com/fastapi/typer/pull/859/files/2cfd641d86a591a0d8582dec9292c03e6322a21a
+pytest --automake --ignore tests/test_tutorial --ignore tests/test_completion --deselect tests/test_rich_markup_mode.py::test_rich_markup_mode_rich
diff --git a/meta-python/recipes-devtools/python/python3-types-psutil_6.0.0.20240901.bb b/meta-python/recipes-devtools/python/python3-types-psutil_6.0.0.20241011.bb
index 331756e46..c04c14bf4 100644
--- a/meta-python/recipes-devtools/python/python3-types-psutil_6.0.0.20240901.bb
+++ b/meta-python/recipes-devtools/python/python3-types-psutil_6.0.0.20241011.bb
@@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=c2d9643b4523fdf462
 inherit pypi setuptools3
-SRC_URI[sha256sum] = "437affa76670363db9ffecfa4f153cc6900bf8a7072b3420f3bc07a593f92226"
+SRC_URI[sha256sum] = "5f5c71d02f7a018249d457e080f85966a31a8200644c5459f63cf02be1d85c04"
 BBCLASSEXTEND = "native"
diff --git a/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240906.bb b/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20241003.bb
index 5c3a47743..09d919dd8 100644
--- a/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240906.bb
+++ b/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20241003.bb
@@ -3,6 +3,6 @@ HOMEPAGE = "https://github.com/python/typeshed"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=c2d9643b4523fdf462545aeb1356ad23"
-SRC_URI[sha256sum] = "9706c3b68284c25adffc47319ecc7947e5bb86b3773f843c73906fd598bc176e"
+SRC_URI[sha256sum] = "58cb85449b2a56d6684e41aeefb4c4280631246a0da1a719bdbe6f3fb0317446"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-tzdata_2024.1.bb b/meta-python/recipes-devtools/python/python3-tzdata_2024.2.bb
index d81ded430..614d813e8 100644
--- a/meta-python/recipes-devtools/python/python3-tzdata_2024.1.bb
+++ b/meta-python/recipes-devtools/python/python3-tzdata_2024.2.bb
@@ -4,7 +4,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fca9fd5c15a28eb874ba38577a585d48 \
                    file://licenses/LICENSE_APACHE;md5=86d3f3a95c324c9479bd8986968f4327"
-SRC_URI[sha256sum] = "2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd"
+SRC_URI[sha256sum] = "7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-uefi-firmware_1.11.bb b/meta-python/recipes-devtools/python/python3-uefi-firmware_1.12.bb
index 67e668ac6..e9e799e16 100644
--- a/meta-python/recipes-devtools/python/python3-uefi-firmware_1.11.bb
+++ b/meta-python/recipes-devtools/python/python3-uefi-firmware_1.12.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://setup.py;md5=5a59066a8676f17262ef7e691f8ef253"
 SRC_URI = "git://github.com/theopolis/uefi-firmware-parser;protocol=https;branch=master"
-SRCREV = "f289219b99eb525cbc58e4dc2b07df3811f92ef7"
+SRCREV = "0c5fb74bcecc0e5c80625c38130fe948c2a3656e"
 S = "${WORKDIR}/git"
diff --git a/meta-python/recipes-devtools/python/python3-ujson/run-ptest b/meta-python/recipes-devtools/python/python3-ujson/run-ptest
index 8d2017d39..4863c5e5a 100644
--- a/meta-python/recipes-devtools/python/python3-ujson/run-ptest
+++ b/meta-python/recipes-devtools/python/python3-ujson/run-ptest
@@ -1,3 +1,3 @@
 #!/bin/sh
-pytest --automake
+FORCE_COLOR=1 pytest --automake --capture=no
diff --git a/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb b/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb
index 18ce5cc30..5f4439c4c 100644
--- a/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb
+++ b/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e0039a83d8a99726b5
 SRC_URI[sha256sum] = "b3cd8f3c5d8c7738257f1018880444f7b7d9b66232c64649f562d7ba86ad4bc1"
-inherit pypi ptest setuptools3
+inherit pypi ptest python_setuptools_build_meta
 # let OE do the strip operation
 export UJSON_BUILD_NO_STRIP = "1"
@@ -24,6 +24,7 @@ RDEPENDS:${PN} += "\
 RDEPENDS:${PN}-ptest += " \
    python3-json \
+    python3-misc \
    python3-pytest \
    python3-pytz \
    python3-unittest-automake-output \
diff --git a/meta-python/recipes-devtools/python/python3-validators_0.34.0.bb b/meta-python/recipes-devtools/python/python3-validators_0.34.0.bb
index ebba68388..41ead5c05 100644
--- a/meta-python/recipes-devtools/python/python3-validators_0.34.0.bb
+++ b/meta-python/recipes-devtools/python/python3-validators_0.34.0.bb
@@ -12,6 +12,10 @@ SRC_URI += " \
 "
 RDEPENDS:${PN}-ptest += " \
+        python3-decorator \
+        python3-eth-hash \
+        python3-isort \
+        python3-pycryptodome \
        python3-pytest \
        python3-unittest-automake-output \
 "
diff --git a/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb b/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb
index 02639b590..8a83f1111 100644
--- a/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb
+++ b/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb
@@ -4,7 +4,6 @@ HOMEPAGE = "https://launchpad.net/versiontools"
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=20;md5=02193721a38fd8a05a4ddeb7df8e294d"
-SRC_URI[md5sum] = "602b7db8eea30dd29a1d451997adf251"
 SRC_URI[sha256sum] = "a969332887a18a9c98b0df0ea4d4ca75972f24ca94f06fb87d591377e83414f6"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-virtualenv_20.26.4.bb b/meta-python/recipes-devtools/python/python3-virtualenv_20.26.5.bb
index aadef0e94..82d60aeaa 100644
--- a/meta-python/recipes-devtools/python/python3-virtualenv_20.26.4.bb
+++ b/meta-python/recipes-devtools/python/python3-virtualenv_20.26.5.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/pypa/virtualenv"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538"
-SRC_URI[sha256sum] = "c17f4e0f3e6036e9f26700446f85c76ab11df65ff6d8a9cbfad9f71aabfcf23c"
+SRC_URI[sha256sum] = "ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4"
 BBCLASSEXTEND = "native nativesdk"
 inherit pypi python_hatchling
diff --git a/meta-python/recipes-devtools/python/python3-visitor_0.1.3.bb b/meta-python/recipes-devtools/python/python3-visitor_0.1.3.bb
index ac3a90efb..92a19a2d1 100644
--- a/meta-python/recipes-devtools/python/python3-visitor_0.1.3.bb
+++ b/meta-python/recipes-devtools/python/python3-visitor_0.1.3.bb
@@ -2,7 +2,6 @@ SUMMARY = "A tiny pythonic visitor implementation."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489"
-SRC_URI[md5sum] = "94a024ed0ec1b02b4497c15267d319ca"
 SRC_URI[sha256sum] = "2c737903b2b6864ebc6167eef7cf3b997126f1aa94bdf590f90f1436d23e480a"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-watchdog_5.0.2.bb b/meta-python/recipes-devtools/python/python3-watchdog_5.0.3.bb
index ad66523de..0467f55ac 100644
--- a/meta-python/recipes-devtools/python/python3-watchdog_5.0.2.bb
+++ b/meta-python/recipes-devtools/python/python3-watchdog_5.0.3.bb
@@ -4,7 +4,7 @@ DEPENDS = "python3-argh"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI[sha256sum] = "dcebf7e475001d2cdeb020be630dc5b687e9acdd60d16fea6bb4508e7b94cf76"
+SRC_URI[sha256sum] = "108f42a7f0345042a854d4d0ad0834b741d421330d5f575b81cb27b883500176"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-web3_6.20.1.bb b/meta-python/recipes-devtools/python/python3-web3_7.3.0.bb
index b3487b6d8..b0b67dfac 100644
--- a/meta-python/recipes-devtools/python/python3-web3_6.20.1.bb
+++ b/meta-python/recipes-devtools/python/python3-web3_7.3.0.bb
@@ -2,9 +2,9 @@ SUMMARY = "A Python library for interacting with Ethereum."
 HOMEPAGE = "https://github.com/ethereum/web3.py"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=373fede350846fdffd23648fba504635"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c8694da5a97575618474d9caf8c812da"
-SRC_URI[sha256sum] = "a29bc1863734e1c05f128ddbc56878f299ea71776806e667b581a83b5d5be0ed"
+SRC_URI[sha256sum] = "74d52cfcc23b8e99c837190128b932923f38fca290ae2cf2d690edbf622252a0"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-webargs_8.4.0.bb b/meta-python/recipes-devtools/python/python3-webargs_8.6.0.bb
index 78af01332..d898539ab 100644
--- a/meta-python/recipes-devtools/python/python3-webargs_8.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-webargs_8.6.0.bb
@@ -1,11 +1,11 @@
 SUMMARY = "Declarative parsing and validation of HTTP request objects, with built-in support for popular web frameworks."
 HOMEPAGE = "https://github.com/marshmallow-code/webargs"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dfbd4ae0074716275fc229c775723e8f"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=27586b20700d7544c06933afe56f7df4"
-inherit pypi setuptools3
+inherit pypi python_flit_core
-SRC_URI[sha256sum] = "ea99368214a4ce613924be99d71db58c269631e95eff4fa09b7354e52dc006a5"
+SRC_URI[sha256sum] = "b8d098ab92bd74c659eca705afa31d681475f218cb15c1e57271fa2103c0547a"
 RDEPENDS:${PN} += "\
    python3-marshmallow \
diff --git a/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb b/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb
index cedc79081..81709435b 100644
--- a/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb
@@ -2,7 +2,6 @@ SUMMARY = "Character encoding aliases for legacy web content"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709"
-SRC_URI[md5sum] = "32f6e261d52e57bf7e1c4d41546d15b8"
 SRC_URI[sha256sum] = "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-whoosh/0001-Mark-non-determinstic-test_minimize_dfa-test-as-XFAI.patch b/meta-python/recipes-devtools/python/python3-whoosh/0001-Mark-non-determinstic-test_minimize_dfa-test-as-XFAI.patch
deleted file mode 100644
index 91fea2452..000000000
--- a/meta-python/recipes-devtools/python/python3-whoosh/0001-Mark-non-determinstic-test_minimize_dfa-test-as-XFAI.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ede95a4f4487b4fc3cad8452ae388376966fca0e Mon Sep 17 00:00:00 2001
-From: Chris Lamb <lamby@debian.org>
-Date: Fri, 5 Apr 2019 15:48:23 +0200
-Subject: [PATCH] Mark non-determinstic test_minimize_dfa test as XFAIL
-Sourced from Debian [1]
-[1] https://sources.debian.org/src/python-whoosh/2.7.4%2Bgit6-g9134ad92-8/debian/patches/0003-Mark-non-determinstic-test_minimize_dfa-test-as-XFAI.patch/
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- tests/test_automata.py | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/tests/test_automata.py b/tests/test_automata.py
-index daab96c..7031dc3 100644
--- a/tests/test_automata.py
-+++ b/tests/test_automata.py
-@@ -327,6 +327,7 @@ def test_regular():
-     assert not ex.accept("bc")
- 
- 
-+@pytest.mark.xfail(strict=False)
- def test_minimize_dfa():
-     # Example from www.cs.odu.edu/~toida/nerzic/390teched/regular/fa/min-fa.html
- 
-- 
-2.44.0
diff --git a/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb b/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb
deleted file mode 100644
index 406de2e52..000000000
--- a/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SUMMARY = "Fast, pure-Python full text indexing, search, and spell checking library."
-DESCRIPTION = "\
-Whoosh is a fast, featureful full-text indexing and searching library \
-implemented in pure Python. Programmers can use it to easily add search \
-functionality to their applications and websites. Every part of how \
-Whoosh works can be extended or replaced to meet your needs exactly."
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05303186defc6141143629961c7c8a60"
-SRC_URI += "file://0001-Mark-non-determinstic-test_minimize_dfa-test-as-XFAI.patch"
-SRC_URI[md5sum] = "893433e9c0525ac043df33e6e04caab2"
-SRC_URI[sha256sum] = "e0857375f63e9041e03fedd5b7541f97cf78917ac1b6b06c1fcc9b45375dda69"
-PYPI_PACKAGE = "Whoosh"
-PYPI_PACKAGE_EXT = "zip"
-inherit ptest pypi setuptools3
-RDEPENDS:${PN} += " \
-    python3-email \
-    python3-multiprocessing \
-    python3-netclient \
-    python3-numbers \
-    python3-pickle \
-    python3-shell \
-    python3-stringold \
-"
-SRC_URI += " \
-    file://run-ptest \
-"
-RDEPENDS:${PN}-ptest += " \
-    python3-fcntl \
-    python3-pytest \
-    python3-unittest-automake-output \
-"
-do_install_ptest() {
-    install -d ${D}${PTEST_PATH}/tests
-    cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
diff --git a/meta-python/recipes-devtools/python/python3-wpa-supplicant_0.2.bb b/meta-python/recipes-devtools/python/python3-wpa-supplicant_0.2.bb
index b9c62ced7..bb0007e61 100644
--- a/meta-python/recipes-devtools/python/python3-wpa-supplicant_0.2.bb
+++ b/meta-python/recipes-devtools/python/python3-wpa-supplicant_0.2.bb
@@ -4,7 +4,6 @@ SECTION = "devel/python"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://README.md;beginline=171;endline=199;md5=462586bcbebd12f5d0ac443be0ed3d91"
-SRC_URI[md5sum] = "c21c7841f5e03ff709a0564b2e094010"
 SRC_URI[sha256sum] = "3ad0f40a696763bb0f4d4dec5b51f6b53ccfeb7c16ebb5897349303045f94776"
 SRC_URI += "file://0001-cli-drop-the-second-argument-from-click.argument-dec.patch"
diff --git a/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb b/meta-python/recipes-devtools/python/python3-wrapt_1.17.0rc1.bb
index 398d2fa6b..636d67755 100644
--- a/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb
+++ b/meta-python/recipes-devtools/python/python3-wrapt_1.17.0rc1.bb
@@ -6,12 +6,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dc34cbad60bc961452eb7ade801d25f7"
 SRC_URI[sha256sum] = "5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d"
-inherit pypi setuptools3 ptest
+inherit setuptools3 ptest
-SRC_URI += " \
+SRCREV = "75f291f8bf1fe6535b13b0b3dfedca012ca6c8a5"
+SRC_URI += "git://github.com/GrahamDumpleton/wrapt;protocol=https;branch=develop \
        file://run-ptest \
 "
+S = "${WORKDIR}/git"
 # python3-misc for 'this' module
 RDEPENDS:${PN}-ptest += " \
        python3-misc \
diff --git a/meta-python/recipes-devtools/python/python3-xmlschema_3.3.2.bb b/meta-python/recipes-devtools/python/python3-xmlschema_3.4.2.bb
index 33244d98e..b29862b1d 100644
--- a/meta-python/recipes-devtools/python/python3-xmlschema_3.3.2.bb
+++ b/meta-python/recipes-devtools/python/python3-xmlschema_3.4.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/xmlschema"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=26aa26eda991a3a2b61c11b62d3fda65"
-SRC_URI[sha256sum] = "a2f021f21d0b5ab371e9bcb5a1d5c34b9ba2c74ad3e32854474c4159bf94e158"
+SRC_URI[sha256sum] = "d35023ea504ea46127302d1297b046d023b96fec5fe4b4b690534ea85b5e9bf8"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-yappi/py3.13.patch b/meta-python/recipes-devtools/python/python3-yappi/py3.13.patch
new file mode 100644
index 000000000..48d81d56e
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-yappi/py3.13.patch
@@ -0,0 +1,43 @@
+From defc0291039184b640779e38471ece5e6d3c8cb8 Mon Sep 17 00:00:00 2001
+From: Alfredo Moralejo <amoralej@redhat.com>
+Date: Tue, 2 Jul 2024 10:48:24 +0200
+Subject: [PATCH] Add support for python 3.13
+_PyEval_SetProfile() has been moved to internal pycore_ceval.h and it is
+not longer exported [1]. PyEval_SetProfileAllThreads was introduced in 3.12 [2].
+[1] https://github.com/python/cpython/commit/c494fb333b57bdf43fc90189fc29a00c293b2987
+[2] https://github.com/python/cpython/commits/76af5c9153394f3d07562427168711a68f54ec66
+Upstream-Status: Backport [https://github.com/sumerc/yappi/commit/defc0291039184b640779e38471ece5e6d3c8cb8]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ yappi/_yappi.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+diff --git a/yappi/_yappi.c b/yappi/_yappi.c
+index 459f4dd..56187c9 100644
+--- a/yappi/_yappi.c
+++ b/yappi/_yappi.c
+@@ -1284,7 +1284,9 @@ _resume_greenlet_ctx(_ctx *ctx)
+ static void 
+ _eval_setprofile(PyThreadState *ts)
+ {
+-#if PY_VERSION_HEX > 0x030b0000
+#if PY_VERSION_HEX > 0x030c0000
+    PyEval_SetProfileAllThreads(_yapp_callback, NULL);
+#elif PY_VERSION_HEX > 0x030b0000
+     _PyEval_SetProfile(ts, _yapp_callback, NULL);
+ #elif PY_VERSION_HEX < 0x030a00b1
+     ts->use_tracing = 1;
+@@ -1298,7 +1300,9 @@ _eval_setprofile(PyThreadState *ts)
+ static void
+ _eval_unsetprofile(PyThreadState *ts)
+ {
+-#if PY_VERSION_HEX > 0x030b0000
+#if PY_VERSION_HEX > 0x030c0000
+    PyEval_SetProfileAllThreads(NULL, NULL);
+#elif PY_VERSION_HEX > 0x030b0000
+     _PyEval_SetProfile(ts, NULL, NULL);
+ #elif PY_VERSION_HEX < 0x030a00b1
+     ts->use_tracing = 0;
diff --git a/meta-python/recipes-devtools/python/python3-yappi_1.6.0.bb b/meta-python/recipes-devtools/python/python3-yappi_1.6.0.bb
index 4349cab1e..80d5012be 100644
--- a/meta-python/recipes-devtools/python/python3-yappi_1.6.0.bb
+++ b/meta-python/recipes-devtools/python/python3-yappi_1.6.0.bb
@@ -10,6 +10,7 @@ SRC_URI += " \
    file://run-ptest \
    file://0001-test_functionality-convert-line-endings-to-Unix.patch \
    file://0002-Fix-import-of-tests.utils-to-enable-pytest.patch \
+    file://py3.13.patch \
 "
 inherit pypi python_setuptools_build_meta ptest
diff --git a/meta-python/recipes-devtools/python/python3-yarl_1.10.0.bb b/meta-python/recipes-devtools/python/python3-yarl_1.15.1.bb
index 0ff3041db..475c71bba 100644
--- a/meta-python/recipes-devtools/python/python3-yarl_1.10.0.bb
+++ b/meta-python/recipes-devtools/python/python3-yarl_1.15.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/aio-libs/yarl/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI[sha256sum] = "3bf10a395adac62177ba8ea738617e8de6cbb1cea6aa5d5dd2accde704fc8195"
+SRC_URI[sha256sum] = "02e1c9e36528de270c22c06aac6a5a1de8cc870fafefb5e90e5b35cb8985d0b2"
 SRC_URI += "file://run-ptest"
@@ -20,10 +20,13 @@ RDEPENDS:${PN} = "\
    python3-multidict \
    python3-idna \
    python3-io \
+    python3-propcache \
 "
 RDEPENDS:${PN}-ptest += " \
+    python3-hypothesis \
    python3-pytest \
+    python3-pytest-codspeed \
    python3-unittest-automake-output \
 "
diff --git a/meta-python/recipes-devtools/python/python3-zeroconf_0.134.0.bb b/meta-python/recipes-devtools/python/python3-zeroconf_0.135.0.bb
index b1b1a2e4c..e72e12512 100644
--- a/meta-python/recipes-devtools/python/python3-zeroconf_0.134.0.bb
+++ b/meta-python/recipes-devtools/python/python3-zeroconf_0.135.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jstasiak/python-zeroconf"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=6517bdc8f2416f27ab725d4702f7aac3"
-SRC_URI[sha256sum] = "5be2c3a61cc81eb1bd4684bbdee19d708522d94bc8ac60dfe001a0fde4421092"
+SRC_URI[sha256sum] = "9424551ef5a8d91fa8296bb1791e83b31afcd17a336a071928d4a978d7b96b72"
 DEPENDS += "python3-cython-native"
diff --git a/meta-python/recipes-devtools/python/python3-zopeinterface_6.3.bb b/meta-python/recipes-devtools/python/python3-zopeinterface_7.1.1.bb
index 21d03f2e7..76b064181 100644
--- a/meta-python/recipes-devtools/python/python3-zopeinterface_6.3.bb
+++ b/meta-python/recipes-devtools/python/python3-zopeinterface_7.1.1.bb
@@ -4,9 +4,8 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e54fd776274c1b7423
 PYPI_PACKAGE = "zope.interface"
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "f83d6b4b22262d9a826c3bd4b2fbfafe1d0000f085ef8e44cd1328eea274ae6a"
+SRC_URI[sha256sum] = "4284d664ef0ff7b709836d4de7b13d80873dc5faeffc073abdb280058bfac5e3"
 PACKAGES =. "${PN}-test "
 RPROVIDES:${PN} += "zope-interfaces"
diff --git a/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.1.2.bb b/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.1.3.bb
index 0aae1d0c9..f88c58058 100644
--- a/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.1.2.bb
+++ b/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.1.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/burnash/gspread"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9488e21983675fa56dc05af558b83e2f"
-SRC_URI[sha256sum] = "b147688b8c7a18c9835d5f998997ec17c97c0470babcab17f65ac2b3a32402b7"
+SRC_URI[sha256sum] = "cf03627f44e9e03a0a3de241d1748709db22af4fc8c11a13aa389d0bce6053fd"
 RDEPENDS:${PN} = " \
        python3-google-auth \
diff --git a/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.1.0b1.bb b/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.1.0b1.bb
index bd2b59d36..6884e908a 100644
--- a/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.1.0b1.bb
+++ b/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.1.0b1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ffde61aeb8917e70e0257e0a4b6d103c"
 SRC_URI[sha256sum] = "e11528d63e75461d45b86c23f9db8260303d6ab6cae075fa9eddb44527ad8ece"
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
 DEPENDS += "python3-cython-native"
 RDEPENDS:${PN} += "python3-core"
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch
index f8a3061ae..1426067d2 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch
@@ -1,4 +1,4 @@
-From b9f95c06b2e7a525f4f93d705976882e8dcba6ab Mon Sep 17 00:00:00 2001
+From b62aa1a2e3e0feced819a375be3b2187cc356284 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 20 Dec 2022 09:46:31 -0800
 Subject: [PATCH] sip: Conditionally use GetAssertStackTrace under
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 1 file changed, 4 insertions(+)
 diff --git a/sip/cpp/sip_corewxAppTraits.cpp b/sip/cpp/sip_corewxAppTraits.cpp
-index 9c9f9d5b..1d2d2f90 100644
+index 9a9a4a66..a54e7659 100644
 --- a/sip/cpp/sip_corewxAppTraits.cpp
 +++ b/sip/cpp/sip_corewxAppTraits.cpp
 @@ -471,7 +471,11 @@ static PyObject *meth_wxAppTraits_GetAssertStackTrace(PyObject *sipSelf, PyObjec
@@ -23,7 +23,7 @@ index 9c9f9d5b..1d2d2f90 100644
 
             Py_BEGIN_ALLOW_THREADS
 +#if wxUSE_STACKWALKER
-             sipRes = new  ::wxString((sipSelfWasArg ? sipCpp-> ::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
+             sipRes = new ::wxString((sipSelfWasArg ? sipCpp->::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
 +#else
 +            sipRes = new  ::wxString("");
 +#endif
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch
deleted file mode 100644
index 4782e74ef..000000000
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5234a454a1b9f11f83e59909fb2972176497e02c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 9 May 2024 17:35:11 -0700
-Subject: [PATCH] sip: Fix build with gcc-14
-Fixes -Wincompatible-pointer-types
-sip/siplib/siplib.c:3900:20: error: assignment to 'sipSimpleWrapper *' {aka 'struct _sipSimpleWrapper *'} from incompatible pointer type 'PyObject *' {aka 'struct _object *'} [-Wincompatible-pointer-types]
-|  3900 |             *selfp = va_arg(va, PyObject *);
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- sip/siplib/siplib.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/sip/siplib/siplib.c b/sip/siplib/siplib.c
-index 95563e5c..ae3fac60 100644
--- a/sip/siplib/siplib.c
-+++ b/sip/siplib/siplib.c
-@@ -3897,7 +3897,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp,
-     {
-     case '#':
-             /* A ctor has an argument with the /Transfer/ annotation. */
-            *selfp = va_arg(va, PyObject *);
-+            *selfp = (sipSimpleWrapper *)va_arg(va, PyObject *);
-             break;
- 
-     case 'B':
-- 
-2.45.0
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/add-back-option-build-base.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/add-back-option-build-base.patch
index a46f3f870..2622df24e 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/add-back-option-build-base.patch
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/add-back-option-build-base.patch
@@ -1,4 +1,7 @@
-Add back default user options for cross build.
+From bc08fddaf4b23073b2afbc045a26aedc4d2c6470 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Wed, 30 Mar 2022 17:39:33 +0800
+Subject: [PATCH] Add back default user options for cross build.
 Upstream-Status: Pending [oe specific]
@@ -8,10 +11,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/setup.py b/setup.py
-index a215da7..dccfeb3 100644
+index 99ee6612..fad5aba8 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -105,7 +105,7 @@ class wx_build(orig_build):
+@@ -111,7 +111,7 @@ class wx_build(orig_build):
     Delegate to build.py for doing the actual build, (including wxWidgets)
     instead of letting distutils do it all.
     """
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/not-overwrite-cflags-cxxflags.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/not-overwrite-cflags-cxxflags.patch
index 67f7949b3..3dc4cb1e7 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/not-overwrite-cflags-cxxflags.patch
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/not-overwrite-cflags-cxxflags.patch
@@ -1,4 +1,8 @@
-Not overwrite CFLAGS and CXXFLAGS. It also avoid buildpaths qa issue:
+From 05189dc7063a7c238e38589cbaf92be256270e54 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Wed, 23 Nov 2022 13:40:00 +0800
+Subject: [PATCH] Not overwrite CFLAGS and CXXFLAGS. It also avoid buildpaths
+ qa issue:
  WARNING: python3-wxgtk4-4.2.0-r0 do_package_qa: QA Issue: File
  /usr/lib64/python3.11/site-packages/wx/.debug/_xml.cpython-311-aarch64-linux-gnu.so
@@ -12,10 +16,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/wscript b/wscript
-index 067b307..50d96d1 100644
+index 79bdf3e1..d6244d5e 100644
 --- a/wscript
 +++ b/wscript
-@@ -195,8 +195,8 @@ def configure(conf):
+@@ -188,8 +188,8 @@ def configure(conf):
         cfg.finishSetup(conf.env.wx_config, conf.env.debug,
                         'mingw32' if isWindows and not conf.env.use_msvc else None)
 
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch
index 0d65ebb59..09497133b 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/wxgtk-fixup-build-scripts.patch
@@ -1,4 +1,7 @@
-Fix issues in build scripts:
+From 171df10f86be6defb9e317ac62df8a7b0389b901 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Wed, 30 Mar 2022 17:39:33 +0800
+Subject: [PATCH] Fix issues in build scripts:
 * remove hardcode lib path from buildtools/config.py which is not suitable for
  cross build
@@ -15,10 +18,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
 2 files changed, 4 insertions(+), 4 deletions(-)
 diff --git a/buildtools/config.py b/buildtools/config.py
-index c837e5d..d426005 100644
+index 94c216ec..b3ec3f2e 100644
 --- a/buildtools/config.py
 +++ b/buildtools/config.py
-@@ -312,8 +312,8 @@ class Configuration(object):
+@@ -336,8 +336,8 @@ class Configuration(object):
                 # wx-config doesn't output that for some reason.  For now, just
                 # add it unconditionally but we should really check if the lib is
                 # really found there or wx-config should be fixed.
@@ -30,10 +33,10 @@ index c837e5d..d426005 100644
             # Move the various -I, -D, etc. flags we got from the config scripts
             # into the distutils lists.
 diff --git a/setup.py b/setup.py
-index 64bec4b..fb29253 100644
+index fad5aba8..eade737b 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -130,7 +130,7 @@ class wx_build(orig_build):
+@@ -135,7 +135,7 @@ class wx_build(orig_build):
                 'message and the wxWidgets and Phoenix build steps in the future.\n')
 
             # Use the same Python that is running this script.
@@ -42,7 +45,7 @@ index 64bec4b..fb29253 100644
             cmd = ' '.join(cmd)
             runcmd(cmd)
 
-@@ -233,7 +233,7 @@ if haveWheel:
+@@ -238,7 +238,7 @@ if haveWheel:
 class wx_install(orig_install):
     def finalize_options(self):
         orig_install.finalize_options(self)
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.2.bb
index cc6b6cef6..64e2b3ebb 100644
--- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb
+++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.2.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Python3 interface to the wxWidgets Cross-platform C++ GUI toolkit."
 HOMEPAGE = "http://www.wxpython.org"
-LICENSE = "LGPL-2.0-only & WXwindows"
+LICENSE = "LGPL-2.0-only & WXwindows & BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bdabf9e11191e2b9d3b6aef5f338ec00"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=102f37a0d23aa258e59e4cc8b5380b35"
 DEPENDS = "python3-attrdict3-native python3-six-native wxwidgets-native \
           wxwidgets \
@@ -14,9 +14,8 @@ SRC_URI += "file://add-back-option-build-base.patch \
           file://wxgtk-fixup-build-scripts.patch \
           file://not-overwrite-cflags-cxxflags.patch \
           file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \
-           file://0001-sip-Fix-build-with-gcc-14.patch \
           "
-SRC_URI[sha256sum] = "e48de211a6606bf072ec3fa778771d6b746c00b7f4b970eb58728ddf56d13d5c"
+SRC_URI[sha256sum] = "5dbcb0650f67fdc2c5965795a255ffaa3d7b09fb149aa8da2d0d9aa44e38e2ba"
 S = "${WORKDIR}/wxPython-${PV}"
diff --git a/meta-python/recipes-devtools/python3-zstandard/python3-zstandard_0.23.0.bb b/meta-python/recipes-devtools/python3-zstandard/python3-zstandard_0.23.0.bb
new file mode 100644
index 000000000..e44e04038
--- /dev/null
+++ b/meta-python/recipes-devtools/python3-zstandard/python3-zstandard_0.23.0.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Python bindings for interfacing with the Zstandard compression library"
+DESCRIPTION = "This project provides Python bindings for interfacing with the \
+               Zstandard compression library. A C extension and CFFI interface \
+               are provided."
+HOMEPAGE = "https://github.com/indygreg/python-zstandard"
+BUGTRACKER = "https://github.com/indygreg/python-zstandard/issues"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3ae87c50fd64b6f0942823686871e758"
+DEPENDS = "python3-cffi"
+RDEPENDS_${PN} = "\
+    libzstd (>= 1.4.0) \
+    python3-cffi \
+"
+inherit setuptools3 pypi
+SRC_URI[sha256sum] = "b2d8c62d08e7255f68f7a740bae85b3c9b8e5466baa9cbf7f57f1cde0ac6bc09"
+# Because the pyproject.toml is still in development and it contains invalid
+# requirements.
+INSANE_SKIP += "pep517-backend"
diff --git a/meta-python/recipes-devtools/python3_oauth2client/python3-oauth2client_4.1.3.bb b/meta-python/recipes-devtools/python3_oauth2client/python3-oauth2client_4.1.3.bb
deleted file mode 100644
index d87e289c5..000000000
--- a/meta-python/recipes-devtools/python3_oauth2client/python3-oauth2client_4.1.3.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "OAuth 2.0 client library"
-HOMEPAGE = "http://github.com/google/oauth2client/"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=038e1390e94fe637991fa5569daa62bc"
-inherit pypi
-SRC_URI[sha256sum] = "d486741e451287f69568a4d26d70d9acd73a2bbfa275746c535b4209891cccc6"
-RDEPENDS:${PN} += " \
-        python3-httplib2 \
-        python3-pyasn1 \
-        python3-pyasn1-modules \
-        python3-rsa \
-        python3-six \
-        "
-inherit setuptools3
diff --git a/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.5.bb b/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.6.bb
index 8c9262afb..c3b151508 100644
--- a/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.5.bb
+++ b/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.6.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://rhodesmill.org/pyephem/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9c930b395b435b00bb13ec83b0c99f40"
-SRC_URI[sha256sum] = "0c64a8aa401574c75942045b9af70d1656e14c5366151c0cbb400cbeedc2362a"
+SRC_URI[sha256sum] = "0ed2e4ea76f9db3eede2204adab8af3f1708201c7c04ee8511e710a54ca6425f"
 PYPI_PACKAGE = "ephem"
diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb
index a7bd8ae43..9e074bddc 100644
--- a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb
+++ b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://fedoraproject.org/wiki/pykickstart"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 inherit python_setuptools_build_meta
diff --git a/meta-python/recipes-extended/python-rich/python3-rich_13.8.0.bb b/meta-python/recipes-extended/python-rich/python3-rich_13.9.3.bb
index ee66c3554..9458e4137 100644
--- a/meta-python/recipes-extended/python-rich/python3-rich_13.8.0.bb
+++ b/meta-python/recipes-extended/python-rich/python3-rich_13.9.3.bb
@@ -8,7 +8,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303"
-SRC_URI[sha256sum] = "a5ac1f1cd448ade0d59cc3356f7db7a7ccda2c8cbae9c7a90c28ff463d3e91f4"
+SRC_URI[sha256sum] = "bc1e01b899537598cf02579d2b9f4a415104d3fc439313a7a2c165d76557a08e"
 inherit pypi python_poetry_core
diff --git a/meta-webserver/conf/layer.conf b/meta-webserver/conf/layer.conf
index 08e9df505..90a879218 100644
--- a/meta-webserver/conf/layer.conf
+++ b/meta-webserver/conf/layer.conf
@@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1"
 LAYERDEPENDS_webserver = "core openembedded-layer"
-LAYERSERIES_COMPAT_webserver = "styhead"
+LAYERSERIES_COMPAT_webserver = "styhead walnascar"
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
index e775cdb50..fc97f6e58 100644
--- a/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
+++ b/meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb
@@ -21,7 +21,6 @@ RDEPENDS:packagegroup-meta-webserver = "\
 RDEPENDS:packagegroup-meta-webserver-http = "\
    apache-websocket \
    apache2 \
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "cherokee", "", d)} \
    hiawatha \
    monkey \
    nginx \
diff --git a/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.17.14.bb b/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.17.14.bb
new file mode 100644
index 000000000..de5437027
--- /dev/null
+++ b/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.17.14.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Visually render documentation for an API defined with the OpenAPI"
+DESCRIPTION = "\
+    Swagger UI allows anyone — be it your development team or your end consumers — to visualize and \
+    interact with the API’s resources without having any of the implementation logic in place. \
+    It’s automatically generated from your OpenAPI (formerly known as Swagger) Specification, \
+    with the visual documentation making it easy for back end implementation and client side consumption. \
+    "
+HOMEPAGE = "https://github.com/swagger-api/swagger-ui"
+SECTION = "net"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+SRC_URI = "git://github.com/swagger-api/swagger-ui;branch=master;protocol=https"
+SRCREV = "74ed0adebfc9c8dd0de2bf8e81495b022a66c083"
+S = "${WORKDIR}/git"
+do_install() {
+    install -d ${D}${localstatedir}/www/openapi/static
+    cp -r ${S}/dist/* ${D}${localstatedir}/www/openapi/static
+}
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb
index 364b4c674..7d6ea27e7 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb
@@ -50,7 +50,7 @@ SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice"
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
 PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap"
-PACKAGECONFIG[zlib] = "--enable-deflate,,zlib,zlib"
+PACKAGECONFIG[zlib] = "--enable-deflate --with-zlib=${STAGING_LIBDIR}/../,,zlib,zlib"
 CFLAGS:append = " -DPATH_MAX=4096"
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch
deleted file mode 100644
index 0f4384275..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c73415021f3f3b2b30062ab74b25fe49c51c2242 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 10 Nov 2019 15:59:44 -0800
-Subject: [PATCH] common-internal.h: Define LLONG_MAX if undefined
-time_t can also be long long type, therefore check for that as fallback
-Fixes build on 32bit hosts where time_t is fixed for Y2K38
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- cherokee/common-internal.h | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-diff --git a/cherokee/common-internal.h b/cherokee/common-internal.h
-index 5c28da97..5646ec0f 100644
--- a/cherokee/common-internal.h
-+++ b/cherokee/common-internal.h
-@@ -222,6 +222,16 @@ char *strcasestr(char *s, char *find);
- # endif
- #endif
- 
-+/* Long Long limit
-+ */
-+#ifndef LLONG_MAX
-+# if (__SIZEOF_LONG_LONG__ == 8)
-+#  define LLONG_MAX 0x7fffffffffffffffLL
-+# else
-+#  error "Can't define LLONG_MAX"
-+# endif
-+#endif
-+
- /* time_t limit
-  */
- #ifndef TIME_MAX
-@@ -229,6 +239,8 @@ char *strcasestr(char *s, char *find);
- #  define TIME_MAX ((time_t)INT_MAX)
- # elif (SIZEOF_TIME_T == SIZEOF_LONG)
- #  define TIME_MAX ((time_t)LONG_MAX)
-+# elif (SIZEOF_TIME_T == __SIZEOF_LONG_LONG__)
-+#  define TIME_MAX ((time_t)LLONG_MAX)
- # else
- #  error "Can't define TIME_MAX"
- # endif
-- 
-2.24.0
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch
deleted file mode 100644
index b16060f2a..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4591b5b40d66c19edc73b951ad091dac639454c9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 25 Jul 2017 16:00:34 -0700
-Subject: [PATCH] configure.ac: Add foreign to AM_INIT_AUTOMAKE
-Fixes errors like
-| Makefile.am: error: required file './README' not found
-| Makefile.am: error: required file './ChangeLog' not found
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index d6298f27..98cab791 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ dnl Init autoconf and automake
- AC_INIT([cherokee], [cherokee_version], [http://bugs.cherokee-project.com/], [cherokee])
- AC_CONFIG_SRCDIR([cherokee/server.c])
- AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([no-define])
-+AM_INIT_AUTOMAKE([no-define foreign])
- 
- dnl Define version
- AC_DEFINE(PACKAGE_MAJOR_VERSION, "cherokee_major_version", [Version string])
-- 
-2.13.3
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch
deleted file mode 100644
index 1d6a2182b..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e9ae3231ec188df801fe51aa95d6afec2e52db58 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 25 Jul 2017 16:14:19 -0700
-Subject: [PATCH] make: Do not build po files
-Target fails to build
-Upstream-Status: Inappropriate [Cross-compile specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Makefile.am b/Makefile.am
-index f01278c3..eb864c36 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- ## Cherokee: Makefile.am  -*- makefile -*-
- 
-SUBDIRS = po m4 www icons themes qa doc . admin contrib cherokee cget packages dbslayer
-+SUBDIRS = m4 www icons themes qa doc . admin contrib cherokee cget packages dbslayer
- SUFFIXES = .sample.pre .sample .h.pre .h .xml.pre .xml
- ACLOCAL_AMFLAGS = -I m4
- 
-- 
-2.13.3
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch
deleted file mode 100644
index 3336f7df7..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 98a0f19df0a31d5649ad89d395fd1b8de5591827 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Thu, 3 Apr 2014 21:33:25 +0800
-Subject: [PATCH] admin/Makefile.am: only install configured.py once
-Both the two rules install-adminpyDATA and install-generatedDATA will
-install the configured.py to the same location, they can run parallel,
-and they use "install -m", which would might build failures:
-/usr/bin/install: setting permissions for `/path/to/configured.py': No such file or directory
-This is because the first install is setting the permission while the
-second install is removing the file an re-install.
-Only install the configured.py once will fix the problem, I think that
-there is no side effect since it installed the same file to the same
-location twice in the past.
-Upstream-Status: Pending
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
- admin/Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/admin/Makefile.am b/admin/Makefile.am
-index ce5937b..6f96934 100644
--- a/admin/Makefile.am
-+++ b/admin/Makefile.am
-@@ -73,7 +73,6 @@ SystemStatsWidgets.py \
- Wizard.py \
- XMLServerDigest.py \
- config_version.py \
-configured.py \
- consts.py \
- util.py \
- popen.py \
-- 
-1.8.2.1
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
deleted file mode 100644
index 93603b84d..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/cherokee
-CONFIG=/etc/cherokee/cherokee.conf
-PIDFILE=/var/run/cherokee.pid
-NAME="cherokee"
-DESC="Cherokee http server"
-test -r /etc/default/cherokee && . /etc/default/cherokee
-test -x "$DAEMON" || exit 0
-test ! -r "$CONFIG" && exit 0
-        
-case "$1" in
-  start)
-    echo "Starting $DESC: "
-    start-stop-daemon --oknodo -S -x $DAEMON -- -d -C $CONFIG
-    ;;
-  stop)
-    echo "Stopping $DESC:"
-    start-stop-daemon -K -p $PIDFILE
-    ;;
-  restart)
-    $0 stop >/dev/null 2>&1
-    $0 start
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 0
-    ;;
-esac
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service
deleted file mode 100644
index a2d703185..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Cherokee web server
-After=syslog.target
-[Service]
-Type=forking
-ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
deleted file mode 100644
index 53d6a85ae..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-SUMMARY = "Cherokee Web Server fast and secure"
-SUMMARY:cget = "Small downloader based in the Cherokee client library"
-HOMEPAGE = "http://www.cherokee-project.com/"
-SECTION = "network"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-SRCREV = "9a75e65b876bcc376cb6b379dca1f7ce4a055c59"
-PV = "1.2.104+git"
-SRC_URI = "git://github.com/cherokee/webserver;branch=master;protocol=https \
-           file://cherokee.init \
-           file://cherokee.service \
-           file://cherokee-install-configured.py-once.patch \
-           file://0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch \
-           file://0001-make-Do-not-build-po-files.patch \
-           file://0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch \
-"
-S = "${WORKDIR}/git"
-inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
-PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav"
-PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
-PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-EXTRA_OECONF = "--disable-static \
-                --disable-nls \
-               ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
-               --with-wwwroot=${localstatedir}/www/cherokee \
-"
-do_install:append () {
-    install -m 0755 -d ${D}${sysconfdir}/init.d
-    install -m 755 ${UNPACKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee
-    # clean up .la files for plugins
-    rm -f ${D}${libdir}/cherokee/*.la
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${UNPACKDIR}/cherokee.service ${D}${systemd_unitdir}/system
-    rmdir "${D}${localstatedir}/run"
-    rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
-}
-# Put -dev near the front so we can move the .la files into it with a wildcard
-PACKAGES =+ "libcherokee-server libcherokee-client libcherokee-base cget"
-FILES:cget = "${bindir}/cget"
-FILES:libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}"
-FILES:libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}"
-FILES:libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}"
-# Pack the htdocs
-FILES:${PN} += "${localstatedir}/www/cherokee"
-CONFFILES:${PN} = " \
-                   ${sysconfdir}/cherokee/cherokee.conf \
-                   ${sysconfdir}/init.d/cherokee \
-"
-INITSCRIPT_NAME = "cherokee"
-INITSCRIPT_PARAMS = "defaults 91 91"
-RPROVIDES:${PN} += "${PN}-systemd"
-RREPLACES:${PN} += "${PN}-systemd"
-RCONFLICTS:${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE:${PN} = "cherokee.service"
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
-CVE_PRODUCT += "cherokee_web_server"
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch
deleted file mode 100644
index d8ad69cec..000000000
--- a/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1e8fbb6da4e5ee44fe24c078aae1930d759f0ba3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 17 Sep 2024 05:29:13 +0000
-Subject: [PATCH] cmake: Add check for 64bit builtin atomics
-Compilers for some architectures e.g. RISCV32 do not have 64bit atomics
-therefore, its important to deduce that and use it to pass right flags to
-compiler to use them, e.g. h2o module
-Fixes
-nection.c.o): in function `h2o_create_connection':
-| /usr/src/debug/netdata/1.47.1/src/web/server/h2o/libh2o/include/h2o.h:1917:(.text.create_conn+0x5e): undefined reference to `__sync_add_and_fetch_8'
-| collect2: error: ld returned 1 exit status
-Upstream-Status: Submitted [https://github.com/netdata/netdata/pull/18565]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- CMakeLists.txt | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-Index: netdata-v1.47.1/CMakeLists.txt
-===================================================================
--- netdata-v1.47.1.orig/CMakeLists.txt
-+++ netdata-v1.47.1/CMakeLists.txt
-@@ -448,6 +448,15 @@ int main() {
- }
- " HAVE_BUILTIN_ATOMICS)
- 
-+check_cxx_source_compiles("
-+#include <stdint.h>
-+int main(void) {
-+        uint64_t a;
-+        __sync_add_and_fetch(&a, 1);
-+        return 0;
-+}
-+" ARCH_SUPPORTS_64BIT_ATOMICS)
-+
- check_c_source_compiles("
- void my_printf(char const *s, ...) __attribute__((format(gnu_printf, 1, 2)));
- int main() { return 0; }
-@@ -523,6 +532,10 @@ if(OS_FREEBSD OR OS_MACOS)
-         set(HAVE_BUILTIN_ATOMICS True)
- endif()
- 
-+if (ENABLE_H2O AND NOT ARCH_SUPPORTS_64BIT_ATOMICS)
-+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DH2O_NO_64BIT_ATOMICS")
-+endif (NOT ARCH_SUPPORTS_64BIT_ATOMICS)
-+
- # openssl/crypto
- set(ENABLE_OPENSSL True)
- pkg_check_modules(TLS IMPORTED_TARGET openssl)
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0002-Do-not-hardcode-systemd-unit-directories.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0002-Do-not-hardcode-systemd-unit-directories.patch
new file mode 100644
index 000000000..143caf89c
--- /dev/null
+++ b/meta-webserver/recipes-webadmin/netdata/netdata/0002-Do-not-hardcode-systemd-unit-directories.patch
@@ -0,0 +1,38 @@
+From 67b9343e986ac6c9e3482bec938aa31deaab3ce7 Mon Sep 17 00:00:00 2001
+From: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelinux.com>
+Date: Tue, 1 Oct 2024 17:01:33 +0200
+Subject: [PATCH] Do not hardcode systemd unit directories
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelinux.com>
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Index: netdata-v1.47.3/CMakeLists.txt
+===================================================================
+--- netdata-v1.47.3.orig/CMakeLists.txt
+++ netdata-v1.47.3/CMakeLists.txt
+@@ -2531,7 +2531,7 @@ if(BUILD_FOR_PACKAGING)
+         install(FILES
+                 ${CMAKE_BINARY_DIR}/system/systemd/netdata.service
+                 COMPONENT netdata
+-                DESTINATION lib/systemd/system)
+                DESTINATION $ENV{systemd_system_unitdir})
+         install(DIRECTORY
+                 COMPONENT netdata
+                 DESTINATION usr/lib/systemd/journald@netdata.conf.d)
+@@ -2620,11 +2620,11 @@ if(NOT OS_WINDOWS)
+     install(FILES
+             ${CMAKE_BINARY_DIR}/system/systemd/netdata-updater.service
+             COMPONENT netdata
+-            DESTINATION lib/systemd/system)
+            DESTINATION $ENV{systemd_system_unitdir})
+     install(FILES
+             system/systemd/netdata-updater.timer
+             COMPONENT netdata
+-            DESTINATION lib/systemd/system)
+            DESTINATION $ENV{systemd_system_unitdir})
+   endif()
+ endif()
+ 
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/go.d.conf b/meta-webserver/recipes-webadmin/netdata/netdata/go.d.conf
new file mode 100644
index 000000000..e0b3a0b18
--- /dev/null
+++ b/meta-webserver/recipes-webadmin/netdata/netdata/go.d.conf
@@ -0,0 +1,2 @@
+modules:
+    logind: yes
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf b/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf
index a2b3999c6..7eb6cb9d9 100644
--- a/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf
+++ b/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf
@@ -1,5083 +1,692 @@
-# NetData Configuration
+# netdata configuration
+#
+# You can download the latest version of this file, using:
+#
+#  wget -O /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
+# or
+#  curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
+#
 # You can uncomment and change any of the options below.
 # The value shown in the commented settings, is the default value.
+#
 # global netdata configuration
 [global]
-       debug flags = 0x10000000
+        hostname = netdata
-       hostname = netdata
+        # run as user = netdata
-       history = 86400
+        # glibc malloc arena max for plugins = 1
-       config directory = @@sysconfdir/netdata
+        # glibc malloc arena max for netdata = 1
-       plugins directory = @@libdir/netdata/plugins.d
+        # cpu cores = 4
-       web files directory = @@datadir/netdata/web
+        # libuv worker threads = 24
-       cache directory = /var/cache/netdata
+        # host access prefix =
-       log directory = /var/log/netdata
+        # enable metric correlations = yes
-       # host access prefix =
+        # metric correlations method = ks2
-       # memory deduplication (ksm) = yes
+        # timezone = UTC
-       # debug log = /var/log/netdata/debug.log
+        # OOM score = 0
-       # error log = /var/log/netdata/error.log
+        # process scheduling policy = batch
-       # access log = /var/log/netdata/access.log
+        # process nice level = 19
-       # memory mode = save
+        # pthread stack size = 8388608
-       # update every = 1
+        # is ephemeral node = no
-       # pthread stack size = 8388608
+        # has unstable connection = no
-       # run as user = netdata
-       # web files owner = netdata
+[db]
-       # http port listen backlog = 100
-       # port = 19999
+        # option 'retention' is not used.
-       # ip version = any
+        retention = 86400
-       # disconnect idle web clients after seconds = 60
+        # update every = 1
-       # enable web responses gzip compression = yes
+        # mode = dbengine
+        # dbengine page type = gorilla
+        # dbengine page cache size MB = 32
+        # dbengine extent cache size MB = 0
+        # dbengine enable journal integrity check = no
+        # memory deduplication (ksm) = yes
+        # cleanup obsolete charts after secs = 3600
+        # cleanup ephemeral hosts after secs = 86400
+        # gap when lost iterations above = 1
+        # enable replication = yes
+        # seconds to replicate = 86400
+        # seconds per replication step = 600
+        # cleanup orphan hosts after secs = 3600
+        # dbengine use direct io = yes
+        # dbengine pages per extent = 64
+        # storage tiers = 3
+        # dbengine tier backfill = new
+        # dbengine tier 1 update every iterations = 60
+        # dbengine tier 2 update every iterations = 60
+        # dbengine tier 0 disk space MB = 1024
+        # dbengine tier 0 retention days = 14
+        # dbengine tier 1 disk space MB = 1024
+        # dbengine tier 1 retention days = 90
+        # dbengine tier 2 disk space MB = 1024
+        # dbengine tier 2 retention days = 730
+        # replication threads = 1
+[directories]
+        plugins = @@libexecdir/netdata/plugins.d
+        cache = @@localstatedir/cache/netdata
+        web = @@datadir/netdata/web
+        log = @@localstatedir/log/netdata
+        config = @@sysconfdir/netdata
+        stock config = @@libdir/netdata/conf.d
+        lib = @@localstatedir/lib/netdata
+        lock = @@localstatedir/lib/netdata/lock
+        home = @@localstatedir/run/netdata
+        registry = @@localstatedir/lib/netdata/registry
+        stock health config = @@libdir/netdata/conf.d/health.d
+        health config = @@sysconfdir/netdata/health.d
+[logs]
+        # debug flags = 0x0000000000000000
+        # facility = daemon
+        # logs flood protection period = 60
+        # logs to trigger flood protection = 1000
+        # level = info
+        debug = @@localstatedir/log/netdata/debug.log
+        # daemon = journal
+        # collector = journal
+        access = @@localstatedir/log/netdata/access.log
+        # health = journal
+[environment variables]
+        # PATH = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+        # PYTHONPATH =
+        TZ = :@@sysconfdir/localtime
+[host labels]
+        # name = value
+[ml]
+        # enabled = yes
+        # maximum num samples to train = 21600
+        # minimum num samples to train = 900
+        # train every = 10800
+        # number of models per dimension = 18
+        # delete models older than = 604800
+        # num samples to diff = 1
+        # num samples to smooth = 3
+        # num samples to lag = 5
+        # random sampling ratio = 0.20000
+        # maximum number of k-means iterations = 1000
+        # dimension anomaly score threshold = 0.99000
+        # host anomaly rate threshold = 1.00000
+        # anomaly detection grouping method = average
+        # anomaly detection grouping duration = 300
+        # num training threads = 4
+        # flush models batch size = 128
+        # dimension anomaly rate suppression window = 900
+        # dimension anomaly rate suppression threshold = 450
+        # enable statistics charts = no
+        # hosts to skip from training = !*
+        # charts to skip from training = netdata.*
+        # stream anomaly detection charts = yes
+[health]
+        silencers file = @@localstatedir/lib/netdata/health.silencers.json
+        # enabled = yes
+        # enable stock health configuration = yes
+        # use summary for notifications = yes
+        # default repeat warning = never
+        # default repeat critical = never
+        # in memory max health log entries = 1000
+        # health log history = 432000
+        script to execute on alarm = @@libexecdir/netdata/plugins.d/alarm-notify.sh
+        # enabled alarms = *
+        # run at least every seconds = 10
+        # postpone alarms during hibernation for seconds = 60
+[web]
+        ssl key = @@sysconfdir/netdata/ssl/key.pem
+        ssl certificate = @@sysconfdir/netdata/ssl/cert.pem
+        # tls version = 1.3
+        # tls ciphers = none
+        # ses max tg_des_window = 15
+        # des max tg_des_window = 15
+        # mode = static-threaded
+        # listen backlog = 4096
+        # default port = 19999
+        # bind to = *
+        # disconnect idle clients after seconds = 60
+        # timeout for first request = 60
+        # accept a streaming request every seconds = 0
+        # respect do not track policy = no
+        # x-frame-options response header =
+        # allow connections from = localhost *
+        # allow connections by dns = heuristic
+        # allow dashboard from = localhost *
+        # allow dashboard by dns = heuristic
+        # allow badges from = *
+        # allow badges by dns = heuristic
+        # allow streaming from = *
+        # allow streaming by dns = heuristic
+        # allow netdata.conf from = localhost fd* 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.* UNKNOWN
+        # allow netdata.conf by dns = no
+        # allow management from = localhost
+        # allow management by dns = heuristic
+        # enable gzip compression = yes
+        # gzip compression strategy = default
+        # gzip compression level = 3
+        # ssl skip certificate verification = no
+        # web server threads = 4
+        # web server max sockets = 131072
+[httpd]
+        # enabled = no
+[registry]
+        # enabled = no
+        netdata unique id file = @@localstatedir/lib/netdata/registry/netdata.public.unique.id
+        registry db file = @@localstatedir/lib/netdata/registry/registry.db
+        registry log file = @@localstatedir/lib/netdata/registry/registry-log.db
+        # registry save db every new entries = 1000000
+        # registry expire idle persons days = 365
+        # registry domain =
+        # registry to announce = https://registry.my-netdata.io
+        # registry hostname = netdata
+        # verify browser cookies support = yes
+        # enable cookies SameSite and Secure = yes
+        # max URL length = 1024
+        # max URL name length = 50
+        # use mmap = no
+        netdata management api key file = @@localstatedir/lib/netdata/netdata.api.key
+        # allow from = *
+        # allow by dns = heuristic
+[global statistics]
+        # update every = 1
 [plugins]
-       # tc = yes
+        # netdata monitoring extended = no
-       tc = no
+        # idlejitter = yes
-       # idlejitter = yes
+        # netdata monitoring = yes
-       proc = yes
+        # profile = no
-       checks = no
+        # tc = yes
-       plugins directory = @@libdir/netdata/plugins.d
+        # diskspace = yes
-       nable running new plugins = yes
+        # proc = yes
-       check for new plugins every = 60
+        # cgroups = yes
-       charts.d = yes
+        # timex = yes
-       sma_webbox = no
+        # enable running new plugins = yes
-       apps = yes
+        # check for new plugins every = 60
-       node.d = yes
+        # slabinfo = no
+        # statsd = yes
+        # network-viewer = yes
-# per plugin configuration
+        # perf = yes
+        # apps = yes
+        # freeipmi = yes
+        # debugfs = yes
+        # go.d = yes
+        # python.d = yes
+        # systemd-journal = yes
+        # ioping = yes
+        # charts.d = yes
+[statsd]
+        # update every (flushInterval) = 1
+        # udp messages to process at once = 10
+        # create private charts for metrics matching = *
+        # max private charts hard limit = 1000
+        # set charts as obsolete after secs = 0
+        # decimal detail = 1000
+        # disconnect idle tcp clients after seconds = 600
+        # private charts hidden = no
+        # histograms and timers percentile (percentThreshold) = 95.00000
+        # dictionaries max unique dimensions = 200
+        # add dimension for number of events received = no
+        # gaps on gauges (deleteGauges) = no
+        # gaps on counters (deleteCounters) = no
+        # gaps on meters (deleteMeters) = no
+        # gaps on sets (deleteSets) = no
+        # gaps on histograms (deleteHistograms) = no
+        # gaps on timers (deleteTimers) = no
+        # gaps on dictionaries (deleteDictionaries) = no
+        # statsd server max TCP sockets = 131072
+        # listen backlog = 4096
+        # default port = 8125
+        # bind to = udp:localhost tcp:localhost
 [plugin:proc:/proc/net/dev]
-       # filename to monitor = /proc/net/dev
+        # compressed packets for all interfaces = no
-       # enable new interfaces detected at runtime = on demand
+        # disable by default interfaces matching = lo fireqos* *-ifb fwpr* fwbr* fwln*
-       # enable ifb interfaces = no
-       # bandwidth for all interfaces = on demand
-       # packets for all interfaces = on demand
-       # errors for all interfaces = on demand
-       # drops for all interfaces = on demand
-       # fifo for all interfaces = on demand
-       # compressed packets for all interfaces = on demand
-       # frames, collisions, carrier counters for all interfaces = on demand
 [plugin:proc]
-       # /proc/net/dev = yes
+        # /proc/net/dev = yes
-       # /proc/diskstats = yes
+        # /proc/pagetypeinfo = no
-       # /proc/net/snmp = yes
+        # /proc/spl/kstat/zfs/pool/state = no
-       # /proc/net/snmp6 = yes
+        # /proc/stat = yes
-       # /proc/net/netstat = yes
+        # /proc/uptime = yes
-       # /proc/net/stat/conntrack = yes
+        # /proc/loadavg = yes
-       # /proc/net/ip_vs/stats = yes
+        # /proc/sys/fs/file-nr = yes
-       # /proc/stat = yes
+        # /proc/sys/kernel/random/entropy_avail = yes
-       # /proc/meminfo = yes
+        # /proc/pressure = yes
-       # /proc/vmstat = yes
+        # /proc/interrupts = yes
-       # /proc/net/rpc/nfsd = yes
+        # /proc/softirqs = yes
-       # /proc/sys/kernel/random/entropy_avail = yes
+        # /proc/vmstat = yes
-       # /proc/interrupts = yes
+        # /proc/meminfo = yes
-       # /proc/softirqs = yes
+        # /sys/kernel/mm/ksm = yes
-       # /proc/loadavg = yes
+        # /sys/block/zram = yes
-       # /sys/kernel/mm/ksm = yes
+        # /sys/devices/system/edac/mc = yes
-       # netdata server resources = yes
+        # /sys/devices/pci/aer = yes
+        # /sys/devices/system/node = yes
-[plugin:tc]
+        # /proc/net/wireless = yes
-       # script to run to get tc values = /usr/lib/netdata/netdata/plugins.d/tc-qos-helper.sh
+        # /proc/net/sockstat = yes
-       # enable new interfaces detected at runtime = yes
+        # /proc/net/sockstat6 = yes
-       # qos for eth1-ifb = yes
+        # /proc/net/netstat = yes
-       # cleanup unused classes every = 60
+        # /proc/net/sctp/snmp = yes
-       # qos for eth0 = yes
+        # /proc/net/softnet_stat = yes
-       # qos for eth1 = yes
+        # /proc/net/ip_vs/stats = yes
-       # qos for eth0-ifb = yes
+        # /sys/class/infiniband = yes
+        # /proc/net/stat/conntrack = yes
+        # /proc/net/stat/synproxy = yes
+        # /proc/diskstats = yes
+        # /proc/mdstat = yes
+        # /proc/net/rpc/nfsd = yes
+        # /proc/net/rpc/nfs = yes
+        # /proc/spl/kstat/zfs/arcstats = yes
+        # /sys/fs/btrfs = yes
+        # ipc = yes
+        # /sys/class/power_supply = yes
+        # /sys/class/drm = yes
 [plugin:charts.d]
-       # update every = 1
+        # update every = 1
-       # command options =
+        # command options =
 [plugin:apps]
-       # update every = 1
+        # update every = 1
-       # command options =
+        # command options =
 [plugin:idlejitter]
-       # loop time in ms = 20
+        # loop time in ms = 20
 [plugin:proc:/proc/interrupts]
-       # interrupts per core = yes
+        # interrupts per core = no
-       # filename to monitor = /proc/interrupts
+        # filename to monitor = /proc/interrupts
 [plugin:proc:/proc/sys/kernel/random/entropy_avail]
-       # filename to monitor = /proc/sys/kernel/random/entropy_avail
+        # filename to monitor = /proc/sys/kernel/random/entropy_avail
 [plugin:proc:/proc/diskstats]
-       # enable new disks detected at runtime = on demand
+        # enable new disks detected at runtime = yes
-       # bandwidth for all disks = on demand
+        # performance metrics for physical disks = auto
-       # operations for all disks = on demand
+        # performance metrics for virtual disks = auto
-       # merged operations for all disks = on demand
+        # performance metrics for partitions = no
-       # i/o time for all disks = on demand
+        # bandwidth for all disks = auto
-       # queued operations for all disks = on demand
+        # operations for all disks = auto
-       # utilization percentage for all disks = on demand
+        # merged operations for all disks = auto
-       # backlog for all disks = on demand
+        # i/o time for all disks = auto
-       # filename to monitor = /proc/diskstats
+        # queued operations for all disks = auto
-       # path to get h/w sector size = /sys/block/%s/queue/hw_sector_size
+        # utilization percentage for all disks = auto
+        # extended operations for all disks = auto
+        # backlog for all disks = auto
+        # bcache for all disks = auto
+        # bcache priority stats update every = 0
+        # remove charts of removed disks = yes
+        # path to get block device = /sys/block/%s
+        # path to get block device bcache = /sys/block/%s/bcache
+        # path to get virtual block device = /sys/devices/virtual/block/%s
+        # path to get block device infos = /sys/dev/block/%lu:%lu/%s
+        # path to device mapper = /dev/mapper
+        # path to /dev/disk = /dev/disk
+        # path to /sys/block = /sys/block
+        # path to /dev/disk/by-label = /dev/disk/by-label
+        # path to /dev/disk/by-id = /dev/disk/by-id
+        # path to /dev/vx/dsk = /dev/vx/dsk
+        # name disks by id = no
+        # preferred disk ids = *
+        # exclude disks = loop* ram*
+        # filename to monitor = /proc/diskstats
+        # performance metrics for disks with major 253 = yes
+        # performance metrics for disks with major 11 = yes
 [plugin:proc:/proc/net/snmp]
-       # ipv4 packets = yes
+        # ipv4 packets = auto
-       # ipv4 fragments sent = yes
+        # ipv4 fragments sent = auto
-       # ipv4 fragments assembly = yes
+        # ipv4 fragments assembly = auto
-       # ipv4 errors = yes
+        # ipv4 errors = auto
-       # ipv4 TCP connections = yes
+        # ipv4 TCP connections = auto
-       # ipv4 TCP packets = yes
+        # ipv4 TCP packets = auto
-       # ipv4 TCP errors = yes
+        # ipv4 TCP errors = auto
-       # ipv4 TCP handshake issues = yes
+        # ipv4 TCP opens = auto
-       # ipv4 UDP packets = yes
+        # ipv4 TCP handshake issues = auto
-       # ipv4 UDP errors = yes
+        # ipv4 UDP packets = auto
-       # filename to monitor = /proc/net/snmp
+        # ipv4 UDP errors = auto
+        # ipv4 ICMP packets = auto
+        # ipv4 ICMP messages = auto
+        # ipv4 UDPLite packets = auto
+        # filename to monitor = /proc/net/snmp
 [plugin:proc:/proc/net/netstat]
-       # bandwidth = on demand
+        # bandwidth = auto
-       # input errors = on demand
+        # input errors = auto
-       # multicast bandwidth = on demand
+        # multicast bandwidth = auto
-       # broadcast bandwidth = on demand
+        # broadcast bandwidth = auto
-       # multicast packets = on demand
+        # multicast packets = auto
-       # broadcast packets = on demand
+        # broadcast packets = auto
-       # filename to monitor = /proc/net/netstat
+        # ECN packets = auto
+        # TCP reorders = auto
+        # TCP SYN cookies = auto
+        # TCP out-of-order queue = auto
+        # TCP connection aborts = auto
+        # TCP memory pressures = auto
+        # TCP SYN queue = auto
+        # TCP accept queue = auto
+        # filename to monitor = /proc/net/netstat
 [plugin:proc:/proc/net/stat/nf_conntrack]
-       # netfilter connections = yes
+        # filename to monitor = /proc/net/stat/nf_conntrack
-       # netfilter new connections = yes
+        # netfilter new connections = no
-       # netfilter connection changes = yes
+        # netfilter connection changes = no
-       # netfilter connection expectations = yes
+        # netfilter connection expectations = no
-       # netfilter connection searches = yes
+        # netfilter connection searches = no
-       # netfilter errors = yes
+        # netfilter errors = no
-       # filename to monitor = /proc/net/stat/nf_conntrack
+        # netfilter connections = no
 [plugin:proc:/proc/net/ip_vs_stats]
-       # IPVS bandwidth = yes
+        # IPVS bandwidth = yes
-       # IPVS connections = yes
+        # IPVS connections = yes
-       # IPVS packets = yes
+        # IPVS packets = yes
-       # filename to monitor = /proc/net/ip_vs_stats
+        # filename to monitor = /proc/net/ip_vs_stats
 [plugin:proc:/proc/stat]
-       # cpu utilization = yes
+        # cpu utilization = yes
-       # per cpu core utilization = yes
+        # per cpu core utilization = no
-       # cpu interrupts = yes
+        # cpu interrupts = yes
-       # context switches = yes
+        # context switches = yes
-       # processes started = yes
+        # processes started = yes
-       # processes running = yes
+        # processes running = yes
-       # filename to monitor = /proc/stat
+        # keep per core files open = yes
+        # keep cpuidle files open = yes
+        # core_throttle_count = auto
+        # package_throttle_count = no
+        # cpu frequency = yes
+        # cpu idle states = no
+        # core_throttle_count filename to monitor = /sys/devices/system/cpu/%s/thermal_throttle/core_throttle_count
+        # package_throttle_count filename to monitor = /sys/devices/system/cpu/%s/thermal_throttle/package_throttle_count
+        # scaling_cur_freq filename to monitor = /sys/devices/system/cpu/%s/cpufreq/scaling_cur_freq
+        # time_in_state filename to monitor = /sys/devices/system/cpu/%s/cpufreq/stats/time_in_state
+        # schedstat filename to monitor = /proc/schedstat
+        # cpuidle name filename to monitor = /sys/devices/system/cpu/cpu%zu/cpuidle/state%zu/name
+        # cpuidle time filename to monitor = /sys/devices/system/cpu/cpu%zu/cpuidle/state%zu/time
+        # filename to monitor = /proc/stat
 [plugin:proc:/proc/meminfo]
-       # system ram = yes
+        # system ram = yes
-       # system swap = yes
+        # system swap = auto
-       # hardware corrupted ECC = on demand
+        # hardware corrupted ECC = auto
-       # committed memory = yes
+        # committed memory = yes
-       # writeback memory = yes
+        # writeback memory = yes
-       # kernel memory = yes
+        # kernel memory = yes
-       # slab memory = yes
+        # slab memory = yes
-       # filename to monitor = /proc/meminfo
+        # hugepages = auto
+        # transparent hugepages = auto
+        # memory reclaiming = yes
+        # high low memory = yes
+        # cma memory = auto
+        # direct maps = yes
+        # filename to monitor = /proc/meminfo
 [plugin:proc:/proc/vmstat]
-       # swap i/o = yes
+        # filename to monitor = /proc/vmstat
-       # disk i/o = yes
+        # swap i/o = auto
-       # memory page faults = yes
+        # disk i/o = yes
-       # filename to monitor = /proc/vmstat
+        # memory page faults = yes
+        # out of memory kills = yes
+        # system-wide numa metric summary = auto
+        # transparent huge pages = auto
+        # zswap i/o = auto
+        # memory ballooning = auto
+        # kernel same memory = auto
 [plugin:proc:/proc/net/rpc/nfsd]
-       # filename to monitor = /proc/net/rpc/nfsd
+        # filename to monitor = /proc/net/rpc/nfsd
-       # read cache = yes
-       # file handles = yes
-       # I/O = yes
-       # threads = yes
-       # read ahead = yes
-       # network = yes
-       # rpc = yes
-       # NFS v2 procedures = yes
-       # NFS v3 procedures = yes
-       # NFS v4 procedures = yes
-       # NFS v4 operations = yes
-[plugin:proc:/proc/net/dev:lo]
-       # enabled = no
-[plugin:proc:/proc/net/dev:fireqos_monitor]
-       # enabled = no
-[plugin:sma_webbox]
-       # update every = 1
-       # command options =
-[plugin:node.d]
-       # update every = 1
-       # command options =
 [plugin:proc:/sys/kernel/mm/ksm]
-       # /sys/kernel/mm/ksm/pages_shared = /sys/kernel/mm/ksm/pages_shared
+        # /sys/kernel/mm/ksm/pages_shared = /sys/kernel/mm/ksm/pages_shared
-       # /sys/kernel/mm/ksm/pages_sharing = /sys/kernel/mm/ksm/pages_sharing
+        # /sys/kernel/mm/ksm/pages_sharing = /sys/kernel/mm/ksm/pages_sharing
-       # /sys/kernel/mm/ksm/pages_unshared = /sys/kernel/mm/ksm/pages_unshared
+        # /sys/kernel/mm/ksm/pages_unshared = /sys/kernel/mm/ksm/pages_unshared
-       # /sys/kernel/mm/ksm/pages_volatile = /sys/kernel/mm/ksm/pages_volatile
+        # /sys/kernel/mm/ksm/pages_volatile = /sys/kernel/mm/ksm/pages_volatile
-       # /sys/kernel/mm/ksm/pages_to_scan = /sys/kernel/mm/ksm/pages_to_scan
 [plugin:proc:/proc/loadavg]
-       # filename to monitor = /proc/loadavg
+        # filename to monitor = /proc/loadavg
-       # enable load average = yes
+        # enable load average = yes
-       # enable total processes = yes
+        # enable total processes = yes
 [plugin:proc:/proc/softirqs]
-       # interrupts per core = yes
+        # interrupts per core = no
-       # filename to monitor = /proc/softirqs
+        # filename to monitor = /proc/softirqs
-[plugin:proc:/proc/net/dev:eth1-ifb]
-       # enabled = no
-[plugin:proc:/proc/net/dev:eth0]
-       # enabled = on demand
-       # bandwidth = on demand
-       # packets = on demand
-       # errors = on demand
-       # drops = on demand
-       # fifo = on demand
-       # compressed = on demand
-       # events = on demand
-[plugin:proc:/proc/net/dev:eth1]
-       # enabled = on demand
-       # bandwidth = on demand
-       # packets = on demand
-       # errors = on demand
-       # drops = on demand
-       # fifo = on demand
-       # compressed = on demand
-       # events = on demand
-[plugin:proc:/proc/net/dev:eth0-ifb]
-       # enabled = no
-[plugin:proc:/proc/diskstats:fd0]
-       # enabled = no
+# section 'plugin:proc:/proc/diskstats:sda' is not used.
 [plugin:proc:/proc/diskstats:sda]
-       # enabled = on demand
+        queued operations = yes
-       # bandwidth = on demand
-       # operations = on demand
-       # merged operations = on demand
-       # i/o time = on demand
-       queued operations = yes
-       # utilization percentage = on demand
-       # backlog = on demand
-[plugin:proc:/proc/diskstats:sda1]
-       # enabled = no
-[plugin:proc:/proc/diskstats:sda2]
-       # enabled = no
-[plugin:proc:/proc/diskstats:sda5]
-       # enabled = no
-[plugin:proc:/proc/diskstats:sr0]
-       # enabled = no
 [plugin:proc:/proc/net/snmp6]
-       # ipv6 packets = on demand
+        # ipv6 packets = auto
-       # ipv6 fragments sent = on demand
+        # ipv6 fragments sent = auto
-       # ipv6 fragments assembly = on demand
+        # ipv6 fragments assembly = auto
-       # ipv6 errors = on demand
+        # ipv6 errors = auto
-       # ipv6 UDP packets = on demand
+        # ipv6 UDP packets = auto
-       # ipv6 UDP errors = on demand
+        # ipv6 UDP errors = auto
-       # ipv6 UDPlite packets = on demand
+        # ipv6 UDPlite packets = auto
-       # ipv6 UDPlite errors = on demand
+        # ipv6 UDPlite errors = auto
-       # bandwidth = on demand
+        # bandwidth = auto
-       # multicast bandwidth = on demand
+        # multicast bandwidth = auto
-       # broadcast bandwidth = on demand
+        # broadcast bandwidth = auto
-       # multicast packets = on demand
+        # multicast packets = auto
-       # icmp = on demand
+        # icmp = auto
-       # icmp redirects = on demand
+        # icmp redirects = auto
-       # icmp errors = on demand
+        # icmp errors = auto
-       # icmp echos = on demand
+        # icmp echos = auto
-       # icmp group membership = on demand
+        # icmp group membership = auto
-       # icmp router = on demand
+        # icmp router = auto
-       # icmp neighbor = on demand
+        # icmp neighbor = auto
-       # icmp mldv2 = on demand
+        # icmp mldv2 = auto
-       # icmp types = on demand
+        # icmp types = auto
-       # ect = on demand
+        # ect = auto
-       # filename to monitor = /proc/net/snmp6
+        # filename to monitor = /proc/net/snmp6
+[plugin:freeipmi]
-# per chart configuration
+        # update every = 1
+        # command options =
-[system.idlejitter]
-       # history = 86400
+[plugin:network-viewer]
-       # enabled = yes
+        # update every = 1
-       enabled = no
+        # command options =
-       # cache directory = /var/cache/netdata/system.idlejitter
-       # chart type = line
+[plugin:systemd-journal]
-       # type = system
+        # update every = 1
-       # family = processes
+        # command options =
-       # context = system.idlejitter
-       # units = microseconds lost/s
+[plugin:cgroups]
-       # priority = 9999
+        # update every = 1
-       # gap when lost iterations above = 1
+        # check for new cgroups every = 10
-       # name = system.idlejitter
+        # use unified cgroups = auto
-       # title = CPU Idle Jitter (system.idlejitter)
+        # max cgroups to allow = 1000
-       # dim jitter name = jitter
+        # max cgroups depth to monitor = 0
-       # dim jitter algorithm = absolute
+        # enable by default cgroups matching =  !*/init.scope  !/system.slice/run-*.scope  *user.slice/docker-* !*user.slice* *.scope  /machine.slice/*.service  */kubepods/pod*/*  */kubepods/*/pod*/*  */*-kubepods-pod*/*  */*-kubepods-*-pod*/*  !*kubepods* !*kubelet*  !*/vcpu*  !*/emulator  !*.mount  !*.partition  !*.service  !*.service/udev  !*.socket  !*.slice  !*.swap  !*.user  !/  !/docker  !*/libvirt  !/lxc  !/lxc/*/*  !/lxc.monitor*  !/lxc.pivot  !/lxc.payload  !*lxcfs.service/.control !/machine  !/qemu  !/system  !/systemd  !/user  *
-       # dim jitter multiplier = 1
+        # enable by default cgroups names matching =  *
-       # dim jitter divisor = 1
+        # search for cgroups in subpaths matching =  !*/init.scope  !*-qemu  !*.libvirt-qemu  !/init.scope  !/system  !/systemd  !/user  !/lxc/*/*  !/lxc.monitor  !/lxc.payload/*/*  !/lxc.payload.*  *
+        script to get cgroup names = @@libexecdir/netdata/plugins.d/cgroup-name.sh
-[system.interrupts]
+        script to get cgroup network interfaces = @@libexecdir/netdata/plugins.d/cgroup-network
-       # history = 86400
+        # run script to rename cgroups matching =  !/  !*.mount  !*.socket  !*.partition  /machine.slice/*.service  !*.service  !*.slice  !*.swap  !*.user  !init.scope  !*.scope/vcpu*  !*.scope/emulator  *.scope  *docker*  *lxc*  *qemu*  */kubepods/pod*/*  */kubepods/*/pod*/*  */*-kubepods-pod*/*  */*-kubepods-*-pod*/*  !*kubepods* !*kubelet*  *.libvirt-qemu  *
-       # enabled = yes
+        # cgroups to match as systemd services =  !/system.slice/*/*.service  /system.slice/*.service
-       enabled = yes
-       # cache directory = /var/cache/netdata/system.interrupts
+[plugin:timex]
-       # chart type = stacked
+        # update every = 10
-       # type = system
+        # clock synchronization state = yes
-       # family = interrupts
+        # time offset = yes
-       # context = system.interrupts
-       # units = interrupts/s
+[plugin:go.d]
-       # priority = 1000
+        # update every = 1
-       # gap when lost iterations above = 1
+        # command options =
-       # name = system.interrupts
-       # title = System interrupts (system.interrupts)
+[plugin:perf]
-       # dim 0 name = timer_0
+        # update every = 1
-       # dim 0 algorithm = incremental
+        # command options =
-       # dim 0 multiplier = 1
-       # dim 0 divisor = 1
+[plugin:proc:diskspace]
-       # dim 1 name = i8042_1
+        # remove charts of unmounted disks = yes
-       # dim 1 algorithm = incremental
+        # update every = 1
-       # dim 1 multiplier = 1
+        # check for new mount points every = 15
-       # dim 1 divisor = 1
+        exclude space metrics on paths = /dev /dev/shm /proc/* /sys/* @@localstatedir/run/user/* /run/lock /run/user/* /snap/* @@localstatedir/lib/docker/* @@localstatedir/lib/containers/storage/* /run/credentials/* /run/containerd/*  /rpool /rpool/*
-       # dim 6 name = floppy_6
+        # exclude space metrics on filesystems = *gvfs *gluster* *s3fs *ipfs *davfs2 *httpfs *sshfs *gdfs *moosefs fusectl autofs cgroup cgroup2 hugetlbfs devtmpfs fuse.lxcfs
-       # dim 6 algorithm = incremental
+        # exclude inode metrics on filesystems = msdosfs msdos vfat overlayfs aufs* *unionfs
-       # dim 6 multiplier = 1
+        # space usage for all disks = auto
-       # dim 6 divisor = 1
+        # inodes usage for all disks = auto
-       # dim 8 name = rtc0_8
-       # dim 8 algorithm = incremental
+[plugin:debugfs]
-       # dim 8 multiplier = 1
+        # update every = 1
-       # dim 8 divisor = 1
+        # command options =
-       # dim 9 name = acpi_9
-       # dim 9 algorithm = incremental
+[plugin:python.d]
-       # dim 9 multiplier = 1
+        # update every = 1
-       # dim 9 divisor = 1
+        # command options =
-       # dim 12 name = i8042_12
-       # dim 12 algorithm = incremental
+[plugin:ioping]
-       # dim 12 multiplier = 1
+        # update every = 1
-       # dim 12 divisor = 1
+        # command options =
-       # dim 14 name = ata_piix_14
-       # dim 14 algorithm = incremental
+[plugin:proc:/proc/uptime]
-       # dim 14 multiplier = 1
+        # filename to monitor = /proc/uptime
-       # dim 14 divisor = 1
-       # dim 15 name = ata_piix_15
+[plugin:proc:/proc/sys/fs/file-nr]
-       # dim 15 algorithm = incremental
+        # filename to monitor = /proc/sys/fs/file-nr
-       # dim 15 multiplier = 1
-       # dim 15 divisor = 1
+[plugin:proc:/proc/pressure]
-       # dim NMI name = NMI
+        # base path of pressure metrics = /proc/pressure
-       # dim NMI algorithm = incremental
+        # enable cpu some pressure = yes
-       # dim NMI multiplier = 1
+        # enable cpu full pressure = no
-       # dim NMI divisor = 1
+        # enable memory some pressure = yes
-       # dim LOC name = LOC
+        # enable memory full pressure = yes
-       # dim LOC algorithm = incremental
+        # enable io some pressure = yes
-       # dim LOC multiplier = 1
+        # enable io full pressure = yes
-       # dim LOC divisor = 1
+        # enable irq some pressure = no
-       # dim SPU name = SPU
+        # enable irq full pressure = yes
-       # dim SPU algorithm = incremental
-       # dim SPU multiplier = 1
+[plugin:proc:/sys/devices/system/node]
-       # dim SPU divisor = 1
+        # directory to monitor = /sys/devices/system/node
-       # dim PMI name = PMI
-       # dim PMI algorithm = incremental
+[plugin:proc:/sys/devices/system/edac/mc]
-       # dim PMI multiplier = 1
+        # directory to monitor = /sys/devices/system/edac/mc
-       # dim PMI divisor = 1
-       # dim IWI name = IWI
+[plugin:proc:/sys/class/pci/aer]
-       # dim IWI algorithm = incremental
+        # enable root ports = no
-       # dim IWI multiplier = 1
+        # enable pci slots = no
-       # dim IWI divisor = 1
-       # dim RTR name = RTR
+[plugin:proc:/proc/net/wireless]
-       # dim RTR algorithm = incremental
+        # filename to monitor = /proc/net/wireless
-       # dim RTR multiplier = 1
+        # status for all interfaces = auto
-       # dim RTR divisor = 1
+        # quality for all interfaces = auto
-       # dim RES name = RES
+        # discarded packets for all interfaces = auto
-       # dim RES algorithm = incremental
+        # missed beacon for all interface = auto
-       # dim RES multiplier = 1
-       # dim RES divisor = 1
+[plugin:proc:/proc/net/sockstat]
-       # dim CAL name = CAL
+        # ipv4 sockets = auto
-       # dim CAL algorithm = incremental
+        # ipv4 TCP sockets = auto
-       # dim CAL multiplier = 1
+        # ipv4 TCP memory = auto
-       # dim CAL divisor = 1
+        # ipv4 UDP sockets = auto
-       # dim TLB name = TLB
+        # ipv4 UDP memory = auto
-       # dim TLB algorithm = incremental
+        # ipv4 UDPLITE sockets = auto
-       # dim TLB multiplier = 1
+        # ipv4 RAW sockets = auto
-       # dim TLB divisor = 1
+        # ipv4 FRAG sockets = auto
-       # dim TRM name = TRM
+        # ipv4 FRAG memory = auto
-       # dim TRM algorithm = incremental
+        # update constants every = 60
-       # dim TRM multiplier = 1
+        # filename to monitor = /proc/net/sockstat
-       # dim TRM divisor = 1
-       # dim THR name = THR
+[plugin:proc:/proc/net/sockstat6]
-       # dim THR algorithm = incremental
+        # ipv6 TCP sockets = auto
-       # dim THR multiplier = 1
+        # ipv6 UDP sockets = auto
-       # dim THR divisor = 1
+        # ipv6 UDPLITE sockets = auto
-       # dim MCE name = MCE
+        # ipv6 RAW sockets = auto
-       # dim MCE algorithm = incremental
+        # ipv6 FRAG sockets = auto
-       # dim MCE multiplier = 1
+        # filename to monitor = /proc/net/sockstat6
-       # dim MCE divisor = 1
-       # dim MCP name = MCP
+[plugin:proc:/proc/net/sctp/snmp]
-       # dim MCP algorithm = incremental
+        # established associations = auto
-       # dim MCP multiplier = 1
+        # association transitions = auto
-       # dim MCP divisor = 1
+        # fragmentation = auto
-       # dim HYP name = HYP
+        # packets = auto
-       # dim HYP algorithm = incremental
+        # packet errors = auto
-       # dim HYP multiplier = 1
+        # chunk types = auto
-       # dim HYP divisor = 1
+        # filename to monitor = /proc/net/sctp/snmp
-       # dim ERR name = ERR
-       # dim ERR algorithm = incremental
+[plugin:proc:/proc/net/softnet_stat]
-       # dim ERR multiplier = 1
+        # softnet_stat per core = no
-       # dim ERR divisor = 1
+        # filename to monitor = /proc/net/softnet_stat
-       # dim MIS name = MIS
-       # dim MIS algorithm = incremental
+[plugin:proc:/sys/class/infiniband]
-       # dim MIS multiplier = 1
+        # dirname to monitor = /sys/class/infiniband
-       # dim MIS divisor = 1
+        # bandwidth counters = yes
+        # packets counters = yes
-[system.entropy]
+        # errors counters = yes
-       # history = 86400
+        # hardware packets counters = auto
-       # enabled = yes
+        # hardware errors counters = auto
-       enabled = no
+        # monitor only active ports = auto
-       # cache directory = /var/cache/netdata/system.entropy
+        # disable by default interfaces matching =
-       # chart type = line
+        # refresh ports state every seconds = 30
-       # type = system
-       # family = entropy
+[plugin:proc:/proc/sys/net/netfilter/nf_conntrack_max]
-       # context = system.entropy
+        # filename to monitor = /proc/sys/net/netfilter/nf_conntrack_max
-       # units = entropy
+        # read every seconds = 10
-       # priority = 1000
-       # gap when lost iterations above = 1
+[plugin:proc:/proc/sys/net/netfilter/nf_conntrack_count]
-       # name = system.entropy
+        # filename to monitor = /proc/sys/net/netfilter/nf_conntrack_count
-       # title = Available Entropy (system.entropy)
-       # dim entropy name = entropy
+[plugin:proc:/proc/net/stat/synproxy]
-       # dim entropy algorithm = absolute
+        # SYNPROXY cookies = auto
-       # dim entropy multiplier = 1
+        # SYNPROXY SYN received = auto
-       # dim entropy divisor = 1
+        # SYNPROXY connections reopened = auto
+        # filename to monitor = /proc/net/stat/synproxy
-[net.eth0]
-       # history = 86400
+[plugin:proc:/proc/mdstat]
-       # enabled = yes
+        # faulty devices = yes
-       enabled = yes
+        # nonredundant arrays availability = yes
-       # cache directory = /var/cache/netdata/net.eth0
+        # mismatch count = auto
-       # chart type = area
+        # disk stats = yes
-       # type = net
+        # operation status = yes
-       # family = eth0
+        # make charts obsolete = yes
-       # context = net.net
+        # filename to monitor = /proc/mdstat
-       # units = kilobits/s
+        # mismatch_cnt filename to monitor = /sys/block/%s/md/mismatch_cnt
-       # priority = 7000
-       # gap when lost iterations above = 1
+[plugin:proc:/proc/net/rpc/nfs]
-       # name = net.eth0
+        # filename to monitor = /proc/net/rpc/nfs
-       # title = Bandwidth (net.eth0)
+        # network = yes
-       # dim received name = received
+        # rpc = yes
-       # dim received algorithm = incremental
+        # NFS v2 procedures = yes
-       # dim received multiplier = 8
+        # NFS v3 procedures = yes
-       # dim received divisor = 1024
+        # NFS v4 procedures = yes
-       # dim sent name = sent
-       # dim sent algorithm = incremental
+[plugin:proc:/proc/spl/kstat/zfs/arcstats]
-       # dim sent multiplier = -8
+        # filename to monitor = /proc/spl/kstat/zfs/arcstats
-       # dim sent divisor = 1024
+[plugin:proc:/sys/fs/btrfs]
-[net_packets.eth0]
+        # path to monitor = /sys/fs/btrfs
-       # history = 86400
+        # check for btrfs changes every = 60
-       # enabled = yes
+        # physical disks allocation = auto
-       enabled = yes
+        # data allocation = auto
-       # cache directory = /var/cache/netdata/net_packets.eth0
+        # metadata allocation = auto
-       # chart type = line
+        # system allocation = auto
-       # type = net_packets
+        # commit stats = auto
-       # family = eth0
+        # error stats = auto
-       # context = net.packets
-       # units = packets/s
+[plugin:proc:ipc]
-       # priority = 7001
+        # message queues = yes
-       # gap when lost iterations above = 1
+        # semaphore totals = yes
-       # name = net_packets.eth0
+        # shared memory totals = yes
-       # title = Packets (net_packets.eth0)
+        # msg filename to monitor = /proc/sysvipc/msg
-       # dim received name = received
+        # shm filename to monitor = /proc/sysvipc/shm
-       # dim received algorithm = incremental
+        # max dimensions in memory allowed = 50
-       # dim received multiplier = 1
-       # dim received divisor = 1
+[plugin:proc:/sys/class/power_supply]
-       # dim sent name = sent
+        # battery capacity = yes
-       # dim sent algorithm = incremental
+        # battery power = yes
-       # dim sent multiplier = -1
+        # battery charge = no
-       # dim sent divisor = 1
+        # battery energy = no
-       # dim multicast name = multicast
+        # power supply voltage = no
-       # dim multicast algorithm = incremental
+        # keep files open = auto
-       # dim multicast multiplier = 1
+        # directory to monitor = /sys/class/power_supply
-       # dim multicast divisor = 1
+[plugin:proc:/sys/class/drm]
-[net_drops.eth0]
+        # directory to monitor = /sys/class/drm
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/net_drops.eth0
-       # chart type = line
-       # type = net_drops
-       # family = eth0
-       # context = net.drops
-       # units = drops/s
-       # priority = 7003
-       # gap when lost iterations above = 1
-       # name = net_drops.eth0
-       # title = Interface Drops (net_drops.eth0)
-       # dim inbound name = inbound
-       # dim inbound algorithm = incremental
-       # dim inbound multiplier = 1
-       # dim inbound divisor = 1
-       # dim outbound name = outbound
-       # dim outbound algorithm = incremental
-       # dim outbound multiplier = -1
-       # dim outbound divisor = 1
-[net.eth1]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/net.eth1
-       # chart type = area
-       # type = net
-       # family = eth1
-       # context = net.net
-       # units = kilobits/s
-       # priority = 7000
-       # gap when lost iterations above = 1
-       # name = net.eth1
-       # title = Bandwidth (net.eth1)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 8
-       # dim received divisor = 1024
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -8
-       # dim sent divisor = 1024
-[net_packets.eth1]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/net_packets.eth1
-       # chart type = line
-       # type = net_packets
-       # family = eth1
-       # context = net.packets
-       # units = packets/s
-       # priority = 7001
-       # gap when lost iterations above = 1
-       # name = net_packets.eth1
-       # title = Packets (net_packets.eth1)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 1
-       # dim received divisor = 1
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -1
-       # dim sent divisor = 1
-       # dim multicast name = multicast
-       # dim multicast algorithm = incremental
-       # dim multicast multiplier = 1
-       # dim multicast divisor = 1
-[disk.sda]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/disk.sda
-       # chart type = area
-       # type = disk
-       # family = sda
-       # context = disk.io
-       # units = kilobytes/s
-       # priority = 2000
-       # gap when lost iterations above = 1
-       # name = disk.sda
-       # title = Disk I/O Bandwidth (disk.sda)
-       # dim reads name = reads
-       # dim reads algorithm = incremental
-       # dim reads multiplier = 512
-       # dim reads divisor = 1024
-       # dim writes name = writes
-       # dim writes algorithm = incremental
-       # dim writes multiplier = -512
-       # dim writes divisor = 1024
-[disk_ops.sda]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/disk_ops.sda
-       # chart type = line
-       # type = disk_ops
-       # family = sda
-       # context = disk.ops
-       # units = operations/s
-       # priority = 2001
-       # gap when lost iterations above = 1
-       # name = disk_ops.sda
-       # title = Disk Completed I/O Operations (disk_ops.sda)
-       # dim reads name = reads
-       # dim reads algorithm = incremental
-       # dim reads multiplier = 1
-       # dim reads divisor = 1
-       # dim writes name = writes
-       # dim writes algorithm = incremental
-       # dim writes multiplier = -1
-       # dim writes divisor = 1
-[disk_qops.sda]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/disk_qops.sda
-       # chart type = line
-       # type = disk_qops
-       # family = sda
-       # context = disk.qops
-       # units = operations
-       # priority = 2002
-       # gap when lost iterations above = 1
-       # name = disk_qops.sda
-       # title = Disk Current I/O Operations (disk_qops.sda)
-       # dim operations name = operations
-       # dim operations algorithm = absolute
-       # dim operations multiplier = 1
-       # dim operations divisor = 1
-[disk_backlog.sda]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/disk_backlog.sda
-       # chart type = area
-       # type = disk_backlog
-       # family = sda
-       # context = disk.backlog
-       # units = backlog (ms)
-       # priority = 2003
-       # gap when lost iterations above = 1
-       # name = disk_backlog.sda
-       # title = Disk Backlog (disk_backlog.sda)
-       # dim backlog name = backlog
-       # dim backlog algorithm = incremental
-       # dim backlog multiplier = 1
-       # dim backlog divisor = 10
-[disk_util.sda]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/disk_util.sda
-       # chart type = area
-       # type = disk_util
-       # family = sda
-       # context = disk.util
-       # units = % of time working
-       # priority = 2004
-       # gap when lost iterations above = 1
-       # name = disk_util.sda
-       # title = Disk Utilization Time (disk_util.sda)
-       # dim utilization name = utilization
-       # dim utilization algorithm = incremental
-       # dim utilization multiplier = 1
-       # dim utilization divisor = 10
-[disk_mops.sda]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/disk_mops.sda
-       # chart type = line
-       # type = disk_mops
-       # family = sda
-       # context = disk.mops
-       # units = merged operations/s
-       # priority = 2021
-       # gap when lost iterations above = 1
-       # name = disk_mops.sda
-       # title = Disk Merged Operations (disk_mops.sda)
-       # dim reads name = reads
-       # dim reads algorithm = incremental
-       # dim reads multiplier = 1
-       # dim reads divisor = 1
-       # dim writes name = writes
-       # dim writes algorithm = incremental
-       # dim writes multiplier = -1
-       # dim writes divisor = 1
-[disk_iotime.sda]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/disk_iotime.sda
-       # chart type = line
-       # type = disk_iotime
-       # family = sda
-       # context = disk.iotime
-       # units = milliseconds/s
-       # priority = 2022
-       # gap when lost iterations above = 1
-       # name = disk_iotime.sda
-       # title = Disk Total I/O Time (disk_iotime.sda)
-       # dim reads name = reads
-       # dim reads algorithm = incremental
-       # dim reads multiplier = 1
-       # dim reads divisor = 1
-       # dim writes name = writes
-       # dim writes algorithm = incremental
-       # dim writes multiplier = -1
-       # dim writes divisor = 1
-[ipv4.packets]
-       # history = 86400
-       # enabled = yes
-       enabled = yes
-       # cache directory = /var/cache/netdata/ipv4.packets
-       # chart type = line
-       # type = ipv4
-       # family = packets
-       # context = ipv4.packets
-       # units = packets/s
-       # priority = 3000
-       # gap when lost iterations above = 1
-       # name = ipv4.packets
-       # title = IPv4 Packets (ipv4.packets)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 1
-       # dim received divisor = 1
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -1
-       # dim sent divisor = 1
-       # dim forwarded name = forwarded
-       # dim forwarded algorithm = incremental
-       # dim forwarded multiplier = 1
-       # dim forwarded divisor = 1
-[ipv4.fragsout]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.fragsout
-       # chart type = line
-       # type = ipv4
-       # family = fragments
-       # context = ipv4.fragsout
-       # units = packets/s
-       # priority = 3010
-       # gap when lost iterations above = 1
-       # name = ipv4.fragsout
-       # title = IPv4 Fragments Sent (ipv4.fragsout)
-       # dim ok name = ok
-       # dim ok algorithm = incremental
-       # dim ok multiplier = 1
-       # dim ok divisor = 1
-       # dim failed name = failed
-       # dim failed algorithm = incremental
-       # dim failed multiplier = -1
-       # dim failed divisor = 1
-       # dim all name = all
-       # dim all algorithm = incremental
-       # dim all multiplier = 1
-       # dim all divisor = 1
-[ipv4.fragsin]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.fragsin
-       # chart type = line
-       # type = ipv4
-       # family = fragments
-       # context = ipv4.fragsin
-       # units = packets/s
-       # priority = 3011
-       # gap when lost iterations above = 1
-       # name = ipv4.fragsin
-       # title = IPv4 Fragments Reassembly (ipv4.fragsin)
-       # dim ok name = ok
-       # dim ok algorithm = incremental
-       # dim ok multiplier = 1
-       # dim ok divisor = 1
-       # dim failed name = failed
-       # dim failed algorithm = incremental
-       # dim failed multiplier = -1
-       # dim failed divisor = 1
-       # dim all name = all
-       # dim all algorithm = incremental
-       # dim all multiplier = 1
-       # dim all divisor = 1
-[ipv4.errors]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.errors
-       # chart type = line
-       # type = ipv4
-       # family = errors
-       # context = ipv4.errors
-       # units = packets/s
-       # priority = 3002
-       # gap when lost iterations above = 1
-       # name = ipv4.errors
-       # title = IPv4 Errors (ipv4.errors)
-       # dim InDiscards name = InDiscards
-       # dim InDiscards algorithm = incremental
-       # dim InDiscards multiplier = 1
-       # dim InDiscards divisor = 1
-       # dim OutDiscards name = OutDiscards
-       # dim OutDiscards algorithm = incremental
-       # dim OutDiscards multiplier = -1
-       # dim OutDiscards divisor = 1
-       # dim InHdrErrors name = InHdrErrors
-       # dim InHdrErrors algorithm = incremental
-       # dim InHdrErrors multiplier = 1
-       # dim InHdrErrors divisor = 1
-       # dim InAddrErrors name = InAddrErrors
-       # dim InAddrErrors algorithm = incremental
-       # dim InAddrErrors multiplier = 1
-       # dim InAddrErrors divisor = 1
-       # dim InUnknownProtos name = InUnknownProtos
-       # dim InUnknownProtos algorithm = incremental
-       # dim InUnknownProtos multiplier = 1
-       # dim InUnknownProtos divisor = 1
-       # dim OutNoRoutes name = OutNoRoutes
-       # dim OutNoRoutes algorithm = incremental
-       # dim OutNoRoutes multiplier = -1
-       # dim OutNoRoutes divisor = 1
-[ipv4.tcpsock]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.tcpsock
-       # chart type = line
-       # type = ipv4
-       # family = tcp
-       # context = ipv4.tcpsock
-       # units = active connections
-       # priority = 2500
-       # gap when lost iterations above = 1
-       # name = ipv4.tcpsock
-       # title = IPv4 TCP Connections (ipv4.tcpsock)
-       # dim connections name = connections
-       # dim connections algorithm = absolute
-       # dim connections multiplier = 1
-       # dim connections divisor = 1
-[ipv4.tcppackets]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.tcppackets
-       # chart type = line
-       # type = ipv4
-       # family = tcp
-       # context = ipv4.tcppackets
-       # units = packets/s
-       # priority = 2600
-       # gap when lost iterations above = 1
-       # name = ipv4.tcppackets
-       # title = IPv4 TCP Packets (ipv4.tcppackets)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 1
-       # dim received divisor = 1
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -1
-       # dim sent divisor = 1
-[ipv4.tcperrors]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.tcperrors
-       # chart type = line
-       # type = ipv4
-       # family = tcp
-       # context = ipv4.tcperrors
-       # units = packets/s
-       # priority = 2700
-       # gap when lost iterations above = 1
-       # name = ipv4.tcperrors
-       # title = IPv4 TCP Errors (ipv4.tcperrors)
-       # dim InErrs name = InErrs
-       # dim InErrs algorithm = incremental
-       # dim InErrs multiplier = 1
-       # dim InErrs divisor = 1
-       # dim RetransSegs name = RetransSegs
-       # dim RetransSegs algorithm = incremental
-       # dim RetransSegs multiplier = -1
-       # dim RetransSegs divisor = 1
-[ipv4.tcphandshake]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.tcphandshake
-       # chart type = line
-       # type = ipv4
-       # family = tcp
-       # context = ipv4.tcphandshake
-       # units = events/s
-       # priority = 2900
-       # gap when lost iterations above = 1
-       # name = ipv4.tcphandshake
-       # title = IPv4 TCP Handshake Issues (ipv4.tcphandshake)
-       # dim EstabResets name = EstabResets
-       # dim EstabResets algorithm = incremental
-       # dim EstabResets multiplier = 1
-       # dim EstabResets divisor = 1
-       # dim OutRsts name = OutRsts
-       # dim OutRsts algorithm = incremental
-       # dim OutRsts multiplier = -1
-       # dim OutRsts divisor = 1
-       # dim ActiveOpens name = ActiveOpens
-       # dim ActiveOpens algorithm = incremental
-       # dim ActiveOpens multiplier = 1
-       # dim ActiveOpens divisor = 1
-       # dim PassiveOpens name = PassiveOpens
-       # dim PassiveOpens algorithm = incremental
-       # dim PassiveOpens multiplier = 1
-       # dim PassiveOpens divisor = 1
-       # dim AttemptFails name = AttemptFails
-       # dim AttemptFails algorithm = incremental
-       # dim AttemptFails multiplier = 1
-       # dim AttemptFails divisor = 1
-[ipv4.udppackets]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.udppackets
-       # chart type = line
-       # type = ipv4
-       # family = udp
-       # context = ipv4.udppackets
-       # units = packets/s
-       # priority = 2601
-       # gap when lost iterations above = 1
-       # name = ipv4.udppackets
-       # title = IPv4 UDP Packets (ipv4.udppackets)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 1
-       # dim received divisor = 1
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -1
-       # dim sent divisor = 1
-[ipv4.udperrors]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.udperrors
-       # chart type = line
-       # type = ipv4
-       # family = udp
-       # context = ipv4.udperrors
-       # units = events/s
-       # priority = 2701
-       # gap when lost iterations above = 1
-       # name = ipv4.udperrors
-       # title = IPv4 UDP Errors (ipv4.udperrors)
-       # dim RcvbufErrors name = RcvbufErrors
-       # dim RcvbufErrors algorithm = incremental
-       # dim RcvbufErrors multiplier = 1
-       # dim RcvbufErrors divisor = 1
-       # dim SndbufErrors name = SndbufErrors
-       # dim SndbufErrors algorithm = incremental
-       # dim SndbufErrors multiplier = -1
-       # dim SndbufErrors divisor = 1
-       # dim InErrors name = InErrors
-       # dim InErrors algorithm = incremental
-       # dim InErrors multiplier = 1
-       # dim InErrors divisor = 1
-       # dim NoPorts name = NoPorts
-       # dim NoPorts algorithm = incremental
-       # dim NoPorts multiplier = 1
-       # dim NoPorts divisor = 1
-[system.ipv4]
-       # history = 86400
-       # enabled = yes
-       enabled = yes
-       # cache directory = /var/cache/netdata/system.ipv4
-       # chart type = area
-       # type = system
-       # family = network
-       # context = system.ipv4
-       # units = kilobits/s
-       # priority = 500
-       # gap when lost iterations above = 1
-       # name = system.ipv4
-       # title = IPv4 Bandwidth (system.ipv4)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 8
-       # dim received divisor = 1024
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -8
-       # dim sent divisor = 1024
-[ipv4.bcast]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.bcast
-       # chart type = area
-       # type = ipv4
-       # family = broadcast
-       # context = ipv4.bcast
-       # units = kilobits/s
-       # priority = 8000
-       # gap when lost iterations above = 1
-       # name = ipv4.bcast
-       # title = IPv4 Broadcast Bandwidth (ipv4.bcast)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 8
-       # dim received divisor = 1024
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -8
-       # dim sent divisor = 1024
-[ipv4.bcastpkts]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv4.bcastpkts
-       # chart type = line
-       # type = ipv4
-       # family = broadcast
-       # context = ipv4.bcastpkts
-       # units = packets/s
-       # priority = 8500
-       # gap when lost iterations above = 1
-       # name = ipv4.bcastpkts
-       # title = IPv4 Broadcast Packets (ipv4.bcastpkts)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 1
-       # dim received divisor = 1
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -1
-       # dim sent divisor = 1
-[system.cpu]
-       # history = 86400
-       # enabled = yes
-       enabled = yes
-       # cache directory = /var/cache/netdata/system.cpu
-       # chart type = stacked
-       # type = system
-       # family = cpu
-       # context = system.cpu
-       # units = percentage
-       # priority = 100
-       # gap when lost iterations above = 1
-       # name = system.cpu
-       # title = Total CPU utilization (system.cpu)
-       # dim guest_nice name = guest_nice
-       # dim guest_nice algorithm = percentage-of-incremental-row
-       # dim guest_nice multiplier = 1
-       # dim guest_nice divisor = 1
-       # dim guest name = guest
-       # dim guest algorithm = percentage-of-incremental-row
-       # dim guest multiplier = 1
-       # dim guest divisor = 1
-       # dim steal name = steal
-       # dim steal algorithm = percentage-of-incremental-row
-       # dim steal multiplier = 1
-       # dim steal divisor = 1
-       # dim softirq name = softirq
-       # dim softirq algorithm = percentage-of-incremental-row
-       # dim softirq multiplier = 1
-       # dim softirq divisor = 1
-       # dim irq name = irq
-       # dim irq algorithm = percentage-of-incremental-row
-       # dim irq multiplier = 1
-       # dim irq divisor = 1
-       # dim user name = user
-       # dim user algorithm = percentage-of-incremental-row
-       # dim user multiplier = 1
-       # dim user divisor = 1
-       # dim system name = system
-       # dim system algorithm = percentage-of-incremental-row
-       # dim system multiplier = 1
-       # dim system divisor = 1
-       # dim nice name = nice
-       # dim nice algorithm = percentage-of-incremental-row
-       # dim nice multiplier = 1
-       # dim nice divisor = 1
-       # dim iowait name = iowait
-       # dim iowait algorithm = percentage-of-incremental-row
-       # dim iowait multiplier = 1
-       # dim iowait divisor = 1
-       # dim idle name = idle
-       # dim idle algorithm = percentage-of-incremental-row
-       # dim idle multiplier = 1
-       # dim idle divisor = 1
-[cpu.cpu0]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/cpu.cpu0
-       # chart type = stacked
-       # type = cpu
-       # family = utilization
-       # context = cpu.cpu
-       # units = percentage
-       # priority = 1000
-       # gap when lost iterations above = 1
-       # name = cpu.cpu0
-       # title = Core utilization (cpu.cpu0)
-       # dim guest_nice name = guest_nice
-       # dim guest_nice algorithm = percentage-of-incremental-row
-       # dim guest_nice multiplier = 1
-       # dim guest_nice divisor = 1
-       # dim guest name = guest
-       # dim guest algorithm = percentage-of-incremental-row
-       # dim guest multiplier = 1
-       # dim guest divisor = 1
-       # dim steal name = steal
-       # dim steal algorithm = percentage-of-incremental-row
-       # dim steal multiplier = 1
-       # dim steal divisor = 1
-       # dim softirq name = softirq
-       # dim softirq algorithm = percentage-of-incremental-row
-       # dim softirq multiplier = 1
-       # dim softirq divisor = 1
-       # dim irq name = irq
-       # dim irq algorithm = percentage-of-incremental-row
-       # dim irq multiplier = 1
-       # dim irq divisor = 1
-       # dim user name = user
-       # dim user algorithm = percentage-of-incremental-row
-       # dim user multiplier = 1
-       # dim user divisor = 1
-       # dim system name = system
-       # dim system algorithm = percentage-of-incremental-row
-       # dim system multiplier = 1
-       # dim system divisor = 1
-       # dim nice name = nice
-       # dim nice algorithm = percentage-of-incremental-row
-       # dim nice multiplier = 1
-       # dim nice divisor = 1
-       # dim iowait name = iowait
-       # dim iowait algorithm = percentage-of-incremental-row
-       # dim iowait multiplier = 1
-       # dim iowait divisor = 1
-       # dim idle name = idle
-       # dim idle algorithm = percentage-of-incremental-row
-       # dim idle multiplier = 1
-       # dim idle divisor = 1
-[cpu.cpu1]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/cpu.cpu1
-       # chart type = stacked
-       # type = cpu
-       # family = utilization
-       # context = cpu.cpu
-       # units = percentage
-       # priority = 1000
-       # gap when lost iterations above = 1
-       # name = cpu.cpu1
-       # title = Core utilization (cpu.cpu1)
-       # dim guest_nice name = guest_nice
-       # dim guest_nice algorithm = percentage-of-incremental-row
-       # dim guest_nice multiplier = 1
-       # dim guest_nice divisor = 1
-       # dim guest name = guest
-       # dim guest algorithm = percentage-of-incremental-row
-       # dim guest multiplier = 1
-       # dim guest divisor = 1
-       # dim steal name = steal
-       # dim steal algorithm = percentage-of-incremental-row
-       # dim steal multiplier = 1
-       # dim steal divisor = 1
-       # dim softirq name = softirq
-       # dim softirq algorithm = percentage-of-incremental-row
-       # dim softirq multiplier = 1
-       # dim softirq divisor = 1
-       # dim irq name = irq
-       # dim irq algorithm = percentage-of-incremental-row
-       # dim irq multiplier = 1
-       # dim irq divisor = 1
-       # dim user name = user
-       # dim user algorithm = percentage-of-incremental-row
-       # dim user multiplier = 1
-       # dim user divisor = 1
-       # dim system name = system
-       # dim system algorithm = percentage-of-incremental-row
-       # dim system multiplier = 1
-       # dim system divisor = 1
-       # dim nice name = nice
-       # dim nice algorithm = percentage-of-incremental-row
-       # dim nice multiplier = 1
-       # dim nice divisor = 1
-       # dim iowait name = iowait
-       # dim iowait algorithm = percentage-of-incremental-row
-       # dim iowait multiplier = 1
-       # dim iowait divisor = 1
-       # dim idle name = idle
-       # dim idle algorithm = percentage-of-incremental-row
-       # dim idle multiplier = 1
-       # dim idle divisor = 1
-[system.intr]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/system.intr
-       # chart type = line
-       # type = system
-       # family = interrupts
-       # context = system.intr
-       # units = interrupts/s
-       # priority = 900
-       # gap when lost iterations above = 1
-       # name = system.intr
-       # title = CPU Interrupts (system.intr)
-       # dim interrupts name = interrupts
-       # dim interrupts algorithm = incremental
-       # dim interrupts multiplier = 1
-       # dim interrupts divisor = 1
-[system.ctxt]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/system.ctxt
-       # chart type = line
-       # type = system
-       # family = processes
-       # context = system.ctxt
-       # units = context switches/s
-       # priority = 800
-       # gap when lost iterations above = 1
-       # name = system.ctxt
-       # title = CPU Context Switches (system.ctxt)
-       # dim switches name = switches
-       # dim switches algorithm = incremental
-       # dim switches multiplier = 1
-       # dim switches divisor = 1
-[system.forks]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/system.forks
-       # chart type = line
-       # type = system
-       # family = processes
-       # context = system.forks
-       # units = processes/s
-       # priority = 700
-       # gap when lost iterations above = 1
-       # name = system.forks
-       # title = Started Processes (system.forks)
-       # dim started name = started
-       # dim started algorithm = incremental
-       # dim started multiplier = 1
-       # dim started divisor = 1
-[system.processes]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/system.processes
-       # chart type = line
-       # type = system
-       # family = processes
-       # context = system.processes
-       # units = processes
-       # priority = 600
-       # gap when lost iterations above = 1
-       # name = system.processes
-       # title = System Processes (system.processes)
-       # dim running name = running
-       # dim running algorithm = absolute
-       # dim running multiplier = 1
-       # dim running divisor = 1
-       # dim blocked name = blocked
-       # dim blocked algorithm = absolute
-       # dim blocked multiplier = -1
-       # dim blocked divisor = 1
-[system.ram]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/system.ram
-       # chart type = stacked
-       # type = system
-       # family = ram
-       # context = system.ram
-       # units = MB
-       # priority = 200
-       # gap when lost iterations above = 1
-       # name = system.ram
-       # title = System RAM (system.ram)
-       # dim buffers name = buffers
-       # dim buffers algorithm = absolute
-       # dim buffers multiplier = 1
-       # dim buffers divisor = 1024
-       # dim used name = used
-       # dim used algorithm = absolute
-       # dim used multiplier = 1
-       # dim used divisor = 1024
-       # dim cached name = cached
-       # dim cached algorithm = absolute
-       # dim cached multiplier = 1
-       # dim cached divisor = 1024
-       # dim free name = free
-       # dim free algorithm = absolute
-       # dim free multiplier = 1
-       # dim free divisor = 1024
-[system.swap]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/system.swap
-       # chart type = stacked
-       # type = system
-       # family = swap
-       # context = system.swap
-       # units = MB
-       # priority = 201
-       # gap when lost iterations above = 1
-       # name = system.swap
-       # title = System Swap (system.swap)
-       # dim free name = free
-       # dim free algorithm = absolute
-       # dim free multiplier = 1
-       # dim free divisor = 1024
-       # dim used name = used
-       # dim used algorithm = absolute
-       # dim used multiplier = 1
-       # dim used divisor = 1024
-[mem.committed]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/mem.committed
-       # chart type = area
-       # type = mem
-       # family = system
-       # context = mem.committed
-       # units = MB
-       # priority = 5000
-       # gap when lost iterations above = 1
-       # name = mem.committed
-       # title = Committed (Allocated) Memory (mem.committed)
-       # dim Committed_AS name = Committed_AS
-       # dim Committed_AS algorithm = absolute
-       # dim Committed_AS multiplier = 1
-       # dim Committed_AS divisor = 1024
-[mem.writeback]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mem.writeback
-       # chart type = line
-       # type = mem
-       # family = kernel
-       # context = mem.writeback
-       # units = MB
-       # priority = 4000
-       # gap when lost iterations above = 1
-       # name = mem.writeback
-       # title = Writeback Memory (mem.writeback)
-       # dim Dirty name = Dirty
-       # dim Dirty algorithm = absolute
-       # dim Dirty multiplier = 1
-       # dim Dirty divisor = 1024
-       # dim Writeback name = Writeback
-       # dim Writeback algorithm = absolute
-       # dim Writeback multiplier = 1
-       # dim Writeback divisor = 1024
-       # dim FuseWriteback name = FuseWriteback
-       # dim FuseWriteback algorithm = absolute
-       # dim FuseWriteback multiplier = 1
-       # dim FuseWriteback divisor = 1024
-       # dim NfsWriteback name = NfsWriteback
-       # dim NfsWriteback algorithm = absolute
-       # dim NfsWriteback multiplier = 1
-       # dim NfsWriteback divisor = 1024
-       # dim Bounce name = Bounce
-       # dim Bounce algorithm = absolute
-       # dim Bounce multiplier = 1
-       # dim Bounce divisor = 1024
-[mem.kernel]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/mem.kernel
-       # chart type = stacked
-       # type = mem
-       # family = kernel
-       # context = mem.kernel
-       # units = MB
-       # priority = 6000
-       # gap when lost iterations above = 1
-       # name = mem.kernel
-       # title = Memory Used by Kernel (mem.kernel)
-       # dim Slab name = Slab
-       # dim Slab algorithm = absolute
-       # dim Slab multiplier = 1
-       # dim Slab divisor = 1024
-       # dim KernelStack name = KernelStack
-       # dim KernelStack algorithm = absolute
-       # dim KernelStack multiplier = 1
-       # dim KernelStack divisor = 1024
-       # dim PageTables name = PageTables
-       # dim PageTables algorithm = absolute
-       # dim PageTables multiplier = 1
-       # dim PageTables divisor = 1024
-       # dim VmallocUsed name = VmallocUsed
-       # dim VmallocUsed algorithm = absolute
-       # dim VmallocUsed multiplier = 1
-       # dim VmallocUsed divisor = 1024
-[mem.slab]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mem.slab
-       # chart type = stacked
-       # type = mem
-       # family = slab
-       # context = mem.slab
-       # units = MB
-       # priority = 6500
-       # gap when lost iterations above = 1
-       # name = mem.slab
-       # title = Reclaimable Kernel Memory (mem.slab)
-       # dim reclaimable name = reclaimable
-       # dim reclaimable algorithm = absolute
-       # dim reclaimable multiplier = 1
-       # dim reclaimable divisor = 1024
-       # dim unreclaimable name = unreclaimable
-       # dim unreclaimable algorithm = absolute
-       # dim unreclaimable multiplier = 1
-       # dim unreclaimable divisor = 1024
-[system.swapio]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/system.swapio
-       # chart type = area
-       # type = system
-       # family = swap
-       # context = system.swapio
-       # units = kilobytes/s
-       # priority = 250
-       # gap when lost iterations above = 1
-       # name = system.swapio
-       # title = Swap I/O (system.swapio)
-       # dim in name = in
-       # dim in algorithm = incremental
-       # dim in multiplier = 4096
-       # dim in divisor = 1024
-       # dim out name = out
-       # dim out algorithm = incremental
-       # dim out multiplier = -4096
-       # dim out divisor = 1024
-[system.io]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/system.io
-       # chart type = area
-       # type = system
-       # family = disk
-       # context = system.io
-       # units = kilobytes/s
-       # priority = 150
-       # gap when lost iterations above = 1
-       # name = system.io
-       # title = Disk I/O (system.io)
-       # dim in name = in
-       # dim in algorithm = incremental
-       # dim in multiplier = 1
-       # dim in divisor = 1
-       # dim out name = out
-       # dim out algorithm = incremental
-       # dim out multiplier = -1
-       # dim out divisor = 1
-[netdata.plugin_proc_cpu]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/netdata.plugin_proc_cpu
-       # chart type = stacked
-       # type = netdata
-       # family = proc.internal
-       # context = netdata.plugin_proc_cpu
-       # units = milliseconds/s
-       # priority = 131000
-       # gap when lost iterations above = 1
-       # name = netdata.plugin_proc_cpu
-       # title = NetData Proc Plugin CPU usage (netdata.plugin_proc_cpu)
-       # dim user name = user
-       # dim user algorithm = incremental
-       # dim user multiplier = 1
-       # dim user divisor = 1000
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 1
-       # dim system divisor = 1000
-[netdata.server_cpu]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/netdata.server_cpu
-       # chart type = stacked
-       # type = netdata
-       # family = netdata
-       # context = netdata.server_cpu
-       # units = milliseconds/s
-       # priority = 130000
-       # gap when lost iterations above = 1
-       # name = netdata.server_cpu
-       # title = NetData CPU usage (netdata.server_cpu)
-       # dim user name = user
-       # dim user algorithm = incremental
-       # dim user multiplier = 1
-       # dim user divisor = 1000
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 1
-       # dim system divisor = 1000
-[netdata.clients]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/netdata.clients
-       # chart type = line
-       # type = netdata
-       # family = netdata
-       # context = netdata.clients
-       # units = connected clients
-       # priority = 131000
-       # gap when lost iterations above = 1
-       # name = netdata.clients
-       # title = NetData Web Clients (netdata.clients)
-       # dim clients name = clients
-       # dim clients algorithm = absolute
-       # dim clients multiplier = 1
-       # dim clients divisor = 1
-[netdata.requests]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/netdata.requests
-       # chart type = line
-       # type = netdata
-       # family = netdata
-       # context = netdata.requests
-       # units = requests/s
-       # priority = 131100
-       # gap when lost iterations above = 1
-       # name = netdata.requests
-       # title = NetData Web Requests (netdata.requests)
-       # dim requests name = requests
-       # dim requests algorithm = incremental
-       # dim requests multiplier = 1
-       # dim requests divisor = 1
-[netdata.net]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/netdata.net
-       # chart type = area
-       # type = netdata
-       # family = netdata
-       # context = netdata.net
-       # units = kilobits/s
-       # priority = 131200
-       # gap when lost iterations above = 1
-       # name = netdata.net
-       # title = NetData Network Traffic (netdata.net)
-       # dim in name = in
-       # dim in algorithm = incremental
-       # dim in multiplier = 8
-       # dim in divisor = 1024
-       # dim out name = out
-       # dim out algorithm = incremental
-       # dim out multiplier = -8
-       # dim out divisor = 1024
-[apps.cpu]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/apps.cpu
-       # chart type = stacked
-       # type = apps
-       # family = cpu
-       # context = apps.cpu
-       # units = cpu time %
-       # priority = 20001
-       # gap when lost iterations above = 1
-       # name = apps.cpu
-       # title = Apps CPU Time (200% = 2 cores) (apps.cpu)
-       # dim other name = other
-       # dim other algorithm = incremental
-       # dim other multiplier = 100
-       # dim other divisor = 100
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = incremental
-       # dim ksmd multiplier = 100
-       # dim ksmd divisor = 100
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 100
-       # dim system divisor = 100
-       # dim netdata name = netdata
-       # dim netdata algorithm = incremental
-       # dim netdata multiplier = 100
-       # dim netdata divisor = 100
-       # dim kernel name = kernel
-       # dim kernel algorithm = incremental
-       # dim kernel multiplier = 100
-       # dim kernel divisor = 100
-       # dim cron name = cron
-       # dim cron algorithm = incremental
-       # dim cron multiplier = 100
-       # dim cron divisor = 100
-       # dim inetd name = inetd
-       # dim inetd algorithm = incremental
-       # dim inetd multiplier = 100
-       # dim inetd divisor = 100
-       # dim nms name = nms
-       # dim nms algorithm = incremental
-       # dim nms multiplier = 100
-       # dim nms divisor = 100
-       # dim log name = log
-       # dim log algorithm = incremental
-       # dim log multiplier = 100
-       # dim log divisor = 100
-       # dim ntp name = ntp
-       # dim ntp algorithm = incremental
-       # dim ntp multiplier = 100
-       # dim ntp divisor = 100
-       # dim named name = named
-       # dim named algorithm = incremental
-       # dim named multiplier = 100
-       # dim named divisor = 100
-       # dim ssh name = ssh
-       # dim ssh algorithm = incremental
-       # dim ssh multiplier = 100
-       # dim ssh divisor = 100
-       # dim nfs name = nfs
-       # dim nfs algorithm = incremental
-       # dim nfs multiplier = 100
-       # dim nfs divisor = 100
-       # dim nginx name = nginx
-       # dim nginx algorithm = incremental
-       # dim nginx multiplier = 100
-       # dim nginx divisor = 100
-       # dim postfix name = postfix
-       # dim postfix algorithm = incremental
-       # dim postfix multiplier = 100
-       # dim postfix divisor = 100
-       # dim mysql name = mysql
-       # dim mysql algorithm = incremental
-       # dim mysql multiplier = 100
-       # dim mysql divisor = 100
-       # dim rsync name = rsync
-       # dim rsync algorithm = incremental
-       # dim rsync multiplier = 100
-       # dim rsync divisor = 100
-       # dim compile name = compile
-       # dim compile algorithm = incremental
-       # dim compile multiplier = 100
-       # dim compile divisor = 100
-[apps.mem]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/apps.mem
-       # chart type = stacked
-       # type = apps
-       # family = mem
-       # context = apps.mem
-       # units = MB
-       # priority = 20003
-       # gap when lost iterations above = 1
-       # name = apps.mem
-       # title = Apps Dedicated Memory (w/o shared) (apps.mem)
-       # dim other name = other
-       # dim other algorithm = absolute
-       # dim other multiplier = 4096
-       # dim other divisor = 1048576
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = absolute
-       # dim ksmd multiplier = 4096
-       # dim ksmd divisor = 1048576
-       # dim system name = system
-       # dim system algorithm = absolute
-       # dim system multiplier = 4096
-       # dim system divisor = 1048576
-       # dim netdata name = netdata
-       # dim netdata algorithm = absolute
-       # dim netdata multiplier = 4096
-       # dim netdata divisor = 1048576
-       # dim kernel name = kernel
-       # dim kernel algorithm = absolute
-       # dim kernel multiplier = 4096
-       # dim kernel divisor = 1048576
-       # dim cron name = cron
-       # dim cron algorithm = absolute
-       # dim cron multiplier = 4096
-       # dim cron divisor = 1048576
-       # dim inetd name = inetd
-       # dim inetd algorithm = absolute
-       # dim inetd multiplier = 4096
-       # dim inetd divisor = 1048576
-       # dim nms name = nms
-       # dim nms algorithm = absolute
-       # dim nms multiplier = 4096
-       # dim nms divisor = 1048576
-       # dim log name = log
-       # dim log algorithm = absolute
-       # dim log multiplier = 4096
-       # dim log divisor = 1048576
-       # dim ntp name = ntp
-       # dim ntp algorithm = absolute
-       # dim ntp multiplier = 4096
-       # dim ntp divisor = 1048576
-       # dim named name = named
-       # dim named algorithm = absolute
-       # dim named multiplier = 4096
-       # dim named divisor = 1048576
-       # dim ssh name = ssh
-       # dim ssh algorithm = absolute
-       # dim ssh multiplier = 4096
-       # dim ssh divisor = 1048576
-       # dim nfs name = nfs
-       # dim nfs algorithm = absolute
-       # dim nfs multiplier = 4096
-       # dim nfs divisor = 1048576
-       # dim nginx name = nginx
-       # dim nginx algorithm = absolute
-       # dim nginx multiplier = 4096
-       # dim nginx divisor = 1048576
-       # dim postfix name = postfix
-       # dim postfix algorithm = absolute
-       # dim postfix multiplier = 4096
-       # dim postfix divisor = 1048576
-       # dim mysql name = mysql
-       # dim mysql algorithm = absolute
-       # dim mysql multiplier = 4096
-       # dim mysql divisor = 1048576
-       # dim rsync name = rsync
-       # dim rsync algorithm = absolute
-       # dim rsync multiplier = 4096
-       # dim rsync divisor = 1048576
-       # dim compile name = compile
-       # dim compile algorithm = absolute
-       # dim compile multiplier = 4096
-       # dim compile divisor = 1048576
-[apps.threads]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/apps.threads
-       # chart type = stacked
-       # type = apps
-       # family = processes
-       # context = apps.threads
-       # units = threads
-       # priority = 20005
-       # gap when lost iterations above = 1
-       # name = apps.threads
-       # title = Apps Threads (apps.threads)
-       # dim other name = other
-       # dim other algorithm = absolute
-       # dim other multiplier = 1
-       # dim other divisor = 1
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = absolute
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1
-       # dim system name = system
-       # dim system algorithm = absolute
-       # dim system multiplier = 1
-       # dim system divisor = 1
-       # dim netdata name = netdata
-       # dim netdata algorithm = absolute
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1
-       # dim kernel name = kernel
-       # dim kernel algorithm = absolute
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1
-       # dim cron name = cron
-       # dim cron algorithm = absolute
-       # dim cron multiplier = 1
-       # dim cron divisor = 1
-       # dim inetd name = inetd
-       # dim inetd algorithm = absolute
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1
-       # dim nms name = nms
-       # dim nms algorithm = absolute
-       # dim nms multiplier = 1
-       # dim nms divisor = 1
-       # dim log name = log
-       # dim log algorithm = absolute
-       # dim log multiplier = 1
-       # dim log divisor = 1
-       # dim ntp name = ntp
-       # dim ntp algorithm = absolute
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1
-       # dim named name = named
-       # dim named algorithm = absolute
-       # dim named multiplier = 1
-       # dim named divisor = 1
-       # dim ssh name = ssh
-       # dim ssh algorithm = absolute
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1
-       # dim nfs name = nfs
-       # dim nfs algorithm = absolute
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1
-       # dim nginx name = nginx
-       # dim nginx algorithm = absolute
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1
-       # dim postfix name = postfix
-       # dim postfix algorithm = absolute
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1
-       # dim mysql name = mysql
-       # dim mysql algorithm = absolute
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1
-       # dim rsync name = rsync
-       # dim rsync algorithm = absolute
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1
-       # dim compile name = compile
-       # dim compile algorithm = absolute
-       # dim compile multiplier = 1
-       # dim compile divisor = 1
-[apps.processes]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/apps.processes
-       # chart type = stacked
-       # type = apps
-       # family = processes
-       # context = apps.processes
-       # units = processes
-       # priority = 20004
-       # gap when lost iterations above = 1
-       # name = apps.processes
-       # title = Apps Processes (apps.processes)
-       # dim other name = other
-       # dim other algorithm = absolute
-       # dim other multiplier = 1
-       # dim other divisor = 1
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = absolute
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1
-       # dim system name = system
-       # dim system algorithm = absolute
-       # dim system multiplier = 1
-       # dim system divisor = 1
-       # dim netdata name = netdata
-       # dim netdata algorithm = absolute
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1
-       # dim kernel name = kernel
-       # dim kernel algorithm = absolute
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1
-       # dim cron name = cron
-       # dim cron algorithm = absolute
-       # dim cron multiplier = 1
-       # dim cron divisor = 1
-       # dim inetd name = inetd
-       # dim inetd algorithm = absolute
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1
-       # dim nms name = nms
-       # dim nms algorithm = absolute
-       # dim nms multiplier = 1
-       # dim nms divisor = 1
-       # dim log name = log
-       # dim log algorithm = absolute
-       # dim log multiplier = 1
-       # dim log divisor = 1
-       # dim ntp name = ntp
-       # dim ntp algorithm = absolute
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1
-       # dim named name = named
-       # dim named algorithm = absolute
-       # dim named multiplier = 1
-       # dim named divisor = 1
-       # dim ssh name = ssh
-       # dim ssh algorithm = absolute
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1
-       # dim nfs name = nfs
-       # dim nfs algorithm = absolute
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1
-       # dim nginx name = nginx
-       # dim nginx algorithm = absolute
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1
-       # dim postfix name = postfix
-       # dim postfix algorithm = absolute
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1
-       # dim mysql name = mysql
-       # dim mysql algorithm = absolute
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1
-       # dim rsync name = rsync
-       # dim rsync algorithm = absolute
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1
-       # dim compile name = compile
-       # dim compile algorithm = absolute
-       # dim compile multiplier = 1
-       # dim compile divisor = 1
-[apps.cpu_user]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/apps.cpu_user
-       # chart type = stacked
-       # type = apps
-       # family = cpu
-       # context = apps.cpu_user
-       # units = cpu time %
-       # priority = 20020
-       # gap when lost iterations above = 1
-       # name = apps.cpu_user
-       # title = Apps CPU User Time (200% = 2 cores) (apps.cpu_user)
-       # dim other name = other
-       # dim other algorithm = incremental
-       # dim other multiplier = 100
-       # dim other divisor = 200
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = incremental
-       # dim ksmd multiplier = 100
-       # dim ksmd divisor = 200
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 100
-       # dim system divisor = 200
-       # dim netdata name = netdata
-       # dim netdata algorithm = incremental
-       # dim netdata multiplier = 100
-       # dim netdata divisor = 200
-       # dim kernel name = kernel
-       # dim kernel algorithm = incremental
-       # dim kernel multiplier = 100
-       # dim kernel divisor = 200
-       # dim cron name = cron
-       # dim cron algorithm = incremental
-       # dim cron multiplier = 100
-       # dim cron divisor = 200
-       # dim inetd name = inetd
-       # dim inetd algorithm = incremental
-       # dim inetd multiplier = 100
-       # dim inetd divisor = 200
-       # dim nms name = nms
-       # dim nms algorithm = incremental
-       # dim nms multiplier = 100
-       # dim nms divisor = 200
-       # dim log name = log
-       # dim log algorithm = incremental
-       # dim log multiplier = 100
-       # dim log divisor = 200
-       # dim ntp name = ntp
-       # dim ntp algorithm = incremental
-       # dim ntp multiplier = 100
-       # dim ntp divisor = 200
-       # dim named name = named
-       # dim named algorithm = incremental
-       # dim named multiplier = 100
-       # dim named divisor = 200
-       # dim ssh name = ssh
-       # dim ssh algorithm = incremental
-       # dim ssh multiplier = 100
-       # dim ssh divisor = 200
-       # dim nfs name = nfs
-       # dim nfs algorithm = incremental
-       # dim nfs multiplier = 100
-       # dim nfs divisor = 200
-       # dim nginx name = nginx
-       # dim nginx algorithm = incremental
-       # dim nginx multiplier = 100
-       # dim nginx divisor = 200
-       # dim postfix name = postfix
-       # dim postfix algorithm = incremental
-       # dim postfix multiplier = 100
-       # dim postfix divisor = 200
-       # dim mysql name = mysql
-       # dim mysql algorithm = incremental
-       # dim mysql multiplier = 100
-       # dim mysql divisor = 200
-       # dim rsync name = rsync
-       # dim rsync algorithm = incremental
-       # dim rsync multiplier = 100
-       # dim rsync divisor = 200
-       # dim compile name = compile
-       # dim compile algorithm = incremental
-       # dim compile multiplier = 100
-       # dim compile divisor = 200
-[apps.cpu_system]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/apps.cpu_system
-       # chart type = stacked
-       # type = apps
-       # family = cpu
-       # context = apps.cpu_system
-       # units = cpu time %
-       # priority = 20021
-       # gap when lost iterations above = 1
-       # name = apps.cpu_system
-       # title = Apps CPU System Time (200% = 2 cores) (apps.cpu_system)
-       # dim other name = other
-       # dim other algorithm = incremental
-       # dim other multiplier = 100
-       # dim other divisor = 200
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = incremental
-       # dim ksmd multiplier = 100
-       # dim ksmd divisor = 200
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 100
-       # dim system divisor = 200
-       # dim netdata name = netdata
-       # dim netdata algorithm = incremental
-       # dim netdata multiplier = 100
-       # dim netdata divisor = 200
-       # dim kernel name = kernel
-       # dim kernel algorithm = incremental
-       # dim kernel multiplier = 100
-       # dim kernel divisor = 200
-       # dim cron name = cron
-       # dim cron algorithm = incremental
-       # dim cron multiplier = 100
-       # dim cron divisor = 200
-       # dim inetd name = inetd
-       # dim inetd algorithm = incremental
-       # dim inetd multiplier = 100
-       # dim inetd divisor = 200
-       # dim nms name = nms
-       # dim nms algorithm = incremental
-       # dim nms multiplier = 100
-       # dim nms divisor = 200
-       # dim log name = log
-       # dim log algorithm = incremental
-       # dim log multiplier = 100
-       # dim log divisor = 200
-       # dim ntp name = ntp
-       # dim ntp algorithm = incremental
-       # dim ntp multiplier = 100
-       # dim ntp divisor = 200
-       # dim named name = named
-       # dim named algorithm = incremental
-       # dim named multiplier = 100
-       # dim named divisor = 200
-       # dim ssh name = ssh
-       # dim ssh algorithm = incremental
-       # dim ssh multiplier = 100
-       # dim ssh divisor = 200
-       # dim nfs name = nfs
-       # dim nfs algorithm = incremental
-       # dim nfs multiplier = 100
-       # dim nfs divisor = 200
-       # dim nginx name = nginx
-       # dim nginx algorithm = incremental
-       # dim nginx multiplier = 100
-       # dim nginx divisor = 200
-       # dim postfix name = postfix
-       # dim postfix algorithm = incremental
-       # dim postfix multiplier = 100
-       # dim postfix divisor = 200
-       # dim mysql name = mysql
-       # dim mysql algorithm = incremental
-       # dim mysql multiplier = 100
-       # dim mysql divisor = 200
-       # dim rsync name = rsync
-       # dim rsync algorithm = incremental
-       # dim rsync multiplier = 100
-       # dim rsync divisor = 200
-       # dim compile name = compile
-       # dim compile algorithm = incremental
-       # dim compile multiplier = 100
-       # dim compile divisor = 200
-[apps.major_faults]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/apps.major_faults
-       # chart type = stacked
-       # type = apps
-       # family = swap
-       # context = apps.major_faults
-       # units = page faults/s
-       # priority = 20010
-       # gap when lost iterations above = 1
-       # name = apps.major_faults
-       # title = Apps Major Page Faults (swap read) (apps.major_faults)
-       # dim other name = other
-       # dim other algorithm = incremental
-       # dim other multiplier = 1
-       # dim other divisor = 1
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = incremental
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 1
-       # dim system divisor = 1
-       # dim netdata name = netdata
-       # dim netdata algorithm = incremental
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1
-       # dim kernel name = kernel
-       # dim kernel algorithm = incremental
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1
-       # dim cron name = cron
-       # dim cron algorithm = incremental
-       # dim cron multiplier = 1
-       # dim cron divisor = 1
-       # dim inetd name = inetd
-       # dim inetd algorithm = incremental
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1
-       # dim nms name = nms
-       # dim nms algorithm = incremental
-       # dim nms multiplier = 1
-       # dim nms divisor = 1
-       # dim log name = log
-       # dim log algorithm = incremental
-       # dim log multiplier = 1
-       # dim log divisor = 1
-       # dim ntp name = ntp
-       # dim ntp algorithm = incremental
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1
-       # dim named name = named
-       # dim named algorithm = incremental
-       # dim named multiplier = 1
-       # dim named divisor = 1
-       # dim ssh name = ssh
-       # dim ssh algorithm = incremental
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1
-       # dim nfs name = nfs
-       # dim nfs algorithm = incremental
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1
-       # dim nginx name = nginx
-       # dim nginx algorithm = incremental
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1
-       # dim postfix name = postfix
-       # dim postfix algorithm = incremental
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1
-       # dim mysql name = mysql
-       # dim mysql algorithm = incremental
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1
-       # dim rsync name = rsync
-       # dim rsync algorithm = incremental
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1
-       # dim compile name = compile
-       # dim compile algorithm = incremental
-       # dim compile multiplier = 1
-       # dim compile divisor = 1
-[apps.minor_faults]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/apps.minor_faults
-       # chart type = stacked
-       # type = apps
-       # family = mem
-       # context = apps.minor_faults
-       # units = page faults/s
-       # priority = 20011
-       # gap when lost iterations above = 1
-       # name = apps.minor_faults
-       # title = Apps Minor Page Faults (apps.minor_faults)
-       # dim other name = other
-       # dim other algorithm = incremental
-       # dim other multiplier = 1
-       # dim other divisor = 1
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = incremental
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 1
-       # dim system divisor = 1
-       # dim netdata name = netdata
-       # dim netdata algorithm = incremental
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1
-       # dim kernel name = kernel
-       # dim kernel algorithm = incremental
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1
-       # dim cron name = cron
-       # dim cron algorithm = incremental
-       # dim cron multiplier = 1
-       # dim cron divisor = 1
-       # dim inetd name = inetd
-       # dim inetd algorithm = incremental
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1
-       # dim nms name = nms
-       # dim nms algorithm = incremental
-       # dim nms multiplier = 1
-       # dim nms divisor = 1
-       # dim log name = log
-       # dim log algorithm = incremental
-       # dim log multiplier = 1
-       # dim log divisor = 1
-       # dim ntp name = ntp
-       # dim ntp algorithm = incremental
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1
-       # dim named name = named
-       # dim named algorithm = incremental
-       # dim named multiplier = 1
-       # dim named divisor = 1
-       # dim ssh name = ssh
-       # dim ssh algorithm = incremental
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1
-       # dim nfs name = nfs
-       # dim nfs algorithm = incremental
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1
-       # dim nginx name = nginx
-       # dim nginx algorithm = incremental
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1
-       # dim postfix name = postfix
-       # dim postfix algorithm = incremental
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1
-       # dim mysql name = mysql
-       # dim mysql algorithm = incremental
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1
-       # dim rsync name = rsync
-       # dim rsync algorithm = incremental
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1
-       # dim compile name = compile
-       # dim compile algorithm = incremental
-       # dim compile multiplier = 1
-       # dim compile divisor = 1
-[apps.lreads]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/apps.lreads
-       # chart type = stacked
-       # type = apps
-       # family = disk
-       # context = apps.lreads
-       # units = kilobytes/s
-       # priority = 20042
-       # gap when lost iterations above = 1
-       # name = apps.lreads
-       # title = Apps Disk Logical Reads (apps.lreads)
-       # dim other name = other
-       # dim other algorithm = incremental
-       # dim other multiplier = 1
-       # dim other divisor = 1024
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = incremental
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1024
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 1
-       # dim system divisor = 1024
-       # dim netdata name = netdata
-       # dim netdata algorithm = incremental
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1024
-       # dim kernel name = kernel
-       # dim kernel algorithm = incremental
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1024
-       # dim cron name = cron
-       # dim cron algorithm = incremental
-       # dim cron multiplier = 1
-       # dim cron divisor = 1024
-       # dim inetd name = inetd
-       # dim inetd algorithm = incremental
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1024
-       # dim nms name = nms
-       # dim nms algorithm = incremental
-       # dim nms multiplier = 1
-       # dim nms divisor = 1024
-       # dim log name = log
-       # dim log algorithm = incremental
-       # dim log multiplier = 1
-       # dim log divisor = 1024
-       # dim ntp name = ntp
-       # dim ntp algorithm = incremental
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1024
-       # dim named name = named
-       # dim named algorithm = incremental
-       # dim named multiplier = 1
-       # dim named divisor = 1024
-       # dim ssh name = ssh
-       # dim ssh algorithm = incremental
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1024
-       # dim nfs name = nfs
-       # dim nfs algorithm = incremental
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1024
-       # dim nginx name = nginx
-       # dim nginx algorithm = incremental
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1024
-       # dim postfix name = postfix
-       # dim postfix algorithm = incremental
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1024
-       # dim mysql name = mysql
-       # dim mysql algorithm = incremental
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1024
-       # dim rsync name = rsync
-       # dim rsync algorithm = incremental
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1024
-       # dim compile name = compile
-       # dim compile algorithm = incremental
-       # dim compile multiplier = 1
-       # dim compile divisor = 1024
-[apps.lwrites]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/apps.lwrites
-       # chart type = stacked
-       # type = apps
-       # family = disk
-       # context = apps.lwrites
-       # units = kilobytes/s
-       # priority = 20042
-       # gap when lost iterations above = 1
-       # name = apps.lwrites
-       # title = Apps I/O Logical Writes (apps.lwrites)
-       # dim other name = other
-       # dim other algorithm = incremental
-       # dim other multiplier = 1
-       # dim other divisor = 1024
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = incremental
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1024
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 1
-       # dim system divisor = 1024
-       # dim netdata name = netdata
-       # dim netdata algorithm = incremental
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1024
-       # dim kernel name = kernel
-       # dim kernel algorithm = incremental
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1024
-       # dim cron name = cron
-       # dim cron algorithm = incremental
-       # dim cron multiplier = 1
-       # dim cron divisor = 1024
-       # dim inetd name = inetd
-       # dim inetd algorithm = incremental
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1024
-       # dim nms name = nms
-       # dim nms algorithm = incremental
-       # dim nms multiplier = 1
-       # dim nms divisor = 1024
-       # dim log name = log
-       # dim log algorithm = incremental
-       # dim log multiplier = 1
-       # dim log divisor = 1024
-       # dim ntp name = ntp
-       # dim ntp algorithm = incremental
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1024
-       # dim named name = named
-       # dim named algorithm = incremental
-       # dim named multiplier = 1
-       # dim named divisor = 1024
-       # dim ssh name = ssh
-       # dim ssh algorithm = incremental
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1024
-       # dim nfs name = nfs
-       # dim nfs algorithm = incremental
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1024
-       # dim nginx name = nginx
-       # dim nginx algorithm = incremental
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1024
-       # dim postfix name = postfix
-       # dim postfix algorithm = incremental
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1024
-       # dim mysql name = mysql
-       # dim mysql algorithm = incremental
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1024
-       # dim rsync name = rsync
-       # dim rsync algorithm = incremental
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1024
-       # dim compile name = compile
-       # dim compile algorithm = incremental
-       # dim compile multiplier = 1
-       # dim compile divisor = 1024
-[apps.preads]
+[plugin:tc]
-       # history = 86400
+        # script to run to get tc values = /usr/libexec/netdata/plugins.d/tc-qos-helper.sh
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/apps.preads
-       # chart type = stacked
-       # type = apps
-       # family = disk
-       # context = apps.preads
-       # units = kilobytes/s
-       # priority = 20002
-       # gap when lost iterations above = 1
-       # name = apps.preads
-       # title = Apps Disk Reads (apps.preads)
-       # dim other name = other
-       # dim other algorithm = incremental
-       # dim other multiplier = 1
-       # dim other divisor = 1024
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = incremental
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1024
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 1
-       # dim system divisor = 1024
-       # dim netdata name = netdata
-       # dim netdata algorithm = incremental
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1024
-       # dim kernel name = kernel
-       # dim kernel algorithm = incremental
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1024
-       # dim cron name = cron
-       # dim cron algorithm = incremental
-       # dim cron multiplier = 1
-       # dim cron divisor = 1024
-       # dim inetd name = inetd
-       # dim inetd algorithm = incremental
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1024
-       # dim nms name = nms
-       # dim nms algorithm = incremental
-       # dim nms multiplier = 1
-       # dim nms divisor = 1024
-       # dim log name = log
-       # dim log algorithm = incremental
-       # dim log multiplier = 1
-       # dim log divisor = 1024
-       # dim ntp name = ntp
-       # dim ntp algorithm = incremental
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1024
-       # dim named name = named
-       # dim named algorithm = incremental
-       # dim named multiplier = 1
-       # dim named divisor = 1024
-       # dim ssh name = ssh
-       # dim ssh algorithm = incremental
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1024
-       # dim nfs name = nfs
-       # dim nfs algorithm = incremental
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1024
-       # dim nginx name = nginx
-       # dim nginx algorithm = incremental
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1024
-       # dim postfix name = postfix
-       # dim postfix algorithm = incremental
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1024
-       # dim mysql name = mysql
-       # dim mysql algorithm = incremental
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1024
-       # dim rsync name = rsync
-       # dim rsync algorithm = incremental
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1024
-       # dim compile name = compile
-       # dim compile algorithm = incremental
-       # dim compile multiplier = 1
-       # dim compile divisor = 1024
-[apps.pwrites]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/apps.pwrites
-       # chart type = stacked
-       # type = apps
-       # family = disk
-       # context = apps.pwrites
-       # units = kilobytes/s
-       # priority = 20002
-       # gap when lost iterations above = 1
-       # name = apps.pwrites
-       # title = Apps Disk Writes (apps.pwrites)
-       # dim other name = other
-       # dim other algorithm = incremental
-       # dim other multiplier = 1
-       # dim other divisor = 1024
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = incremental
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1024
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 1
-       # dim system divisor = 1024
-       # dim netdata name = netdata
-       # dim netdata algorithm = incremental
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1024
-       # dim kernel name = kernel
-       # dim kernel algorithm = incremental
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1024
-       # dim cron name = cron
-       # dim cron algorithm = incremental
-       # dim cron multiplier = 1
-       # dim cron divisor = 1024
-       # dim inetd name = inetd
-       # dim inetd algorithm = incremental
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1024
-       # dim nms name = nms
-       # dim nms algorithm = incremental
-       # dim nms multiplier = 1
-       # dim nms divisor = 1024
-       # dim log name = log
-       # dim log algorithm = incremental
-       # dim log multiplier = 1
-       # dim log divisor = 1024
-       # dim ntp name = ntp
-       # dim ntp algorithm = incremental
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1024
-       # dim named name = named
-       # dim named algorithm = incremental
-       # dim named multiplier = 1
-       # dim named divisor = 1024
-       # dim ssh name = ssh
-       # dim ssh algorithm = incremental
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1024
-       # dim nfs name = nfs
-       # dim nfs algorithm = incremental
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1024
-       # dim nginx name = nginx
-       # dim nginx algorithm = incremental
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1024
-       # dim postfix name = postfix
-       # dim postfix algorithm = incremental
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1024
-       # dim mysql name = mysql
-       # dim mysql algorithm = incremental
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1024
-       # dim rsync name = rsync
-       # dim rsync algorithm = incremental
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1024
-       # dim compile name = compile
-       # dim compile algorithm = incremental
-       # dim compile multiplier = 1
-       # dim compile divisor = 1024
-[apps.files]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/apps.files
-       # chart type = stacked
-       # type = apps
-       # family = disk
-       # context = apps.files
-       # units = open files
-       # priority = 20050
-       # gap when lost iterations above = 1
-       # name = apps.files
-       # title = Apps Open Files (apps.files)
-       # dim other name = other
-       # dim other algorithm = absolute
-       # dim other multiplier = 1
-       # dim other divisor = 1
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = absolute
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1
-       # dim system name = system
-       # dim system algorithm = absolute
-       # dim system multiplier = 1
-       # dim system divisor = 1
-       # dim netdata name = netdata
-       # dim netdata algorithm = absolute
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1
-       # dim kernel name = kernel
-       # dim kernel algorithm = absolute
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1
-       # dim cron name = cron
-       # dim cron algorithm = absolute
-       # dim cron multiplier = 1
-       # dim cron divisor = 1
-       # dim inetd name = inetd
-       # dim inetd algorithm = absolute
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1
-       # dim nms name = nms
-       # dim nms algorithm = absolute
-       # dim nms multiplier = 1
-       # dim nms divisor = 1
-       # dim log name = log
-       # dim log algorithm = absolute
-       # dim log multiplier = 1
-       # dim log divisor = 1
-       # dim ntp name = ntp
-       # dim ntp algorithm = absolute
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1
-       # dim named name = named
-       # dim named algorithm = absolute
-       # dim named multiplier = 1
-       # dim named divisor = 1
-       # dim ssh name = ssh
-       # dim ssh algorithm = absolute
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1
-       # dim nfs name = nfs
-       # dim nfs algorithm = absolute
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1
-       # dim nginx name = nginx
-       # dim nginx algorithm = absolute
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1
-       # dim postfix name = postfix
-       # dim postfix algorithm = absolute
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1
-       # dim mysql name = mysql
-       # dim mysql algorithm = absolute
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1
-       # dim rsync name = rsync
-       # dim rsync algorithm = absolute
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1
-       # dim compile name = compile
-       # dim compile algorithm = absolute
-       # dim compile multiplier = 1
-       # dim compile divisor = 1
-[apps.sockets]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/apps.sockets
-       # chart type = stacked
-       # type = apps
-       # family = net
-       # context = apps.sockets
-       # units = open sockets
-       # priority = 20051
-       # gap when lost iterations above = 1
-       # name = apps.sockets
-       # title = Apps Open Sockets (apps.sockets)
-       # dim other name = other
-       # dim other algorithm = absolute
-       # dim other multiplier = 1
-       # dim other divisor = 1
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = absolute
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1
-       # dim system name = system
-       # dim system algorithm = absolute
-       # dim system multiplier = 1
-       # dim system divisor = 1
-       # dim netdata name = netdata
-       # dim netdata algorithm = absolute
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1
-       # dim kernel name = kernel
-       # dim kernel algorithm = absolute
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1
-       # dim cron name = cron
-       # dim cron algorithm = absolute
-       # dim cron multiplier = 1
-       # dim cron divisor = 1
-       # dim inetd name = inetd
-       # dim inetd algorithm = absolute
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1
-       # dim nms name = nms
-       # dim nms algorithm = absolute
-       # dim nms multiplier = 1
-       # dim nms divisor = 1
-       # dim log name = log
-       # dim log algorithm = absolute
-       # dim log multiplier = 1
-       # dim log divisor = 1
-       # dim ntp name = ntp
-       # dim ntp algorithm = absolute
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1
-       # dim named name = named
-       # dim named algorithm = absolute
-       # dim named multiplier = 1
-       # dim named divisor = 1
-       # dim ssh name = ssh
-       # dim ssh algorithm = absolute
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1
-       # dim nfs name = nfs
-       # dim nfs algorithm = absolute
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1
-       # dim nginx name = nginx
-       # dim nginx algorithm = absolute
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1
-       # dim postfix name = postfix
-       # dim postfix algorithm = absolute
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1
-       # dim mysql name = mysql
-       # dim mysql algorithm = absolute
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1
-       # dim rsync name = rsync
-       # dim rsync algorithm = absolute
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1
-       # dim compile name = compile
-       # dim compile algorithm = absolute
-       # dim compile multiplier = 1
-       # dim compile divisor = 1
-[apps.pipes]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/apps.pipes
-       # chart type = stacked
-       # type = apps
-       # family = processes
-       # context = apps.pipes
-       # units = open pipes
-       # priority = 20053
-       # gap when lost iterations above = 1
-       # name = apps.pipes
-       # title = Apps Pipes (apps.pipes)
-       # dim other name = other
-       # dim other algorithm = absolute
-       # dim other multiplier = 1
-       # dim other divisor = 1
-       # dim ksmd name = ksmd
-       # dim ksmd algorithm = absolute
-       # dim ksmd multiplier = 1
-       # dim ksmd divisor = 1
-       # dim system name = system
-       # dim system algorithm = absolute
-       # dim system multiplier = 1
-       # dim system divisor = 1
-       # dim netdata name = netdata
-       # dim netdata algorithm = absolute
-       # dim netdata multiplier = 1
-       # dim netdata divisor = 1
-       # dim kernel name = kernel
-       # dim kernel algorithm = absolute
-       # dim kernel multiplier = 1
-       # dim kernel divisor = 1
-       # dim cron name = cron
-       # dim cron algorithm = absolute
-       # dim cron multiplier = 1
-       # dim cron divisor = 1
-       # dim inetd name = inetd
-       # dim inetd algorithm = absolute
-       # dim inetd multiplier = 1
-       # dim inetd divisor = 1
-       # dim nms name = nms
-       # dim nms algorithm = absolute
-       # dim nms multiplier = 1
-       # dim nms divisor = 1
-       # dim log name = log
-       # dim log algorithm = absolute
-       # dim log multiplier = 1
-       # dim log divisor = 1
-       # dim ntp name = ntp
-       # dim ntp algorithm = absolute
-       # dim ntp multiplier = 1
-       # dim ntp divisor = 1
-       # dim named name = named
-       # dim named algorithm = absolute
-       # dim named multiplier = 1
-       # dim named divisor = 1
-       # dim ssh name = ssh
-       # dim ssh algorithm = absolute
-       # dim ssh multiplier = 1
-       # dim ssh divisor = 1
-       # dim nfs name = nfs
-       # dim nfs algorithm = absolute
-       # dim nfs multiplier = 1
-       # dim nfs divisor = 1
-       # dim nginx name = nginx
-       # dim nginx algorithm = absolute
-       # dim nginx multiplier = 1
-       # dim nginx divisor = 1
-       # dim postfix name = postfix
-       # dim postfix algorithm = absolute
-       # dim postfix multiplier = 1
-       # dim postfix divisor = 1
-       # dim mysql name = mysql
-       # dim mysql algorithm = absolute
-       # dim mysql multiplier = 1
-       # dim mysql divisor = 1
-       # dim rsync name = rsync
-       # dim rsync algorithm = absolute
-       # dim rsync multiplier = 1
-       # dim rsync divisor = 1
-       # dim compile name = compile
-       # dim compile algorithm = absolute
-       # dim compile multiplier = 1
-       # dim compile divisor = 1
-[netdata.apps_cpu]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/netdata.apps_cpu
-       # chart type = stacked
-       # type = netdata
-       # family = apps.plugin
-       # context = netdata.apps_cpu
-       # units = milliseconds/s
-       # priority = 140000
-       # gap when lost iterations above = 1
-       # name = netdata.apps_cpu
-       # title = Apps Plugin CPU (netdata.apps_cpu)
-       # dim user name = user
-       # dim user algorithm = incremental
-       # dim user multiplier = 1
-       # dim user divisor = 1000
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 1
-       # dim system divisor = 1000
-[netdata.apps_files]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netdata.apps_files
-       # chart type = line
-       # type = netdata
-       # family = apps.plugin
-       # context = netdata.apps_files
-       # units = files/s
-       # priority = 140001
-       # gap when lost iterations above = 1
-       # name = netdata.apps_files
-       # title = Apps Plugin Files (netdata.apps_files)
-       # dim files name = files
-       # dim files algorithm = incremental
-       # dim files multiplier = 1
-       # dim files divisor = 1
-       # dim pids name = pids
-       # dim pids algorithm = absolute
-       # dim pids multiplier = 1
-       # dim pids divisor = 1
-       # dim fds name = fds
-       # dim fds algorithm = absolute
-       # dim fds multiplier = 1
-       # dim fds divisor = 1
-       # dim targets name = targets
-       # dim targets algorithm = absolute
-       # dim targets multiplier = 1
-       # dim targets divisor = 1
-[netdata.plugin_tc_cpu]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netdata.plugin_tc_cpu
-       # chart type = stacked
-       # type = netdata
-       # family = tc.helper
-       # context = netdata.plugin_tc_cpu
-       # units = milliseconds/s
-       # priority = 135000
-       # gap when lost iterations above = 1
-       # name = netdata.plugin_tc_cpu
-       # title = NetData TC CPU usage (netdata.plugin_tc_cpu)
-       # dim user name = user
-       # dim user algorithm = incremental
-       # dim user multiplier = 1
-       # dim user divisor = 1000
-       # dim system name = system
-       # dim system algorithm = incremental
-       # dim system multiplier = 1
-       # dim system divisor = 1000
-[netdata.plugin_tc_time]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netdata.plugin_tc_time
-       # chart type = area
-       # type = netdata
-       # family = tc.helper
-       # context = netdata.plugin_tc_time
-       # units = milliseconds/run
-       # priority = 135001
-       # gap when lost iterations above = 1
-       # name = netdata.plugin_tc_time
-       # title = NetData TC script execution (netdata.plugin_tc_time)
-       # dim run_time name = run time
-       # dim run_time algorithm = absolute
-       # dim run_time multiplier = 1
-       # dim run_time divisor = 1
-[example.random]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/example.random
-       # chart type = stacked
-       # type = example
-       # family = random
-       # context = random
-       # units = % of random numbers
-       # priority = 150000
-       # gap when lost iterations above = 1
-       # name = example.random
-       # title = Random Numbers Stacked Chart (example.random)
-       # dim random1 name = random1
-       # dim random1 algorithm = percentage-of-absolute-row
-       # dim random1 multiplier = 1
-       # dim random1 divisor = 1
-       # dim random2 name = random2
-       # dim random2 algorithm = percentage-of-absolute-row
-       # dim random2 multiplier = 1
-       # dim random2 divisor = 1
-       # dim random3 name = random3
-       # dim random3 algorithm = percentage-of-absolute-row
-       # dim random3 multiplier = 1
-       # dim random3 divisor = 1
-[postfix.qemails]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/postfix.qemails
-       # chart type = line
-       # type = postfix
-       # family = queue
-       # context = postfix.queued.emails
-       # units = emails
-       # priority = 60001
-       # gap when lost iterations above = 1
-       # name = postfix.qemails
-       # title = Postfix Queue Emails (postfix.qemails)
-       # dim emails name = emails
-       # dim emails algorithm = absolute
-       # dim emails multiplier = 1
-       # dim emails divisor = 1
-[postfix.qsize]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/postfix.qsize
-       # chart type = area
-       # type = postfix
-       # family = queue
-       # context = postfix.queued.size
-       # units = emails size in KB
-       # priority = 60002
-       # gap when lost iterations above = 1
-       # name = postfix.qsize
-       # title = Postfix Queue Emails Size (postfix.qsize)
-       # dim size name = size
-       # dim size algorithm = absolute
-       # dim size multiplier = 1
-       # dim size divisor = 1
-[disk_await.sda]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/disk_await.sda
-       # chart type = line
-       # type = disk_await
-       # family = sda
-       # context = disk.await
-       # units = ms per operation
-       # priority = 2005
-       # gap when lost iterations above = 1
-       # name = disk_await.sda
-       # title = Average Completed I/O Operation Time (disk_await.sda)
-       # dim reads name = reads
-       # dim reads algorithm = absolute
-       # dim reads multiplier = 1
-       # dim reads divisor = 1
-       # dim writes name = writes
-       # dim writes algorithm = absolute
-       # dim writes multiplier = -1
-       # dim writes divisor = 1
-[disk_avgsz.sda]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/disk_avgsz.sda
-       # chart type = area
-       # type = disk_avgsz
-       # family = sda
-       # context = disk.avgsz
-       # units = kilobytes per operation
-       # priority = 2006
-       # gap when lost iterations above = 1
-       # name = disk_avgsz.sda
-       # title = Average Completed I/O Operation Bandwidth (disk_avgsz.sda)
-       # dim reads name = reads
-       # dim reads algorithm = absolute
-       # dim reads multiplier = 512
-       # dim reads divisor = 1024
-       # dim writes name = writes
-       # dim writes algorithm = absolute
-       # dim writes multiplier = -512
-       # dim writes divisor = 1024
-[disk_svctm.sda]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/disk_svctm.sda
-       # chart type = line
-       # type = disk_svctm
-       # family = sda
-       # context = disk.svctm
-       # units = ms per operation
-       # priority = 2007
-       # gap when lost iterations above = 1
-       # name = disk_svctm.sda
-       # title = Average Service Time (disk_svctm.sda)
-       # dim svctm name = svctm
-       # dim svctm algorithm = absolute
-       # dim svctm multiplier = 1
-       # dim svctm divisor = 1
-[tc.eth1-ifb]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/tc.eth1_ifb
-       # chart type = stacked
-       # type = tc
-       # family = eth1
-       # context = tc.qos
-       # units = kilobits/s
-       # priority = 7000
-       # gap when lost iterations above = 1
-       # name = tc.mng_in
-       # title = Class Usage (tc.mng_in)
-       # dim 1:18 name = client
-       # dim 1:18 algorithm = incremental
-       # dim 1:18 multiplier = 8
-       # dim 1:18 divisor = 1024
-       # dim 1:19 name = nms
-       # dim 1:19 algorithm = incremental
-       # dim 1:19 multiplier = 8
-       # dim 1:19 divisor = 1024
-       # dim 1:8000 name = default
-       # dim 1:8000 algorithm = incremental
-       # dim 1:8000 multiplier = 8
-       # dim 1:8000 divisor = 1024
-       # dim 1:16 name = rsync
-       # dim 1:16 algorithm = incremental
-       # dim 1:16 multiplier = 8
-       # dim 1:16 divisor = 1024
-       # dim 1:17 name = web_server
-       # dim 1:17 algorithm = incremental
-       # dim 1:17 multiplier = 8
-       # dim 1:17 divisor = 1024
-       # dim 1:14 name = ntp
-       # dim 1:14 algorithm = incremental
-       # dim 1:14 multiplier = 8
-       # dim 1:14 divisor = 1024
-       # dim 1:15 name = ssh
-       # dim 1:15 algorithm = incremental
-       # dim 1:15 multiplier = 8
-       # dim 1:15 divisor = 1024
-       # dim 1:12 name = icmp
-       # dim 1:12 algorithm = incremental
-       # dim 1:12 multiplier = 8
-       # dim 1:12 divisor = 1024
-       # dim 1:13 name = dns
-       # dim 1:13 algorithm = incremental
-       # dim 1:13 multiplier = 8
-       # dim 1:13 divisor = 1024
-       # dim 1:11 name = arp
-       # dim 1:11 algorithm = incremental
-       # dim 1:11 multiplier = 8
-       # dim 1:11 divisor = 1024
-[tc.eth0]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/tc.eth0
-       # chart type = stacked
-       # type = tc
-       # family = eth0
-       # context = tc.qos
-       # units = kilobits/s
-       # priority = 7000
-       # gap when lost iterations above = 1
-       # name = tc.world_out
-       # title = Class Usage (tc.world_out)
-       # dim 1:18 name = client
-       # dim 1:18 algorithm = incremental
-       # dim 1:18 multiplier = 8
-       # dim 1:18 divisor = 1024
-       # dim 1:19 name = nms
-       # dim 1:19 algorithm = incremental
-       # dim 1:19 multiplier = 8
-       # dim 1:19 divisor = 1024
-       # dim 1:8000 name = default
-       # dim 1:8000 algorithm = incremental
-       # dim 1:8000 multiplier = 8
-       # dim 1:8000 divisor = 1024
-       # dim 1:16 name = rsync
-       # dim 1:16 algorithm = incremental
-       # dim 1:16 multiplier = 8
-       # dim 1:16 divisor = 1024
-       # dim 1:17 name = web_server
-       # dim 1:17 algorithm = incremental
-       # dim 1:17 multiplier = 8
-       # dim 1:17 divisor = 1024
-       # dim 1:14 name = ntp
-       # dim 1:14 algorithm = incremental
-       # dim 1:14 multiplier = 8
-       # dim 1:14 divisor = 1024
-       # dim 1:15 name = ssh
-       # dim 1:15 algorithm = incremental
-       # dim 1:15 multiplier = 8
-       # dim 1:15 divisor = 1024
-       # dim 1:12 name = icmp
-       # dim 1:12 algorithm = incremental
-       # dim 1:12 multiplier = 8
-       # dim 1:12 divisor = 1024
-       # dim 1:13 name = dns
-       # dim 1:13 algorithm = incremental
-       # dim 1:13 multiplier = 8
-       # dim 1:13 divisor = 1024
-       # dim 1:11 name = arp
-       # dim 1:11 algorithm = incremental
-       # dim 1:11 multiplier = 8
-       # dim 1:11 divisor = 1024
-[tc.eth1]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/tc.eth1
-       # chart type = stacked
-       # type = tc
-       # family = eth1
-       # context = tc.qos
-       # units = kilobits/s
-       # priority = 7000
-       # gap when lost iterations above = 1
-       # name = tc.mng_out
-       # title = Class Usage (tc.mng_out)
-       # dim 1:18 name = client
-       # dim 1:18 algorithm = incremental
-       # dim 1:18 multiplier = 8
-       # dim 1:18 divisor = 1024
-       # dim 1:19 name = nms
-       # dim 1:19 algorithm = incremental
-       # dim 1:19 multiplier = 8
-       # dim 1:19 divisor = 1024
-       # dim 1:8000 name = default
-       # dim 1:8000 algorithm = incremental
-       # dim 1:8000 multiplier = 8
-       # dim 1:8000 divisor = 1024
-       # dim 1:16 name = rsync
-       # dim 1:16 algorithm = incremental
-       # dim 1:16 multiplier = 8
-       # dim 1:16 divisor = 1024
-       # dim 1:17 name = web_server
-       # dim 1:17 algorithm = incremental
-       # dim 1:17 multiplier = 8
-       # dim 1:17 divisor = 1024
-       # dim 1:14 name = ntp
-       # dim 1:14 algorithm = incremental
-       # dim 1:14 multiplier = 8
-       # dim 1:14 divisor = 1024
-       # dim 1:15 name = ssh
-       # dim 1:15 algorithm = incremental
-       # dim 1:15 multiplier = 8
-       # dim 1:15 divisor = 1024
-       # dim 1:12 name = icmp
-       # dim 1:12 algorithm = incremental
-       # dim 1:12 multiplier = 8
-       # dim 1:12 divisor = 1024
-       # dim 1:13 name = dns
-       # dim 1:13 algorithm = incremental
-       # dim 1:13 multiplier = 8
-       # dim 1:13 divisor = 1024
-       # dim 1:11 name = arp
-       # dim 1:11 algorithm = incremental
-       # dim 1:11 multiplier = 8
-       # dim 1:11 divisor = 1024
-[mem.ksm]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/mem.ksm
-       # chart type = area
-       # type = mem
-       # family = ksm
-       # context = mem.ksm
-       # units = MB
-       # priority = 5000
-       # gap when lost iterations above = 1
-       # name = mem.ksm
-       # title = Kernel Same Page Merging (mem.ksm)
-       # dim shared name = shared
-       # dim shared algorithm = absolute
-       # dim shared multiplier = 1
-       # dim shared divisor = 1048576
-       # dim unshared name = unshared
-       # dim unshared algorithm = absolute
-       # dim unshared multiplier = -1
-       # dim unshared divisor = 1048576
-       # dim sharing name = sharing
-       # dim sharing algorithm = absolute
-       # dim sharing multiplier = 1
-       # dim sharing divisor = 1048576
-       # dim volatile name = volatile
-       # dim volatile algorithm = absolute
-       # dim volatile multiplier = -1
-       # dim volatile divisor = 1048576
-       # dim to_scan name = to scan
-       # dim to_scan algorithm = absolute
-       # dim to_scan multiplier = -1
-       # dim to_scan divisor = 1048576
-[mem.ksm_savings]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/mem.ksm_savings
-       # chart type = area
-       # type = mem
-       # family = ksm
-       # context = mem.ksm_savings
-       # units = MB
-       # priority = 5001
-       # gap when lost iterations above = 1
-       # name = mem.ksm_savings
-       # title = Kernel Same Page Merging Savings (mem.ksm_savings)
-       # dim savings name = savings
-       # dim savings algorithm = absolute
-       # dim savings multiplier = -1
-       # dim savings divisor = 1048576
-       # dim offered name = offered
-       # dim offered algorithm = absolute
-       # dim offered multiplier = 1
-       # dim offered divisor = 1048576
-[mem.ksm_ratios]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/mem.ksm_ratios
-       # chart type = line
-       # type = mem
-       # family = ksm
-       # context = mem.ksm_ratios
-       # units = percentage
-       # priority = 5002
-       # gap when lost iterations above = 1
-       # name = mem.ksm_ratios
-       # title = Kernel Same Page Merging Effectiveness (mem.ksm_ratios)
-       # dim savings name = savings
-       # dim savings algorithm = absolute
-       # dim savings multiplier = 1
-       # dim savings divisor = 10000
-[system.load]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/system.load
-       # chart type = line
-       # type = system
-       # family = load
-       # context = system.load
-       # units = load
-       # priority = 100
-       # gap when lost iterations above = 1
-       # name = system.load
-       # title = System Load Average (system.load)
-       # dim load1 name = load1
-       # dim load1 algorithm = absolute
-       # dim load1 multiplier = 1
-       # dim load1 divisor = 1000
-       # dim load5 name = load5
-       # dim load5 algorithm = absolute
-       # dim load5 multiplier = 1
-       # dim load5 divisor = 1000
-       # dim load15 name = load15
-       # dim load15 algorithm = absolute
-       # dim load15 multiplier = 1
-       # dim load15 divisor = 1000
-[tc.eth0-ifb]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/tc.eth0_ifb
-       # chart type = stacked
-       # type = tc
-       # family = eth0
-       # context = tc.qos
-       # units = kilobits/s
-       # priority = 7000
-       # gap when lost iterations above = 1
-       # name = tc.world_in
-       # title = Class Usage (tc.world_in)
-       # dim 1:18 name = client
-       # dim 1:18 algorithm = incremental
-       # dim 1:18 multiplier = 8
-       # dim 1:18 divisor = 1024
-       # dim 1:19 name = nms
-       # dim 1:19 algorithm = incremental
-       # dim 1:19 multiplier = 8
-       # dim 1:19 divisor = 1024
-       # dim 1:8000 name = default
-       # dim 1:8000 algorithm = incremental
-       # dim 1:8000 multiplier = 8
-       # dim 1:8000 divisor = 1024
-       # dim 1:16 name = rsync
-       # dim 1:16 algorithm = incremental
-       # dim 1:16 multiplier = 8
-       # dim 1:16 divisor = 1024
-       # dim 1:17 name = web_server
-       # dim 1:17 algorithm = incremental
-       # dim 1:17 multiplier = 8
-       # dim 1:17 divisor = 1024
-       # dim 1:14 name = ntp
-       # dim 1:14 algorithm = incremental
-       # dim 1:14 multiplier = 8
-       # dim 1:14 divisor = 1024
-       # dim 1:15 name = ssh
-       # dim 1:15 algorithm = incremental
-       # dim 1:15 multiplier = 8
-       # dim 1:15 divisor = 1024
-       # dim 1:12 name = icmp
-       # dim 1:12 algorithm = incremental
-       # dim 1:12 multiplier = 8
-       # dim 1:12 divisor = 1024
-       # dim 1:13 name = dns
-       # dim 1:13 algorithm = incremental
-       # dim 1:13 multiplier = 8
-       # dim 1:13 divisor = 1024
-       # dim 1:11 name = arp
-       # dim 1:11 algorithm = incremental
-       # dim 1:11 multiplier = 8
-       # dim 1:11 divisor = 1024
-[system.active_processes]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/system.active_processes
-       # chart type = line
-       # type = system
-       # family = processes
-       # context = system.active_processes
-       # units = processes
-       # priority = 750
-       # gap when lost iterations above = 1
-       # name = system.active_processes
-       # title = System Active Processes (system.active_processes)
-       # dim active name = active
-       # dim active algorithm = absolute
-       # dim active multiplier = 1
-       # dim active divisor = 1
-[cpu.cpu0_interrupts]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/cpu.cpu0_interrupts
-       # chart type = stacked
-       # type = cpu
-       # family = interrupts
-       # context = cpu.interrupts
-       # units = interrupts/s
-       # priority = 2000
-       # gap when lost iterations above = 1
-       # name = cpu.cpu0_interrupts
-       # title = CPU0 Interrupts (cpu.cpu0_interrupts)
-       # dim 0 name = timer_0
-       # dim 0 algorithm = incremental
-       # dim 0 multiplier = 1
-       # dim 0 divisor = 1
-       # dim 1 name = i8042_1
-       # dim 1 algorithm = incremental
-       # dim 1 multiplier = 1
-       # dim 1 divisor = 1
-       # dim 6 name = floppy_6
-       # dim 6 algorithm = incremental
-       # dim 6 multiplier = 1
-       # dim 6 divisor = 1
-       # dim 8 name = rtc0_8
-       # dim 8 algorithm = incremental
-       # dim 8 multiplier = 1
-       # dim 8 divisor = 1
-       # dim 9 name = acpi_9
-       # dim 9 algorithm = incremental
-       # dim 9 multiplier = 1
-       # dim 9 divisor = 1
-       # dim 12 name = i8042_12
-       # dim 12 algorithm = incremental
-       # dim 12 multiplier = 1
-       # dim 12 divisor = 1
-       # dim 14 name = ata_piix_14
-       # dim 14 algorithm = incremental
-       # dim 14 multiplier = 1
-       # dim 14 divisor = 1
-       # dim 15 name = ata_piix_15
-       # dim 15 algorithm = incremental
-       # dim 15 multiplier = 1
-       # dim 15 divisor = 1
-       # dim NMI name = NMI
-       # dim NMI algorithm = incremental
-       # dim NMI multiplier = 1
-       # dim NMI divisor = 1
-       # dim LOC name = LOC
-       # dim LOC algorithm = incremental
-       # dim LOC multiplier = 1
-       # dim LOC divisor = 1
-       # dim SPU name = SPU
-       # dim SPU algorithm = incremental
-       # dim SPU multiplier = 1
-       # dim SPU divisor = 1
-       # dim PMI name = PMI
-       # dim PMI algorithm = incremental
-       # dim PMI multiplier = 1
-       # dim PMI divisor = 1
-       # dim IWI name = IWI
-       # dim IWI algorithm = incremental
-       # dim IWI multiplier = 1
-       # dim IWI divisor = 1
-       # dim RTR name = RTR
-       # dim RTR algorithm = incremental
-       # dim RTR multiplier = 1
-       # dim RTR divisor = 1
-       # dim RES name = RES
-       # dim RES algorithm = incremental
-       # dim RES multiplier = 1
-       # dim RES divisor = 1
-       # dim CAL name = CAL
-       # dim CAL algorithm = incremental
-       # dim CAL multiplier = 1
-       # dim CAL divisor = 1
-       # dim TLB name = TLB
-       # dim TLB algorithm = incremental
-       # dim TLB multiplier = 1
-       # dim TLB divisor = 1
-       # dim TRM name = TRM
-       # dim TRM algorithm = incremental
-       # dim TRM multiplier = 1
-       # dim TRM divisor = 1
-       # dim THR name = THR
-       # dim THR algorithm = incremental
-       # dim THR multiplier = 1
-       # dim THR divisor = 1
-       # dim MCE name = MCE
-       # dim MCE algorithm = incremental
-       # dim MCE multiplier = 1
-       # dim MCE divisor = 1
-       # dim MCP name = MCP
-       # dim MCP algorithm = incremental
-       # dim MCP multiplier = 1
-       # dim MCP divisor = 1
-       # dim HYP name = HYP
-       # dim HYP algorithm = incremental
-       # dim HYP multiplier = 1
-       # dim HYP divisor = 1
-       # dim ERR name = ERR
-       # dim ERR algorithm = incremental
-       # dim ERR multiplier = 1
-       # dim ERR divisor = 1
-       # dim MIS name = MIS
-       # dim MIS algorithm = incremental
-       # dim MIS multiplier = 1
-       # dim MIS divisor = 1
-[cpu.cpu1_interrupts]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/cpu.cpu1_interrupts
-       # chart type = stacked
-       # type = cpu
-       # family = interrupts
-       # context = cpu.interrupts
-       # units = interrupts/s
-       # priority = 2001
-       # gap when lost iterations above = 1
-       # name = cpu.cpu1_interrupts
-       # title = CPU1 Interrupts (cpu.cpu1_interrupts)
-       # dim 0 name = timer_0
-       # dim 0 algorithm = incremental
-       # dim 0 multiplier = 1
-       # dim 0 divisor = 1
-       # dim 1 name = i8042_1
-       # dim 1 algorithm = incremental
-       # dim 1 multiplier = 1
-       # dim 1 divisor = 1
-       # dim 6 name = floppy_6
-       # dim 6 algorithm = incremental
-       # dim 6 multiplier = 1
-       # dim 6 divisor = 1
-       # dim 8 name = rtc0_8
-       # dim 8 algorithm = incremental
-       # dim 8 multiplier = 1
-       # dim 8 divisor = 1
-       # dim 9 name = acpi_9
-       # dim 9 algorithm = incremental
-       # dim 9 multiplier = 1
-       # dim 9 divisor = 1
-       # dim 12 name = i8042_12
-       # dim 12 algorithm = incremental
-       # dim 12 multiplier = 1
-       # dim 12 divisor = 1
-       # dim 14 name = ata_piix_14
-       # dim 14 algorithm = incremental
-       # dim 14 multiplier = 1
-       # dim 14 divisor = 1
-       # dim 15 name = ata_piix_15
-       # dim 15 algorithm = incremental
-       # dim 15 multiplier = 1
-       # dim 15 divisor = 1
-       # dim NMI name = NMI
-       # dim NMI algorithm = incremental
-       # dim NMI multiplier = 1
-       # dim NMI divisor = 1
-       # dim LOC name = LOC
-       # dim LOC algorithm = incremental
-       # dim LOC multiplier = 1
-       # dim LOC divisor = 1
-       # dim SPU name = SPU
-       # dim SPU algorithm = incremental
-       # dim SPU multiplier = 1
-       # dim SPU divisor = 1
-       # dim PMI name = PMI
-       # dim PMI algorithm = incremental
-       # dim PMI multiplier = 1
-       # dim PMI divisor = 1
-       # dim IWI name = IWI
-       # dim IWI algorithm = incremental
-       # dim IWI multiplier = 1
-       # dim IWI divisor = 1
-       # dim RTR name = RTR
-       # dim RTR algorithm = incremental
-       # dim RTR multiplier = 1
-       # dim RTR divisor = 1
-       # dim RES name = RES
-       # dim RES algorithm = incremental
-       # dim RES multiplier = 1
-       # dim RES divisor = 1
-       # dim CAL name = CAL
-       # dim CAL algorithm = incremental
-       # dim CAL multiplier = 1
-       # dim CAL divisor = 1
-       # dim TLB name = TLB
-       # dim TLB algorithm = incremental
-       # dim TLB multiplier = 1
-       # dim TLB divisor = 1
-       # dim TRM name = TRM
-       # dim TRM algorithm = incremental
-       # dim TRM multiplier = 1
-       # dim TRM divisor = 1
-       # dim THR name = THR
-       # dim THR algorithm = incremental
-       # dim THR multiplier = 1
-       # dim THR divisor = 1
-       # dim MCE name = MCE
-       # dim MCE algorithm = incremental
-       # dim MCE multiplier = 1
-       # dim MCE divisor = 1
-       # dim MCP name = MCP
-       # dim MCP algorithm = incremental
-       # dim MCP multiplier = 1
-       # dim MCP divisor = 1
-       # dim HYP name = HYP
-       # dim HYP algorithm = incremental
-       # dim HYP multiplier = 1
-       # dim HYP divisor = 1
-       # dim ERR name = ERR
-       # dim ERR algorithm = incremental
-       # dim ERR multiplier = 1
-       # dim ERR divisor = 1
-       # dim MIS name = MIS
-       # dim MIS algorithm = incremental
-       # dim MIS multiplier = 1
-       # dim MIS divisor = 1
-[example.random2]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/example.random2
-       # chart type = area
-       # type = example
-       # family = random
-       # context = random
-       # units = random number
-       # priority = 150001
-       # gap when lost iterations above = 1
-       # name = example.random2
-       # title = A random number (example.random2)
-       # dim random name = random
-       # dim random algorithm = absolute
-       # dim random multiplier = 1
-       # dim random divisor = 1
-[mysql_local.net]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.net
-       # chart type = area
-       # type = mysql_local
-       # family = bandwidth
-       # context = mysql.net
-       # units = kilobits/s
-       # priority = 60001
-       # gap when lost iterations above = 1
-       # name = mysql_local.net
-       # title = mysql Bandwidth (mysql_local.net)
-       # dim Bytes_received name = in
-       # dim Bytes_received algorithm = incremental
-       # dim Bytes_received multiplier = 8
-       # dim Bytes_received divisor = 1024
-       # dim Bytes_sent name = out
-       # dim Bytes_sent algorithm = incremental
-       # dim Bytes_sent multiplier = -8
-       # dim Bytes_sent divisor = 1024
-[mysql_local.queries]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.queries
-       # chart type = line
-       # type = mysql_local
-       # family = queries
-       # context = mysql.queries
-       # units = queries/s
-       # priority = 60002
-       # gap when lost iterations above = 1
-       # name = mysql_local.queries
-       # title = mysql Queries (mysql_local.queries)
-       # dim Queries name = queries
-       # dim Queries algorithm = incremental
-       # dim Queries multiplier = 1
-       # dim Queries divisor = 1
-       # dim Questions name = questions
-       # dim Questions algorithm = incremental
-       # dim Questions multiplier = 1
-       # dim Questions divisor = 1
-       # dim Slow_queries name = slow_queries
-       # dim Slow_queries algorithm = incremental
-       # dim Slow_queries multiplier = -1
-       # dim Slow_queries divisor = 1
-[mysql_local.handlers]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.handlers
-       # chart type = line
-       # type = mysql_local
-       # family = handlers
-       # context = mysql.handlers
-       # units = handlers/s
-       # priority = 60003
-       # gap when lost iterations above = 1
-       # name = mysql_local.handlers
-       # title = mysql Handlers (mysql_local.handlers)
-       # dim Handler_commit name = commit
-       # dim Handler_commit algorithm = incremental
-       # dim Handler_commit multiplier = 1
-       # dim Handler_commit divisor = 1
-       # dim Handler_delete name = delete
-       # dim Handler_delete algorithm = incremental
-       # dim Handler_delete multiplier = 1
-       # dim Handler_delete divisor = 1
-       # dim Handler_prepare name = prepare
-       # dim Handler_prepare algorithm = incremental
-       # dim Handler_prepare multiplier = 1
-       # dim Handler_prepare divisor = 1
-       # dim Handler_read_first name = read_first
-       # dim Handler_read_first algorithm = incremental
-       # dim Handler_read_first multiplier = 1
-       # dim Handler_read_first divisor = 1
-       # dim Handler_read_key name = read_key
-       # dim Handler_read_key algorithm = incremental
-       # dim Handler_read_key multiplier = 1
-       # dim Handler_read_key divisor = 1
-       # dim Handler_read_next name = read_next
-       # dim Handler_read_next algorithm = incremental
-       # dim Handler_read_next multiplier = 1
-       # dim Handler_read_next divisor = 1
-       # dim Handler_read_prev name = read_prev
-       # dim Handler_read_prev algorithm = incremental
-       # dim Handler_read_prev multiplier = 1
-       # dim Handler_read_prev divisor = 1
-       # dim Handler_read_rnd name = read_rnd
-       # dim Handler_read_rnd algorithm = incremental
-       # dim Handler_read_rnd multiplier = 1
-       # dim Handler_read_rnd divisor = 1
-       # dim Handler_read_rnd_next name = read_rnd_next
-       # dim Handler_read_rnd_next algorithm = incremental
-       # dim Handler_read_rnd_next multiplier = 1
-       # dim Handler_read_rnd_next divisor = 1
-       # dim Handler_rollback name = rollback
-       # dim Handler_rollback algorithm = incremental
-       # dim Handler_rollback multiplier = 1
-       # dim Handler_rollback divisor = 1
-       # dim Handler_savepoint name = savepoint
-       # dim Handler_savepoint algorithm = incremental
-       # dim Handler_savepoint multiplier = 1
-       # dim Handler_savepoint divisor = 1
-       # dim Handler_savepoint_rollback name = savepoint_rollback
-       # dim Handler_savepoint_rollback algorithm = incremental
-       # dim Handler_savepoint_rollback multiplier = 1
-       # dim Handler_savepoint_rollback divisor = 1
-       # dim Handler_update name = update
-       # dim Handler_update algorithm = incremental
-       # dim Handler_update multiplier = 1
-       # dim Handler_update divisor = 1
-       # dim Handler_write name = write
-       # dim Handler_write algorithm = incremental
-       # dim Handler_write multiplier = 1
-       # dim Handler_write divisor = 1
-[system.softirqs]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/system.softirqs
-       # chart type = stacked
-       # type = system
-       # family = softirqs
-       # context = system.softirqs
-       # units = softirqs/s
-       # priority = 950
-       # gap when lost iterations above = 1
-       # name = system.softirqs
-       # title = System softirqs (system.softirqs)
-       # dim HI name = HI
-       # dim HI algorithm = incremental
-       # dim HI multiplier = 1
-       # dim HI divisor = 1
-       # dim TIMER name = TIMER
-       # dim TIMER algorithm = incremental
-       # dim TIMER multiplier = 1
-       # dim TIMER divisor = 1
-       # dim NET_TX name = NET_TX
-       # dim NET_TX algorithm = incremental
-       # dim NET_TX multiplier = 1
-       # dim NET_TX divisor = 1
-       # dim NET_RX name = NET_RX
-       # dim NET_RX algorithm = incremental
-       # dim NET_RX multiplier = 1
-       # dim NET_RX divisor = 1
-       # dim BLOCK name = BLOCK
-       # dim BLOCK algorithm = incremental
-       # dim BLOCK multiplier = 1
-       # dim BLOCK divisor = 1
-       # dim BLOCK_IOPOLL name = BLOCK_IOPOLL
-       # dim BLOCK_IOPOLL algorithm = incremental
-       # dim BLOCK_IOPOLL multiplier = 1
-       # dim BLOCK_IOPOLL divisor = 1
-       # dim TASKLET name = TASKLET
-       # dim TASKLET algorithm = incremental
-       # dim TASKLET multiplier = 1
-       # dim TASKLET divisor = 1
-       # dim SCHED name = SCHED
-       # dim SCHED algorithm = incremental
-       # dim SCHED multiplier = 1
-       # dim SCHED divisor = 1
-       # dim HRTIMER name = HRTIMER
-       # dim HRTIMER algorithm = incremental
-       # dim HRTIMER multiplier = 1
-       # dim HRTIMER divisor = 1
-       # dim RCU name = RCU
-       # dim RCU algorithm = incremental
-       # dim RCU multiplier = 1
-       # dim RCU divisor = 1
-[cpu.cpu0_softirqs]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/cpu.cpu0_softirqs
-       # chart type = stacked
-       # type = cpu
-       # family = softirqs
-       # context = cpu.softirqs
-       # units = softirqs/s
-       # priority = 3000
-       # gap when lost iterations above = 1
-       # name = cpu.cpu0_softirqs
-       # title = CPU0 softirqs (cpu.cpu0_softirqs)
-       # dim HI name = HI
-       # dim HI algorithm = incremental
-       # dim HI multiplier = 1
-       # dim HI divisor = 1
-       # dim TIMER name = TIMER
-       # dim TIMER algorithm = incremental
-       # dim TIMER multiplier = 1
-       # dim TIMER divisor = 1
-       # dim NET_TX name = NET_TX
-       # dim NET_TX algorithm = incremental
-       # dim NET_TX multiplier = 1
-       # dim NET_TX divisor = 1
-       # dim NET_RX name = NET_RX
-       # dim NET_RX algorithm = incremental
-       # dim NET_RX multiplier = 1
-       # dim NET_RX divisor = 1
-       # dim BLOCK name = BLOCK
-       # dim BLOCK algorithm = incremental
-       # dim BLOCK multiplier = 1
-       # dim BLOCK divisor = 1
-       # dim BLOCK_IOPOLL name = BLOCK_IOPOLL
-       # dim BLOCK_IOPOLL algorithm = incremental
-       # dim BLOCK_IOPOLL multiplier = 1
-       # dim BLOCK_IOPOLL divisor = 1
-       # dim TASKLET name = TASKLET
-       # dim TASKLET algorithm = incremental
-       # dim TASKLET multiplier = 1
-       # dim TASKLET divisor = 1
-       # dim SCHED name = SCHED
-       # dim SCHED algorithm = incremental
-       # dim SCHED multiplier = 1
-       # dim SCHED divisor = 1
-       # dim HRTIMER name = HRTIMER
-       # dim HRTIMER algorithm = incremental
-       # dim HRTIMER multiplier = 1
-       # dim HRTIMER divisor = 1
-       # dim RCU name = RCU
-       # dim RCU algorithm = incremental
-       # dim RCU multiplier = 1
-       # dim RCU divisor = 1
-[mysql_local.table_locks]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.table_locks
-       # chart type = line
-       # type = mysql_local
-       # family = locks
-       # context = mysql.table_locks
-       # units = locks/s
-       # priority = 60004
-       # gap when lost iterations above = 1
-       # name = mysql_local.table_locks
-       # title = mysql Tables Locks (mysql_local.table_locks)
-       # dim Table_locks_immediate name = immediate
-       # dim Table_locks_immediate algorithm = incremental
-       # dim Table_locks_immediate multiplier = 1
-       # dim Table_locks_immediate divisor = 1
-       # dim Table_locks_waited name = waited
-       # dim Table_locks_waited algorithm = incremental
-       # dim Table_locks_waited multiplier = -1
-       # dim Table_locks_waited divisor = 1
-[mysql_local.join_issues]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.join_issues
-       # chart type = line
-       # type = mysql_local
-       # family = issues
-       # context = mysql.join_issues
-       # units = joins/s
-       # priority = 60005
-       # gap when lost iterations above = 1
-       # name = mysql_local.join_issues
-       # title = mysql Select Join Issues (mysql_local.join_issues)
-       # dim Select_full_join name = full_join
-       # dim Select_full_join algorithm = incremental
-       # dim Select_full_join multiplier = 1
-       # dim Select_full_join divisor = 1
-       # dim Select_full_range_join name = full_range_join
-       # dim Select_full_range_join algorithm = incremental
-       # dim Select_full_range_join multiplier = 1
-       # dim Select_full_range_join divisor = 1
-       # dim Select_range name = range
-       # dim Select_range algorithm = incremental
-       # dim Select_range multiplier = 1
-       # dim Select_range divisor = 1
-       # dim Select_range_check name = range_check
-       # dim Select_range_check algorithm = incremental
-       # dim Select_range_check multiplier = 1
-       # dim Select_range_check divisor = 1
-       # dim Select_scan name = scan
-       # dim Select_scan algorithm = incremental
-       # dim Select_scan multiplier = 1
-       # dim Select_scan divisor = 1
-[cpu.cpu1_softirqs]
-       # history = 86400
-       # enabled = yes
-       # cache directory = /var/cache/netdata/cpu.cpu1_softirqs
-       # chart type = stacked
-       # type = cpu
-       # family = softirqs
-       # context = cpu.softirqs
-       # units = softirqs/s
-       # priority = 3001
-       # gap when lost iterations above = 1
-       # name = cpu.cpu1_softirqs
-       # title = CPU1 softirqs (cpu.cpu1_softirqs)
-       # dim HI name = HI
-       # dim HI algorithm = incremental
-       # dim HI multiplier = 1
-       # dim HI divisor = 1
-       # dim TIMER name = TIMER
-       # dim TIMER algorithm = incremental
-       # dim TIMER multiplier = 1
-       # dim TIMER divisor = 1
-       # dim NET_TX name = NET_TX
-       # dim NET_TX algorithm = incremental
-       # dim NET_TX multiplier = 1
-       # dim NET_TX divisor = 1
-       # dim NET_RX name = NET_RX
-       # dim NET_RX algorithm = incremental
-       # dim NET_RX multiplier = 1
-       # dim NET_RX divisor = 1
-       # dim BLOCK name = BLOCK
-       # dim BLOCK algorithm = incremental
-       # dim BLOCK multiplier = 1
-       # dim BLOCK divisor = 1
-       # dim BLOCK_IOPOLL name = BLOCK_IOPOLL
-       # dim BLOCK_IOPOLL algorithm = incremental
-       # dim BLOCK_IOPOLL multiplier = 1
-       # dim BLOCK_IOPOLL divisor = 1
-       # dim TASKLET name = TASKLET
-       # dim TASKLET algorithm = incremental
-       # dim TASKLET multiplier = 1
-       # dim TASKLET divisor = 1
-       # dim SCHED name = SCHED
-       # dim SCHED algorithm = incremental
-       # dim SCHED multiplier = 1
-       # dim SCHED divisor = 1
-       # dim HRTIMER name = HRTIMER
-       # dim HRTIMER algorithm = incremental
-       # dim HRTIMER multiplier = 1
-       # dim HRTIMER divisor = 1
-       # dim RCU name = RCU
-       # dim RCU algorithm = incremental
-       # dim RCU multiplier = 1
-       # dim RCU divisor = 1
-[mysql_local.sort_issues]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.sort_issues
-       # chart type = line
-       # type = mysql_local
-       # family = issues
-       # context = mysql.sort.issues
-       # units = issues/s
-       # priority = 60006
-       # gap when lost iterations above = 1
-       # name = mysql_local.sort_issues
-       # title = mysql Sort Issues (mysql_local.sort_issues)
-       # dim Sort_merge_passes name = merge_passes
-       # dim Sort_merge_passes algorithm = incremental
-       # dim Sort_merge_passes multiplier = 1
-       # dim Sort_merge_passes divisor = 1
-       # dim Sort_range name = range
-       # dim Sort_range algorithm = incremental
-       # dim Sort_range multiplier = 1
-       # dim Sort_range divisor = 1
-       # dim Sort_scan name = scan
-       # dim Sort_scan algorithm = incremental
-       # dim Sort_scan multiplier = 1
-       # dim Sort_scan divisor = 1
-[mysql_local.tmp]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.tmp
-       # chart type = line
-       # type = mysql_local
-       # family = temporaries
-       # context = mysql.tmp
-       # units = counter
-       # priority = 60007
-       # gap when lost iterations above = 1
-       # name = mysql_local.tmp
-       # title = mysql Tmp Operations (mysql_local.tmp)
-       # dim Created_tmp_disk_tables name = disk_tables
-       # dim Created_tmp_disk_tables algorithm = incremental
-       # dim Created_tmp_disk_tables multiplier = 1
-       # dim Created_tmp_disk_tables divisor = 1
-       # dim Created_tmp_files name = files
-       # dim Created_tmp_files algorithm = incremental
-       # dim Created_tmp_files multiplier = 1
-       # dim Created_tmp_files divisor = 1
-       # dim Created_tmp_tables name = tables
-       # dim Created_tmp_tables algorithm = incremental
-       # dim Created_tmp_tables multiplier = 1
-       # dim Created_tmp_tables divisor = 1
-[mysql_local.connections]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.connections
-       # chart type = line
-       # type = mysql_local
-       # family = connections
-       # context = mysql.connections
-       # units = connections/s
-       # priority = 60008
-       # gap when lost iterations above = 1
-       # name = mysql_local.connections
-       # title = mysql Connections (mysql_local.connections)
-       # dim Connections name = all
-       # dim Connections algorithm = incremental
-       # dim Connections multiplier = 1
-       # dim Connections divisor = 1
-       # dim Aborted_connects name = aborded
-       # dim Aborted_connects algorithm = incremental
-       # dim Aborted_connects multiplier = 1
-       # dim Aborted_connects divisor = 1
-[mysql_local.binlog_cache]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.binlog_cache
-       # chart type = line
-       # type = mysql_local
-       # family = binlog
-       # context = mysql.binlog_cache
-       # units = transactions/s
-       # priority = 60009
-       # gap when lost iterations above = 1
-       # name = mysql_local.binlog_cache
-       # title = mysql Binlog Cache (mysql_local.binlog_cache)
-       # dim Binlog_cache_disk_use name = disk
-       # dim Binlog_cache_disk_use algorithm = incremental
-       # dim Binlog_cache_disk_use multiplier = 1
-       # dim Binlog_cache_disk_use divisor = 1
-       # dim Binlog_cache_use name = all
-       # dim Binlog_cache_use algorithm = incremental
-       # dim Binlog_cache_use multiplier = 1
-       # dim Binlog_cache_use divisor = 1
-[mysql_local.threads]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.threads
-       # chart type = line
-       # type = mysql_local
-       # family = threads
-       # context = mysql.threads
-       # units = threads
-       # priority = 60010
-       # gap when lost iterations above = 1
-       # name = mysql_local.threads
-       # title = mysql Threads (mysql_local.threads)
-       # dim Threads_connected name = connected
-       # dim Threads_connected algorithm = absolute
-       # dim Threads_connected multiplier = 1
-       # dim Threads_connected divisor = 1
-       # dim Threads_created name = created
-       # dim Threads_created algorithm = incremental
-       # dim Threads_created multiplier = 1
-       # dim Threads_created divisor = 1
-       # dim Threads_cached name = cached
-       # dim Threads_cached algorithm = absolute
-       # dim Threads_cached multiplier = -1
-       # dim Threads_cached divisor = 1
-       # dim Threads_running name = running
-       # dim Threads_running algorithm = absolute
-       # dim Threads_running multiplier = 1
-       # dim Threads_running divisor = 1
-[mysql_local.thread_cache_misses]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.thread_cache_misses
-       # chart type = area
-       # type = mysql_local
-       # family = threads
-       # context = mysql.thread_cache_misses
-       # units = misses
-       # priority = 60011
-       # gap when lost iterations above = 1
-       # name = mysql_local.thread_cache_misses
-       # title = mysql Threads Cache Misses (mysql_local.thread_cache_misses)
-       # dim misses name = misses
-       # dim misses algorithm = absolute
-       # dim misses multiplier = 1
-       # dim misses divisor = 100
-[mysql_local.innodb_io]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.innodb_io
-       # chart type = area
-       # type = mysql_local
-       # family = innodb
-       # context = mysql.innodb_io
-       # units = kilobytes/s
-       # priority = 60012
-       # gap when lost iterations above = 1
-       # name = mysql_local.innodb_io
-       # title = mysql InnoDB I/O Bandwidth (mysql_local.innodb_io)
-       # dim Innodb_data_read name = read
-       # dim Innodb_data_read algorithm = incremental
-       # dim Innodb_data_read multiplier = 1
-       # dim Innodb_data_read divisor = 1024
-       # dim Innodb_data_written name = write
-       # dim Innodb_data_written algorithm = incremental
-       # dim Innodb_data_written multiplier = -1
-       # dim Innodb_data_written divisor = 1024
-[mysql_local.innodb_io_ops]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.innodb_io_ops
-       # chart type = line
-       # type = mysql_local
-       # family = innodb
-       # context = mysql.innodb_io_ops
-       # units = operations/s
-       # priority = 60013
-       # gap when lost iterations above = 1
-       # name = mysql_local.innodb_io_ops
-       # title = mysql InnoDB I/O Operations (mysql_local.innodb_io_ops)
-       # dim Innodb_data_reads name = reads
-       # dim Innodb_data_reads algorithm = incremental
-       # dim Innodb_data_reads multiplier = 1
-       # dim Innodb_data_reads divisor = 1
-       # dim Innodb_data_writes name = writes
-       # dim Innodb_data_writes algorithm = incremental
-       # dim Innodb_data_writes multiplier = -1
-       # dim Innodb_data_writes divisor = 1
-       # dim Innodb_data_fsyncs name = fsyncs
-       # dim Innodb_data_fsyncs algorithm = incremental
-       # dim Innodb_data_fsyncs multiplier = 1
-       # dim Innodb_data_fsyncs divisor = 1
-[mysql_local.innodb_io_pending_ops]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.innodb_io_pending_ops
-       # chart type = line
-       # type = mysql_local
-       # family = innodb
-       # context = mysql.innodb_io_pending_ops
-       # units = operations
-       # priority = 60014
-       # gap when lost iterations above = 1
-       # name = mysql_local.innodb_io_pending_ops
-       # title = mysql InnoDB Pending I/O Operations (mysql_local.innodb_io_pending_ops)
-       # dim Innodb_data_pending_reads name = reads
-       # dim Innodb_data_pending_reads algorithm = absolute
-       # dim Innodb_data_pending_reads multiplier = 1
-       # dim Innodb_data_pending_reads divisor = 1
-       # dim Innodb_data_pending_writes name = writes
-       # dim Innodb_data_pending_writes algorithm = absolute
-       # dim Innodb_data_pending_writes multiplier = -1
-       # dim Innodb_data_pending_writes divisor = 1
-       # dim Innodb_data_pending_fsyncs name = fsyncs
-       # dim Innodb_data_pending_fsyncs algorithm = absolute
-       # dim Innodb_data_pending_fsyncs multiplier = 1
-       # dim Innodb_data_pending_fsyncs divisor = 1
-[mysql_local.innodb_log]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.innodb_log
-       # chart type = line
-       # type = mysql_local
-       # family = innodb
-       # context = mysql.innodb_log
-       # units = operations/s
-       # priority = 60015
-       # gap when lost iterations above = 1
-       # name = mysql_local.innodb_log
-       # title = mysql InnoDB Log Operations (mysql_local.innodb_log)
-       # dim Innodb_log_waits name = waits
-       # dim Innodb_log_waits algorithm = incremental
-       # dim Innodb_log_waits multiplier = 1
-       # dim Innodb_log_waits divisor = 1
-       # dim Innodb_log_write_requests name = write_requests
-       # dim Innodb_log_write_requests algorithm = incremental
-       # dim Innodb_log_write_requests multiplier = -1
-       # dim Innodb_log_write_requests divisor = 1
-       # dim Innodb_log_writes name = writes
-       # dim Innodb_log_writes algorithm = incremental
-       # dim Innodb_log_writes multiplier = -1
-       # dim Innodb_log_writes divisor = 1
-[mysql_local.innodb_os_log]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.innodb_os_log
-       # chart type = line
-       # type = mysql_local
-       # family = innodb
-       # context = mysql.innodb_os_log
-       # units = operations
-       # priority = 60016
-       # gap when lost iterations above = 1
-       # name = mysql_local.innodb_os_log
-       # title = mysql InnoDB OS Log Operations (mysql_local.innodb_os_log)
-       # dim Innodb_os_log_fsyncs name = fsyncs
-       # dim Innodb_os_log_fsyncs algorithm = incremental
-       # dim Innodb_os_log_fsyncs multiplier = 1
-       # dim Innodb_os_log_fsyncs divisor = 1
-       # dim Innodb_os_log_pending_fsyncs name = pending_fsyncs
-       # dim Innodb_os_log_pending_fsyncs algorithm = absolute
-       # dim Innodb_os_log_pending_fsyncs multiplier = 1
-       # dim Innodb_os_log_pending_fsyncs divisor = 1
-       # dim Innodb_os_log_pending_writes name = pending_writes
-       # dim Innodb_os_log_pending_writes algorithm = absolute
-       # dim Innodb_os_log_pending_writes multiplier = -1
-       # dim Innodb_os_log_pending_writes divisor = 1
-[mysql_local.innodb_os_log_io]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.innodb_os_log_io
-       # chart type = area
-       # type = mysql_local
-       # family = innodb
-       # context = mysql.innodb_os_log_io
-       # units = kilobytes/s
-       # priority = 60017
-       # gap when lost iterations above = 1
-       # name = mysql_local.innodb_os_log_io
-       # title = mysql InnoDB OS Log Bandwidth (mysql_local.innodb_os_log_io)
-       # dim Innodb_os_log_written name = write
-       # dim Innodb_os_log_written algorithm = incremental
-       # dim Innodb_os_log_written multiplier = -1
-       # dim Innodb_os_log_written divisor = 1024
-[mysql_local.innodb_cur_row_lock]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.innodb_cur_row_lock
-       # chart type = area
-       # type = mysql_local
-       # family = innodb
-       # context = mysql.innodb_cur_row_lock
-       # units = operations
-       # priority = 60018
-       # gap when lost iterations above = 1
-       # name = mysql_local.innodb_cur_row_lock
-       # title = mysql InnoDB Current Row Locks (mysql_local.innodb_cur_row_lock)
-       # dim Innodb_row_lock_current_waits name = current_waits
-       # dim Innodb_row_lock_current_waits algorithm = absolute
-       # dim Innodb_row_lock_current_waits multiplier = 1
-       # dim Innodb_row_lock_current_waits divisor = 1
-[mysql_local.innodb_rows]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.innodb_rows
-       # chart type = area
-       # type = mysql_local
-       # family = innodb
-       # context = mysql.innodb_rows
-       # units = operations/s
-       # priority = 60019
-       # gap when lost iterations above = 1
-       # name = mysql_local.innodb_rows
-       # title = mysql InnoDB Row Operations (mysql_local.innodb_rows)
-       # dim Innodb_rows_read name = read
-       # dim Innodb_rows_read algorithm = incremental
-       # dim Innodb_rows_read multiplier = 1
-       # dim Innodb_rows_read divisor = 1
-       # dim Innodb_rows_deleted name = deleted
-       # dim Innodb_rows_deleted algorithm = incremental
-       # dim Innodb_rows_deleted multiplier = -1
-       # dim Innodb_rows_deleted divisor = 1
-       # dim Innodb_rows_inserted name = inserted
-       # dim Innodb_rows_inserted algorithm = incremental
-       # dim Innodb_rows_inserted multiplier = 1
-       # dim Innodb_rows_inserted divisor = 1
-       # dim Innodb_rows_updated name = updated
-       # dim Innodb_rows_updated algorithm = incremental
-       # dim Innodb_rows_updated multiplier = -1
-       # dim Innodb_rows_updated divisor = 1
-[mysql_local.binlog_stmt_cache]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mysql_local.binlog_stmt_cache
-       # chart type = line
-       # type = mysql_local
-       # family = binlog
-       # context = mysql.binlog_stmt_cache
-       # units = statements/s
-       # priority = 60020
-       # gap when lost iterations above = 1
-       # name = mysql_local.binlog_stmt_cache
-       # title = mysql Binlog Statement Cache (mysql_local.binlog_stmt_cache)
-       # dim Binlog_stmt_cache_disk_use name = disk
-       # dim Binlog_stmt_cache_disk_use algorithm = incremental
-       # dim Binlog_stmt_cache_disk_use multiplier = 1
-       # dim Binlog_stmt_cache_disk_use divisor = 1
-       # dim Binlog_stmt_cache_use name = all
-       # dim Binlog_stmt_cache_use algorithm = incremental
-       # dim Binlog_stmt_cache_use multiplier = 1
-       # dim Binlog_stmt_cache_use divisor = 1
-[system.ipv6]
-       # history = 86400
-       # enabled = yes
-       enabled = yes
-       # cache directory = /var/cache/netdata/system.ipv6
-       # chart type = area
-       # type = system
-       # family = network
-       # context = system.ipv6
-       # units = kilobits/s
-       # priority = 500
-       # gap when lost iterations above = 1
-       # name = system.ipv6
-       # title = IPv6 Bandwidth (system.ipv6)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 8
-       # dim received divisor = 1024
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -8
-       # dim sent divisor = 1024
-[ipv6.packets]
-       # history = 86400
-       # enabled = yes
-       enabled = yes
-       # cache directory = /var/cache/netdata/ipv6.packets
-       # chart type = line
-       # type = ipv6
-       # family = packets
-       # context = ipv6.packets
-       # units = packets/s
-       # priority = 3000
-       # gap when lost iterations above = 1
-       # name = ipv6.packets
-       # title = IPv6 Packets (ipv6.packets)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 1
-       # dim received divisor = 1
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -1
-       # dim sent divisor = 1
-       # dim forwarded name = forwarded
-       # dim forwarded algorithm = incremental
-       # dim forwarded multiplier = 1
-       # dim forwarded divisor = 1
-       # dim delivers name = delivers
-       # dim delivers algorithm = incremental
-       # dim delivers multiplier = -1
-       # dim delivers divisor = 1
-[ipv6.udppackets]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv6.udppackets
-       # chart type = line
-       # type = ipv6
-       # family = udp
-       # context = ipv6.udppackets
-       # units = packets/s
-       # priority = 3601
-       # gap when lost iterations above = 1
-       # name = ipv6.udppackets
-       # title = IPv6 UDP Packets (ipv6.udppackets)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 1
-       # dim received divisor = 1
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -1
-       # dim sent divisor = 1
-[ipv6.mcast]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv6.mcast
-       # chart type = area
-       # type = ipv6
-       # family = multicast
-       # context = ipv6.mcast
-       # units = kilobits/s
-       # priority = 9000
-       # gap when lost iterations above = 1
-       # name = ipv6.mcast
-       # title = IPv6 Multicast Bandwidth (ipv6.mcast)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 8
-       # dim received divisor = 1024
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -8
-       # dim sent divisor = 1024
-[ipv6.mcastpkts]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv6.mcastpkts
-       # chart type = line
-       # type = ipv6
-       # family = multicast
-       # context = ipv6.mcastpkts
-       # units = packets/s
-       # priority = 9500
-       # gap when lost iterations above = 1
-       # name = ipv6.mcastpkts
-       # title = IPv6 Multicast Packets (ipv6.mcastpkts)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 1
-       # dim received divisor = 1
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -1
-       # dim sent divisor = 1
-[nginx.connections]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/nginx.connections
-       # chart type = line
-       # type = nginx
-       # family = nginx
-       # context = nginx.connections
-       # units = connections
-       # priority = 60001
-       # gap when lost iterations above = 1
-       # name = nginx.connections
-       # title = nginx Active Connections (nginx.connections)
-       # dim active name = active
-       # dim active algorithm = absolute
-       # dim active multiplier = 1
-       # dim active divisor = 1
-[ipv6.icmp]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv6.icmp
-       # chart type = line
-       # type = ipv6
-       # family = icmp
-       # context = ipv6.icmp
-       # units = messages/s
-       # priority = 10000
-       # gap when lost iterations above = 1
-       # name = ipv6.icmp
-       # title = IPv6 ICMP Messages (ipv6.icmp)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 1
-       # dim received divisor = 1
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -1
-       # dim sent divisor = 1
-[ipv6.icmprouter]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv6.icmprouter
-       # chart type = line
-       # type = ipv6
-       # family = icmp
-       # context = ipv6.icmprouter
-       # units = messages/s
-       # priority = 10400
-       # gap when lost iterations above = 1
-       # name = ipv6.icmprouter
-       # title = IPv6 Router Messages (ipv6.icmprouter)
-       # dim InSolicits name = InSolicits
-       # dim InSolicits algorithm = incremental
-       # dim InSolicits multiplier = 1
-       # dim InSolicits divisor = 1
-       # dim OutSolicits name = OutSolicits
-       # dim OutSolicits algorithm = incremental
-       # dim OutSolicits multiplier = -1
-       # dim OutSolicits divisor = 1
-       # dim InAdvertisements name = InAdvertisements
-       # dim InAdvertisements algorithm = incremental
-       # dim InAdvertisements multiplier = 1
-       # dim InAdvertisements divisor = 1
-       # dim OutAdvertisements name = OutAdvertisements
-       # dim OutAdvertisements algorithm = incremental
-       # dim OutAdvertisements multiplier = -1
-       # dim OutAdvertisements divisor = 1
-[ipv6.icmpneighbor]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv6.icmpneighbor
-       # chart type = line
-       # type = ipv6
-       # family = icmp
-       # context = ipv6.icmpneighbor
-       # units = messages/s
-       # priority = 10500
-       # gap when lost iterations above = 1
-       # name = ipv6.icmpneighbor
-       # title = IPv6 Neighbor Messages (ipv6.icmpneighbor)
-       # dim InSolicits name = InSolicits
-       # dim InSolicits algorithm = incremental
-       # dim InSolicits multiplier = 1
-       # dim InSolicits divisor = 1
-       # dim OutSolicits name = OutSolicits
-       # dim OutSolicits algorithm = incremental
-       # dim OutSolicits multiplier = -1
-       # dim OutSolicits divisor = 1
-       # dim InAdvertisements name = InAdvertisements
-       # dim InAdvertisements algorithm = incremental
-       # dim InAdvertisements multiplier = 1
-       # dim InAdvertisements divisor = 1
-       # dim OutAdvertisements name = OutAdvertisements
-       # dim OutAdvertisements algorithm = incremental
-       # dim OutAdvertisements multiplier = -1
-       # dim OutAdvertisements divisor = 1
-[ipv6.icmpmldv2]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv6.icmpmldv2
-       # chart type = line
-       # type = ipv6
-       # family = icmp
-       # context = ipv6.icmpmldv2
-       # units = reports/s
-       # priority = 10600
-       # gap when lost iterations above = 1
-       # name = ipv6.icmpmldv2
-       # title = IPv6 ICMP MLDv2 Reports (ipv6.icmpmldv2)
-       # dim received name = received
-       # dim received algorithm = incremental
-       # dim received multiplier = 1
-       # dim received divisor = 1
-       # dim sent name = sent
-       # dim sent algorithm = incremental
-       # dim sent multiplier = -1
-       # dim sent divisor = 1
-[ipv6.icmptypes]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv6.icmptypes
-       # chart type = line
-       # type = ipv6
-       # family = icmp
-       # context = ipv6.icmptypes
-       # units = messages/s
-       # priority = 10700
-       # gap when lost iterations above = 1
-       # name = ipv6.icmptypes
-       # title = IPv6 ICMP Types (ipv6.icmptypes)
-       # dim InType1 name = InType1
-       # dim InType1 algorithm = incremental
-       # dim InType1 multiplier = 1
-       # dim InType1 divisor = 1
-       # dim InType128 name = InType128
-       # dim InType128 algorithm = incremental
-       # dim InType128 multiplier = 1
-       # dim InType128 divisor = 1
-       # dim InType129 name = InType129
-       # dim InType129 algorithm = incremental
-       # dim InType129 multiplier = 1
-       # dim InType129 divisor = 1
-       # dim InType136 name = InType136
-       # dim InType136 algorithm = incremental
-       # dim InType136 multiplier = 1
-       # dim InType136 divisor = 1
-       # dim OutType1 name = OutType1
-       # dim OutType1 algorithm = incremental
-       # dim OutType1 multiplier = -1
-       # dim OutType1 divisor = 1
-       # dim OutType128 name = OutType128
-       # dim OutType128 algorithm = incremental
-       # dim OutType128 multiplier = -1
-       # dim OutType128 divisor = 1
-       # dim OutType129 name = OutType129
-       # dim OutType129 algorithm = incremental
-       # dim OutType129 multiplier = -1
-       # dim OutType129 divisor = 1
-       # dim OutType133 name = OutType133
-       # dim OutType133 algorithm = incremental
-       # dim OutType133 multiplier = -1
-       # dim OutType133 divisor = 1
-       # dim OutType135 name = OutType135
-       # dim OutType135 algorithm = incremental
-       # dim OutType135 multiplier = -1
-       # dim OutType135 divisor = 1
-       # dim OutType143 name = OutType143
-       # dim OutType143 algorithm = incremental
-       # dim OutType143 multiplier = -1
-       # dim OutType143 divisor = 1
-[ipv6.ect]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/ipv6.ect
-       # chart type = line
-       # type = ipv6
-       # family = packets
-       # context = ipv6.ect
-       # units = packets/s
-       # priority = 10800
-       # gap when lost iterations above = 1
-       # name = ipv6.ect
-       # title = IPv6 ECT Packets (ipv6.ect)
-       # dim InNoECTPkts name = InNoECTPkts
-       # dim InNoECTPkts algorithm = incremental
-       # dim InNoECTPkts multiplier = 1
-       # dim InNoECTPkts divisor = 1
-       # dim InECT1Pkts name = InECT1Pkts
-       # dim InECT1Pkts algorithm = incremental
-       # dim InECT1Pkts multiplier = 1
-       # dim InECT1Pkts divisor = 1
-       # dim InECT0Pkts name = InECT0Pkts
-       # dim InECT0Pkts algorithm = incremental
-       # dim InECT0Pkts multiplier = 1
-       # dim InECT0Pkts divisor = 1
-       # dim InCEPkts name = InCEPkts
-       # dim InCEPkts algorithm = incremental
-       # dim InCEPkts multiplier = 1
-       # dim InCEPkts divisor = 1
-[nginx.requests]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/nginx.requests
-       # chart type = line
-       # type = nginx
-       # family = nginx
-       # context = nginx.requests
-       # units = requests/s
-       # priority = 60002
-       # gap when lost iterations above = 1
-       # name = nginx.requests
-       # title = nginx Requests (nginx.requests)
-       # dim requests name = requests
-       # dim requests algorithm = incremental
-       # dim requests multiplier = 1
-       # dim requests divisor = 1
-[nginx.connections_status]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/nginx.connections_status
-       # chart type = line
-       # type = nginx
-       # family = nginx
-       # context = nginx.connections.status
-       # units = connections
-       # priority = 60003
-       # gap when lost iterations above = 1
-       # name = nginx.connections_status
-       # title = nginx Active Connections by Status (nginx.connections_status)
-       # dim reading name = reading
-       # dim reading algorithm = absolute
-       # dim reading multiplier = 1
-       # dim reading divisor = 1
-       # dim writing name = writing
-       # dim writing algorithm = absolute
-       # dim writing multiplier = 1
-       # dim writing divisor = 1
-       # dim waiting name = idle
-       # dim waiting algorithm = absolute
-       # dim waiting multiplier = 1
-       # dim waiting divisor = 1
-[netfilter.sockets]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netfilter.sockets
-       # chart type = line
-       # type = netfilter
-       # family = netfilter
-       # context = netfilter.sockets
-       # units = active connections
-       # priority = 1000
-       # gap when lost iterations above = 1
-       # name = netfilter.sockets
-       # title = Netfilter Connections (netfilter.sockets)
-       # dim connections name = connections
-       # dim connections algorithm = absolute
-       # dim connections multiplier = 1
-       # dim connections divisor = 1
-[nginx.connect_rate]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/nginx.connect_rate
-       # chart type = line
-       # type = nginx
-       # family = nginx
-       # context = nginx.connections.rate
-       # units = connections/s
-       # priority = 60004
-       # gap when lost iterations above = 1
-       # name = nginx.connect_rate
-       # title = nginx Connections Rate (nginx.connect_rate)
-       # dim accepts name = accepted
-       # dim accepts algorithm = incremental
-       # dim accepts multiplier = 1
-       # dim accepts divisor = 1
-       # dim handled name = handled
-       # dim handled algorithm = incremental
-       # dim handled multiplier = 1
-       # dim handled divisor = 1
-[netfilter.new]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netfilter.new
-       # chart type = line
-       # type = netfilter
-       # family = netfilter
-       # context = netfilter.new
-       # units = connections/s
-       # priority = 1001
-       # gap when lost iterations above = 1
-       # name = netfilter.new
-       # title = Netfilter New Connections (netfilter.new)
-       # dim new name = new
-       # dim new algorithm = incremental
-       # dim new multiplier = 1
-       # dim new divisor = 1
-       # dim ignore name = ignore
-       # dim ignore algorithm = incremental
-       # dim ignore multiplier = -1
-       # dim ignore divisor = 1
-       # dim invalid name = invalid
-       # dim invalid algorithm = incremental
-       # dim invalid multiplier = -1
-       # dim invalid divisor = 1
-[netfilter.changes]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netfilter.changes
-       # chart type = line
-       # type = netfilter
-       # family = netfilter
-       # context = netfilter.changes
-       # units = changes/s
-       # priority = 1002
-       # gap when lost iterations above = 1
-       # name = netfilter.changes
-       # title = Netfilter Connection Changes (netfilter.changes)
-       # dim inserted name = inserted
-       # dim inserted algorithm = incremental
-       # dim inserted multiplier = 1
-       # dim inserted divisor = 1
-       # dim deleted name = deleted
-       # dim deleted algorithm = incremental
-       # dim deleted multiplier = -1
-       # dim deleted divisor = 1
-       # dim delete_list name = delete_list
-       # dim delete_list algorithm = incremental
-       # dim delete_list multiplier = -1
-       # dim delete_list divisor = 1
-[netdata.plugin_chartsd_example]
-       # history = 86400
-       # enabled = yes
-       enabled = yes
-       # cache directory = /var/cache/netdata/netdata.plugin_chartsd_example
-       # chart type = area
-       # type = netdata
-       # family = charts.d
-       # context = netdata.plugin_charts
-       # units = milliseconds / run
-       # priority = 145000
-       # gap when lost iterations above = 1
-       # name = netdata.plugin_chartsd_example
-       # title = Execution time for example plugin (netdata.plugin_chartsd_example)
-       # dim run_time name = run time
-       # dim run_time algorithm = absolute
-       # dim run_time multiplier = 1
-       # dim run_time divisor = 1
-[netdata.plugin_chartsd_mysql]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netdata.plugin_chartsd_mysql
-       # chart type = area
-       # type = netdata
-       # family = charts.d
-       # context = netdata.plugin_charts
-       # units = milliseconds / run
-       # priority = 145000
-       # gap when lost iterations above = 1
-       # name = netdata.plugin_chartsd_mysql
-       # title = Execution time for mysql plugin (netdata.plugin_chartsd_mysql)
-       # dim run_time name = run time
-       # dim run_time algorithm = absolute
-       # dim run_time multiplier = 1
-       # dim run_time divisor = 1
-[netdata.plugin_chartsd_nginx]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netdata.plugin_chartsd_nginx
-       # chart type = area
-       # type = netdata
-       # family = charts.d
-       # context = netdata.plugin_charts
-       # units = milliseconds / run
-       # priority = 145000
-       # gap when lost iterations above = 1
-       # name = netdata.plugin_chartsd_nginx
-       # title = Execution time for nginx plugin (netdata.plugin_chartsd_nginx)
-       # dim run_time name = run time
-       # dim run_time algorithm = absolute
-       # dim run_time multiplier = 1
-       # dim run_time divisor = 1
-[netfilter.expect]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netfilter.expect
-       # chart type = line
-       # type = netfilter
-       # family = netfilter
-       # context = netfilter.expect
-       # units = expectations/s
-       # priority = 1003
-       # gap when lost iterations above = 1
-       # name = netfilter.expect
-       # title = Netfilter Connection Expectations (netfilter.expect)
-       # dim created name = created
-       # dim created algorithm = incremental
-       # dim created multiplier = 1
-       # dim created divisor = 1
-       # dim deleted name = deleted
-       # dim deleted algorithm = incremental
-       # dim deleted multiplier = -1
-       # dim deleted divisor = 1
-       # dim new name = new
-       # dim new algorithm = incremental
-       # dim new multiplier = 1
-       # dim new divisor = 1
-[netdata.plugin_chartsd_postfix]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netdata.plugin_chartsd_postfix
-       # chart type = area
-       # type = netdata
-       # family = charts.d
-       # context = netdata.plugin_charts
-       # units = milliseconds / run
-       # priority = 145000
-       # gap when lost iterations above = 1
-       # name = netdata.plugin_chartsd_postfix
-       # title = Execution time for postfix plugin (netdata.plugin_chartsd_postfix)
-       # dim run_time name = run time
-       # dim run_time algorithm = absolute
-       # dim run_time multiplier = 1
-       # dim run_time divisor = 1
-[netfilter.search]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netfilter.search
-       # chart type = line
-       # type = netfilter
-       # family = netfilter
-       # context = netfilter.search
-       # units = searches/s
-       # priority = 1010
-       # gap when lost iterations above = 1
-       # name = netfilter.search
-       # title = Netfilter Connection Searches (netfilter.search)
-       # dim searched name = searched
-       # dim searched algorithm = incremental
-       # dim searched multiplier = 1
-       # dim searched divisor = 1
-       # dim restarted name = restarted
-       # dim restarted algorithm = incremental
-       # dim restarted multiplier = -1
-       # dim restarted divisor = 1
-       # dim found name = found
-       # dim found algorithm = incremental
-       # dim found multiplier = 1
-       # dim found divisor = 1
-[netfilter.errors]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/netfilter.errors
-       # chart type = line
-       # type = netfilter
-       # family = netfilter
-       # context = netfilter.errors
-       # units = events/s
-       # priority = 1005
-       # gap when lost iterations above = 1
-       # name = netfilter.errors
-       # title = Netfilter Errors (netfilter.errors)
-       # dim icmp_error name = icmp_error
-       # dim icmp_error algorithm = incremental
-       # dim icmp_error multiplier = 1
-       # dim icmp_error divisor = 1
-       # dim insert_failed name = insert_failed
-       # dim insert_failed algorithm = incremental
-       # dim insert_failed multiplier = -1
-       # dim insert_failed divisor = 1
-       # dim drop name = drop
-       # dim drop algorithm = incremental
-       # dim drop multiplier = -1
-       # dim drop divisor = 1
-       # dim early_drop name = early_drop
-       # dim early_drop algorithm = incremental
-       # dim early_drop multiplier = -1
-       # dim early_drop divisor = 1
-[mem.pgfaults]
-       # history = 86400
-       # enabled = yes
-       enabled = no
-       # cache directory = /var/cache/netdata/mem.pgfaults
-       # chart type = line
-       # type = mem
-       # family = system
-       # context = mem.pgfaults
-       # units = page faults/s
-       # priority = 500
-       # gap when lost iterations above = 1
-       # name = mem.pgfaults
-       # title = Memory Page Faults (mem.pgfaults)
-       # dim minor name = minor
-       # dim minor algorithm = incremental
-       # dim minor multiplier = 1
-       # dim minor divisor = 1
-       # dim major name = major
-       # dim major algorithm = incremental
-       # dim major multiplier = -1
-       # dim major divisor = 1
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service b/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service
deleted file mode 100644
index f4911f3b6..000000000
--- a/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service
+++ /dev/null
@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-[Unit]
-Description=Real time performance monitoring
-RequiresMountsFor=/var
-After=network.target
-[Service]
-Type=simple
-ExecStartPre=/bin/mkdir -p /var/log/netdata
-ExecStartPre=/bin/chown -R netdata:netdata /var/log/netdata
-ExecStart=/usr/sbin/netdata -D -u netdata
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb
deleted file mode 100644
index 5b38d401c..000000000
--- a/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb
+++ /dev/null
@@ -1,93 +0,0 @@
-SUMMARY = "Real-time performance monitoring"
-DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \
-               Open-source, free, preconfigured, opinionated, and always real-time."
-HOMEPAGE = "https://github.com/netdata/netdata/"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24"
-DEPENDS += "json-c libuv libyaml util-linux zlib lz4"
-SRC_URI = "\
-    https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \
-    file://0001-cmake-Add-check-for-64bit-builtin-atomics.patch \
-    file://netdata.conf \
-    file://netdata.service \
-    file://netdata-volatiles.conf \
-"
-SRC_URI[sha256sum] = "fb970a4b571ffd542b7d24220ef806a4c1b56c535e0f549a9978860a9f1dcc9c"
-UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags"
-UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)"
-S = "${WORKDIR}/${BPN}-v${PV}"
-# Stop sending anonymous statistics to Google Analytics
-NETDATA_ANONYMOUS ??= "enabled"
-inherit pkgconfig cmake useradd systemd
-TARGET_CC_ARCH:append:libc-musl = " -D_LARGEFILE64_SOURCE"
-LIBS:toolchain-clang:x86 = "-latomic"
-LIBS:riscv64 = "-latomic"
-LIBS:riscv32 = "-latomic"
-LIBS:mips = "-latomic"
-export LIBS
-#systemd
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE:${PN} = "netdata.service"
-SYSTEMD_AUTO_ENABLE:${PN} = "enable"
-#User specific
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata"
-PACKAGECONFIG ??= "openssl freeipmi ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-PACKAGECONFIG[brotli] = ",,brotli"
-PACKAGECONFIG[cloud] = "-DENABLE_CLOUD=ON,-DENABLE_CLOUD=OFF,"
-PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl"
-PACKAGECONFIG[freeipmi] = "-DENABLE_PLUGIN_FREEIPMI=ON,-DENABLE_PLUGIN_FREEIPMI=OFF,freeipmi"
-PACKAGECONFIG[nfacct] = "-DENABLE_PLUGIN_NFACCT=ON,-DENABLE_PLUGIN_NFACCT=OFF,libmnl"
-# needs meta-virtualization
-PACKAGECONFIG[xenstat] = "-DENABLE_PLUGIN_XENSTAT=ON,-DENABLE_PLUGIN_XENSTAT=OFF,xen-tools"
-PACKAGECONFIG[cups] = "-DENABLE_PLUGIN_CUPS=ON,-DENABLE_PLUGIN_CUPS=OFF,cups"
-PACKAGECONFIG[systemd] = "-DENABLE_PLUGIN_SYSTEMD_JOURNAL=ON,-DENABLE_PLUGIN_SYSTEMD_JOURNAL=OFF,systemd"
-# ebpf doesn't compile (or detect) the cross compilation well
-EXTRA_OECMAKE += "-DENABLE_PLUGIN_EBPF=OFF -DENABLE_PLUGIN_GO=OFF \
-                  -DENABLE_ACLK=OFF -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=OFF -DCMAKE_INSTALL_PREFIX='${base_prefix}'"
-do_install:append() {
-    #set S UID for plugins
-    chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin
-    rm -rf ${D}/${localstatedir}/
-    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-        # Install systemd unit files
-        install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${UNPACKDIR}/netdata.service ${D}${systemd_unitdir}/system
-        sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service
-        install -Dm 0644 ${UNPACKDIR}/netdata-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/netdata.conf
-    fi
-    # Install default netdata.conf
-    install -d ${D}${sysconfdir}/netdata
-    install -m 0644 ${UNPACKDIR}/netdata.conf ${D}${sysconfdir}/netdata/
-    sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf
-    sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf
-    sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf
-    if [ "${NETDATA_ANONYMOUS}" = "enabled" ]; then
-        touch ${D}${sysconfdir}/netdata/.opt-out-from-anonymous-statistics
-    fi
-    install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata
-    install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata
-    chown -R netdata:netdata ${D}${datadir}/netdata/web
-}
-FILES:${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/"
-RDEPENDS:${PN} = "bash python3-core zlib"
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.47.5.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.47.5.bb
new file mode 100644
index 000000000..7693335da
--- /dev/null
+++ b/meta-webserver/recipes-webadmin/netdata/netdata_1.47.5.bb
@@ -0,0 +1,155 @@
+SUMMARY = "Real-time performance monitoring"
+DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \
+               Open-source, free, preconfigured, opinionated, and always real-time."
+HOMEPAGE = "https://github.com/netdata/netdata/"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24"
+DEPENDS += "\
+    json-c \
+    libuv \
+    libyaml \
+    lz4 \
+    util-linux \
+    zlib \
+    "
+SRC_URI = "\
+    https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \
+    file://0002-Do-not-hardcode-systemd-unit-directories.patch \
+    file://netdata.conf \
+    file://netdata-volatiles.conf \
+    ${@bb.utils.contains('PACKAGECONFIG', 'go', 'file://go.d.conf', '', d)} \
+    "
+SRC_URI[sha256sum] = "8073eee2392f92daa1f8bb5cf13fb988b8c3b52ff9574b50706ff69bdbdb51ce"
+UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags"
+UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>(?!1\.99)\d+(?:\.\d+)*)"
+S = "${UNPACKDIR}/${BPN}-v${PV}"
+# Stop sending anonymous statistics to Google Analytics
+NETDATA_ANONYMOUS ??= "enabled"
+inherit pkgconfig useradd systemd
+# Inherit cmake last to use its do_compile task (and not go's)
+inherit_defer ${@bb.utils.filter("PACKAGECONFIG", "go", d)} cmake
+TARGET_CC_ARCH:append:libc-musl = " -D_LARGEFILE64_SOURCE"
+LIBS:toolchain-clang:x86 = "-latomic"
+LIBS:riscv64 = "-latomic"
+LIBS:riscv32 = "-latomic"
+LIBS:mips = "-latomic"
+export LIBS
+# Skip go.d plugins QA issues
+CFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'go', \
+    '-Wno-aggressive-loop-optimizations -Wno-nonnull -Wno-stringop-overflow' \
+    , '', d)}"
+INSANE_SKIP:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'go', 'already-stripped buildpaths', '', d)}"
+# network is required by go to get dependent packages
+do_compile[network] = "1"
+#systemd
+SYSTEMD_PACKAGES = "${PN}"
+export SERVICE_FILES = "netdata.service netdata-updater.service netdata-updater.timer"
+SYSTEMD_SERVICE:${PN} = "${SERVICE_FILES}"
+SYSTEMD_AUTO_ENABLE:${PN} = "enable"
+#User specific
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata \
+    ${@bb.utils.contains('PACKAGECONFIG','docker','--groups docker','',d)} --user-group netdata"
+PACKAGECONFIG ??= "openssl freeipmi ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[brotli] = ",,brotli"
+PACKAGECONFIG[cloud] = "-DENABLE_CLOUD=ON,-DENABLE_CLOUD=OFF,"
+PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl"
+PACKAGECONFIG[freeipmi] = "-DENABLE_PLUGIN_FREEIPMI=ON,-DENABLE_PLUGIN_FREEIPMI=OFF,freeipmi"
+PACKAGECONFIG[nfacct] = "-DENABLE_PLUGIN_NFACCT=ON,-DENABLE_PLUGIN_NFACCT=OFF,libmnl"
+# needs meta-virtualization
+PACKAGECONFIG[xenstat] = "-DENABLE_PLUGIN_XENSTAT=ON,-DENABLE_PLUGIN_XENSTAT=OFF,xen-tools"
+PACKAGECONFIG[cups] = "-DENABLE_PLUGIN_CUPS=ON,-DENABLE_PLUGIN_CUPS=OFF,cups"
+PACKAGECONFIG[systemd] = "-DENABLE_PLUGIN_SYSTEMD_JOURNAL=ON,-DENABLE_PLUGIN_SYSTEMD_JOURNAL=OFF,systemd"
+PACKAGECONFIG[docker] = ",,virtual/docker, virtual/docker"
+PACKAGECONFIG[go] = "-DENABLE_PLUGIN_GO=ON, -DENABLE_PLUGIN_GO=OFF"
+# WebUI (packageconfig not set: v0, v1 & v2)
+PACKAGECONFIG[webui_v0] = ",,,,,webui_v1 webui_v2"
+PACKAGECONFIG[webui_v1] = ",,,,,webui_v0 webui_v2"
+PACKAGECONFIG[webui_v2] = ",,,,,webui_v0 webui_v1"
+# ebpf doesn't compile (or detect) the cross compilation well
+EXTRA_OECMAKE += "-DENABLE_PLUGIN_EBPF=OFF -DBUILD_FOR_PACKAGING=${@bb.utils.contains('DISTRO_FEATURES','systemd','ON','OFF',d)} \
+                  -DENABLE_ACLK=OFF -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=OFF -DCMAKE_INSTALL_PREFIX='${base_prefix}'"
+do_compile:append() {
+    # Go dependencies are protected with read-only permissions, but would prevent cleaning
+    if ${@bb.utils.contains('PACKAGECONFIG', 'go', 'true', 'false', d)}; then
+        chmod -R a+w ${B}/pkg
+    fi
+}
+do_install:append() {
+    #set S UID for plugins
+    chown root:netdata ${D}${libexecdir}/netdata/plugins.d/apps.plugin
+    chmod 4750 ${D}${libexecdir}/netdata/plugins.d/apps.plugin
+    rm -rf ${D}/${localstatedir}/
+    if ${@bb.utils.contains('PACKAGECONFIG', 'xenstat', 'true', 'false', d)}; then
+        # Set S UID for xenstat plugin
+        chown root:netdata ${D}${libexecdir}/netdata/plugins.d/xenstat.plugin
+        chmod 4750 ${D}${libexecdir}/netdata/plugins.d/xenstat.plugin
+    fi
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        # Install systemd unit files
+        install -Dm 0644 ${UNPACKDIR}/netdata-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/netdata.conf
+    fi
+    # Install default netdata.conf
+    install -d ${D}${sysconfdir}/netdata
+    install -m 0644 ${UNPACKDIR}/netdata.conf ${D}${sysconfdir}/netdata/
+    if ${@bb.utils.contains('PACKAGECONFIG', 'go', 'true', 'false', d)}; then
+        install -m 0644 ${UNPACKDIR}/go.d.conf ${D}${sysconfdir}/netdata/
+    fi
+    sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf
+    sed -i -e 's,@@libdir,${libdir},g' ${D}${sysconfdir}/netdata/netdata.conf
+    sed -i -e 's,@@libexecdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf
+    sed -i -e 's,@@localstatedir,${localstatedir},g' ${D}${sysconfdir}/netdata/netdata.conf
+    sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf
+    if [ "${NETDATA_ANONYMOUS}" = "enabled" ]; then
+        touch ${D}${sysconfdir}/netdata/.opt-out-from-anonymous-statistics
+    fi
+    install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata
+    install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata
+    # webUI
+    if  "${@bb.utils.contains('PACKAGECONFIG', 'webui_v0', 'true', 'false', d)}"; then
+        rm -rf ${D}${datadir}/netdata/web/v1
+        rm -rf ${D}${datadir}/netdata/web/v2
+        install -m 0644 ${D}${datadir}/netdata/web/v0/index.html ${D}${datadir}/netdata/web/
+    fi
+    if "${@bb.utils.contains('PACKAGECONFIG', 'webui_v1', 'true', 'false', d)}"; then
+        rm -rf ${D}${datadir}/netdata/web/v0
+        rm -rf ${D}${datadir}/netdata/web/v2
+        install -m 0644 ${D}${datadir}/netdata/web/v1/index.html ${D}${datadir}/netdata/web/
+    fi
+    if "${@bb.utils.contains('PACKAGECONFIG', 'webui_v2', 'true', 'false', d)}"; then
+        rm -rf ${D}${datadir}/netdata/web/v0
+        rm -rf ${D}${datadir}/netdata/web/v1
+        install -m 0644 ${D}${datadir}/netdata/web/v2/index.html ${D}${datadir}/netdata/web/
+    fi
+    chown -R netdata:netdata ${D}${datadir}/netdata/web
+}
+FILES:${PN} += "\
+    ${localstatedir}/cache/netdata/ \
+    ${localstatedir}/lib/netdata/ \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/journald@netdata.conf.d', '', d)} \
+    "
+RDEPENDS:${PN} = "bash python3-core zlib"
diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf
index f131eb270..d741d0ba9 100644
--- a/meta-xfce/conf/layer.conf
+++ b/meta-xfce/conf/layer.conf
@@ -19,7 +19,7 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer"
 LAYERDEPENDS_xfce-layer += "meta-python"
 LAYERDEPENDS_xfce-layer += "networking-layer"
-LAYERSERIES_COMPAT_xfce-layer = "styhead"
+LAYERSERIES_COMPAT_xfce-layer = "styhead walnascar"
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\
  openzone->gdk-pixbuf \
diff --git a/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb b/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb
index dc62a1c72..e47f8c536 100644
--- a/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb
+++ b/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a2f562fb8fb1e138b810d69521c4bcd7"
 inherit allarch gtk-icon-cache
 SRC_URI = "http://xfce-look.org/CONTENT/content-files/111343-OpenZone-${PV}.tar.xz"
-SRC_URI[md5sum] = "4dae968cbd525072664ef7a4fc7c4154"
 SRC_URI[sha256sum] = "dc20f97a49e1ff1becf7853ef5f137ed30a4c27490540e755021d78d339efd92"
 S = "${WORKDIR}/OpenZone"
diff --git a/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb b/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb
index 532980d96..9d8cf7a45 100644
--- a/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb
+++ b/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 inherit allarch autotools gtk-icon-cache
 SRC_URI = "http://sourceforge.net/projects/xffm/files/${BPN}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "4b097d344a160d6497c6498985c8df15"
 SRC_URI[sha256sum] = "6ed00d16faa1f55b3bb7b13862de1d7f5cfd978b93e42487ded21595d0dbe208"
 FILES:${PN} += "${datadir}/icons"
diff --git a/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb b/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb
index 4cbdb4e08..4dacb203d 100644
--- a/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb
+++ b/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8f0e2cd40e05189ec81232da84bd6e1a"
 inherit allarch
 SRC_URI = "http://sources.openembedded.org/141404-xfce_dusk_gtk3-1_3.tar.gz;subdir=${BPN}-${PV}"
-SRC_URI[md5sum] = "b3ad37ad8173b14ec090e60a80e65d8f"
 SRC_URI[sha256sum] = "bfa8a88607d1a1da5bd0b9e4e075767c54400a3c5a0fae88b619ed71532f30b4"
 do_configure() {
diff --git a/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb b/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb
index 272f83c01..d69abfedf 100644
--- a/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb
+++ b/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 inherit xfce
 SRC_URI = "http://archive.xfce.org/src/art/${BPN}/${@'${PV}'[0:4]}/${BP}.tar.bz2"
-SRC_URI[md5sum] = "eaa58362053a3549c8be0b32efd3c54f"
 SRC_URI[sha256sum] = "3214d5f00e9703b5e8c9e7c3287d606dedec7285ceb4d5db332e93ada66fd575"
 # using xfwm4-theme as in xfwm4 might cause warnings of packages supplied by
diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
index 0a65bd94a..6ee5391d2 100644
--- a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
+++ b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
@@ -11,7 +11,6 @@ SRC_URI = " \
    http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \
    file://0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch \
 "
-SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71"
 SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b"
 FILES:${PN} += "${datadir}/vala-*/vapi"
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.5.bb
index 7e7075443..8e4e4966c 100644
--- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb
+++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.5.bb
@@ -14,7 +14,7 @@ SRC_URI += " \
    file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \
    file://0002-use-lxdm-to-replace-dm-tool.patch \
 "
-SRC_URI[sha256sum] = "4ae0b8615c9811194bbda0172a63567ed7fdb5519ea48f7a4637f4e6e5365e1b"
+SRC_URI[sha256sum] = "b20e0d10cc5149a601d8eee07373efb446ea3e179dd032ed8ddb5782e3f9e7cb"
 EXTRA_OECONF += "--disable-vala"