238 files changed, 5167 insertions, 2808 deletions
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 5242b29e06..6fecf25603 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
deleted file mode 100644
index b92a487523..0000000000
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d25cf3b9aa873595a19e197cc29ab46c0093bff1 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
---
-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
--- a/absl/copts/GENERATED_AbseilCopts.cmake
-+++ b/absl/copts/GENERATED_AbseilCopts.cmake
-@@ -158,7 +158,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS
- list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS
- )
- 
-list(APPEND ABSL_RANDOM_HWAES_X64_FLAGS
-    "-maes"
-    "-msse4.1"
-)
-diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
-index a6efc98e11d4..1e847f769501 100644
--- a/absl/copts/GENERATED_copts.bzl
-+++ b/absl/copts/GENERATED_copts.bzl
-@@ -159,7 +159,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [
- ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [
- ]
- 
-ABSL_RANDOM_HWAES_X64_FLAGS = [
-    "-maes",
-    "-msse4.1",
-]
-- 
-2.36.1
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-abseil-ppc-fixes.patch
index f2ebd9f08c..a0b99dd206 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-abseil-ppc-fixes.patch
@@ -1,4 +1,7 @@
-Upstream-Status: Pending
+From 5891332fecd3bf707b58dda56b4b3f80583b5ef9 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 68f92730..5dbfaab6 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,9 +85,11 @@ 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 88949fe9..4e26a6b7 100644
 --- a/absl/debugging/internal/stacktrace_config.h
 +++ b/absl/debugging/internal/stacktrace_config.h
-@@ -60,7 +60,7 @@
+@@ -67,7 +67,7 @@
 #elif defined(__i386__) || defined(__x86_64__)
 #define ABSL_STACKTRACE_INL_HEADER \
   "absl/debugging/internal/stacktrace_x86-inl.inc"
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
deleted file mode 100644
index 1a80a428b7..0000000000
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From fb24c3e3539b5743d398a429a302a3886186f261 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
-Not every arm platform supports neon instructions, so do not enforce
-them.
-Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
---
-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 23b9253c1f00..5d112a97f3e4 100644
--- a/absl/copts/GENERATED_AbseilCopts.cmake
-+++ b/absl/copts/GENERATED_AbseilCopts.cmake
-@@ -147,10 +147,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS
-     "/DNOMINMAX"
- )
- 
-list(APPEND ABSL_RANDOM_HWAES_ARM32_FLAGS
-    "-mfpu=neon"
-)
-
- list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS
-     "-march=armv8-a+crypto"
- )
-diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
-index 1e847f769501..3e10db204faf 100644
--- a/absl/copts/GENERATED_copts.bzl
-+++ b/absl/copts/GENERATED_copts.bzl
-@@ -148,10 +148,6 @@ ABSL_MSVC_TEST_FLAGS = [
-     "/DNOMINMAX",
- ]
- 
-ABSL_RANDOM_HWAES_ARM32_FLAGS = [
-    "-mfpu=neon",
-]
-
- ABSL_RANDOM_HWAES_ARM64_FLAGS = [
-     "-march=armv8-a+crypto",
- ]
-- 
-2.36.1
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb
index 2aef973910..4afbba963a 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb
@@ -7,16 +7,13 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915"
-SRCREV = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a"
+SRCREV = "76bb24329e8bf5f39704eb10d21b9a80befa7c81"
-BRANCH = "lts_2024_01_16"
+BRANCH = "lts_2025_05_12"
 SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \
-           file://0001-absl-always-use-asm-sgidefs.h.patch             \
+           file://0001-absl-always-use-asm-sgidefs.h.patch \
-           file://0002-Remove-maes-option-from-cross-compilation.patch \
+           file://0002-abseil-ppc-fixes.patch \
-           file://abseil-ppc-fixes.patch \
+           "
-           file://0003-Remove-neon-option-from-cross-compilation.patch \
-          "
-S = "${WORKDIR}/git"
 inherit cmake
@@ -27,7 +24,7 @@ EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \
 SYSROOT_DIRS:append:class-nativesdk:mingw32 = " ${bindir}"
-PACKAGES_DYNAMIC = "^libabsl-*"
+PACKAGES_DYNAMIC += "^libabsl-*"
 PACKAGES_DYNAMIC:class-native = ""
 PACKAGESPLITFUNCS =+ "split_dynamic_packages"
diff --git a/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb b/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb
index 87c09f5118..e027b8d4aa 100644
--- a/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb
+++ b/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.gi
 "
 SRCREV = "9bd5e2c7886fca72f139cd8402488a2235957d41"
-S = "${WORKDIR}/git"
 DEPENDS = "bison-native"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
index 3f9d49a2d2..342e7fd1a5 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
@@ -3,6 +3,8 @@ SECTION = "console/utils"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+S = "${UNPACKDIR}"
 SRC_URI = " \
    file://android-gadget-setup \
    file://android-gadget-start \
@@ -14,17 +16,17 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 do_install() {
    install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-cleanup ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir}
-    if [ -r ${WORKDIR}/android-gadget-setup.machine ] ; then
+    if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then
        install -d ${D}${sysconfdir}
-        install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${D}${sysconfdir}
+        install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir}
    fi
    install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
-    install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
+    install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
 }
 FILES:${PN} += " \
@@ -33,3 +35,4 @@ FILES:${PN} += " \
 PROVIDES += "android-tools-conf"
 RPROVIDES:${PN} = "android-tools-conf"
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
index 34b1a9bdd2..764d6b404f 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
@@ -5,11 +5,13 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 SRC_URI = "file://android-gadget-setup"
+S = "${UNPACKDIR}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 do_install() {
    install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
 }
 python () {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
index ddf8d7f74e..b6661f2e39 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Android Debug Bridge
-ConditionPathExists=/var/usb-debugging-enabled
+ConditionPathExists=/etc/usb-debugging-enabled
 Before=android-system.service
 [Service]
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
index 177d69a97a..ddb41ea4b0 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
@@ -17,9 +17,10 @@ Upstream-Status: Pending
 +++ b/adb/adb_auth_host.c
 @@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
     BIGNUM* rem = BN_new();
-     BIGNUM* n = BN_new();
+-    BIGNUM* n = BN_new();
+    const BIGNUM* n;
     BIGNUM* n0inv = BN_new();
-+    BIGNUM* e = BN_new();
+    const BIGNUM* e;
 
     if (RSA_size(rsa) != RSANUMBYTES) {
         ret = 0;
@@ -32,7 +33,7 @@ Upstream-Status: Pending
     BN_set_bit(r, RSANUMWORDS * 32);
     BN_mod_sqr(rr, r, n, ctx);
     BN_div(NULL, rem, n, r32, ctx);
-@@ -96,7 +97,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
+@@ -96,11 +97,10 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
         BN_div(n, rem, n, r32, ctx);
         pkey->n[i] = BN_get_word(rem);
     }
@@ -41,3 +42,7 @@ Upstream-Status: Pending
 
 out:
     BN_free(n0inv);
+-    BN_free(n);
+     BN_free(rem);
+     BN_free(r);
+     BN_free(rr);
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch
new file mode 100644
index 0000000000..b77c0ebc13
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch
@@ -0,0 +1,69 @@
+From c9f8cb184a7218c97ff966db44da6dd814c0e273 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Fri, 21 Mar 2025 09:49:32 +0000
+Subject: [PATCH] ext4_utils: drop unused parameter from allocate_inode()
+* fixes build with gcc-15:
+  http://errors.yoctoproject.org/Errors/Details/848455/
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c: In function 'make_directory':
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:115:29: error: too many arguments to function 'allocate_inode'; expected 0, have 1
+  115 |                 inode_num = allocate_inode(info);
+      |                             ^~~~~~~~~~~~~~ ~~~~
+In file included from TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:32:
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/allocate.h:61:5: note: declared here
+   61 | u32 allocate_inode();
+      |     ^~~~~~~~~~~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c: In function 'make_file':
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:183:21: error: too many arguments to function 'allocate_inode'; expected 0, have 1
+  183 |         inode_num = allocate_inode(info);
+      |                     ^~~~~~~~~~~~~~ ~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/allocate.h:61:5: note: declared here
+   61 | u32 allocate_inode();
+      |     ^~~~~~~~~~~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c: In function 'make_link':
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:218:21: error: too many arguments to function 'allocate_inode'; expected 0, have 1
+  218 |         inode_num = allocate_inode(info);
+      |                     ^~~~~~~~~~~~~~ ~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/allocate.h:61:5: note: declared here
+   61 | u32 allocate_inode();
+      |     ^~~~~~~~~~~~~~
+make: *** [<builtin>: contents.o] Error 1
+Upstream-Status: Pending [this whole code was removed in newer version android-9.0.0_r1 https://android.googlesource.com/platform/system/extras/+/7a837fcd6e9c0e0219f743052c78cc1c5988dfaf]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ ext4_utils/contents.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+diff --git a/ext4_utils/contents.c b/ext4_utils/contents.c
+index 3144de93f..ac1b71706 100644
+--- a/ext4_utils/contents.c
+++ b/ext4_utils/contents.c
+@@ -112,7 +112,7 @@ u32 make_directory(u32 dir_inode_num, u32 entries, struct dentry *dentries,
+        len = blocks * info.block_size;
+ 
+        if (dir_inode_num) {
+-               inode_num = allocate_inode(info);
+               inode_num = allocate_inode();
+        } else {
+                dir_inode_num = EXT4_ROOT_INO;
+                inode_num = EXT4_ROOT_INO;
+@@ -180,7 +180,7 @@ u32 make_file(const char *filename, u64 len)
+        struct ext4_inode *inode;
+        u32 inode_num;
+ 
+-       inode_num = allocate_inode(info);
+       inode_num = allocate_inode();
+        if (inode_num == EXT4_ALLOCATE_FAILED) {
+                error("failed to allocate inode\n");
+                return EXT4_ALLOCATE_FAILED;
+@@ -215,7 +215,7 @@ u32 make_link(const char *link)
+        u32 inode_num;
+        u32 len = strlen(link);
+ 
+-       inode_num = allocate_inode(info);
+       inode_num = allocate_inode();
+        if (inode_num == EXT4_ALLOCATE_FAILED) {
+                error("failed to allocate inode\n");
+                return EXT4_ALLOCATE_FAILED;
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index 1c66ea4997..c04a1ef8c4 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -21,11 +21,11 @@ SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc"
 SRCREV_FORMAT = "core_extras_libhardware_libselinux_build"
 SRC_URI = " \
-    git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=git/system/core \
+    git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/system/core \
-    git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras \
+    git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/system/extras \
-    git://${ANDROID_MIRROR}/platform/hardware/libhardware;name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware \
+    git://${ANDROID_MIRROR}/platform/hardware/libhardware;name=libhardware;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/hardware/libhardware \
-    git://${ANDROID_MIRROR}/platform/external/libselinux;name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux \
+    git://${ANDROID_MIRROR}/platform/external/libselinux;name=libselinux;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/libselinux \
-    git://${ANDROID_MIRROR}/platform/build;name=build;protocol=https;nobranch=1;destsuffix=git/build \
+    git://${ANDROID_MIRROR}/platform/build;name=build;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/build \
    file://core/0001-adb-remove-selinux-extensions.patch;patchdir=system/core \
    file://core/0002-adb-Use-local-sockets-where-appropriate.patch;patchdir=system/core \
    file://core/0003-adb-define-shell-command.patch;patchdir=system/core \
@@ -48,6 +48,7 @@ SRC_URI = " \
    file://core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch;patchdir=system/core \
    file://extras/0001-ext4_utils-remove-selinux-extensions.patch;patchdir=system/extras \
    file://extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch;patchdir=system/extras \
+    file://extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch;patchdir=system/extras \
    file://libselinux/0001-Remove-bionic-specific-calls.patch;patchdir=external/libselinux \
    file://libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch;patchdir=external/libselinux \
    file://android-tools-adbd.service \
@@ -61,7 +62,6 @@ SRC_URI = " \
 "
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/${BPN}"
 # http://errors.yoctoproject.org/Errors/Details/133881/
@@ -88,7 +88,7 @@ TOOLS:class-native = "fastboot ext4_utils mkbootimg"
 TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg"
 do_compile() {
-    cp ${WORKDIR}/gitignore ${S}/.gitignore
+    cp ${UNPACKDIR}/gitignore ${S}/.gitignore
    # Setting both variables below causing our makefiles to not work with
    # implicit make rules
@@ -123,7 +123,7 @@ do_compile() {
    for tool in ${TOOLS}; do
      mkdir -p ${B}/${tool}
-      oe_runmake -f ${B}/${tool}.mk -C ${B}/${tool}
+      oe_runmake -f ${UNPACKDIR}/${BPN}/${tool}.mk -C ${B}/${tool}
    done
 }
@@ -151,7 +151,7 @@ do_install() {
    fi
    # Outside the if statement to avoid errors during do_package
-    install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \
+    install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \
      ${D}${systemd_unitdir}/system/android-tools-adbd.service
    if echo ${TOOLS} | grep -q "fastboot" ; then
@@ -187,9 +187,3 @@ FILES:${PN}-fstools = "\
 "
 BBCLASSEXTEND = "native"
-android_tools_enable_devmode() {
-    touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled
-}
-ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}"
diff --git a/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch b/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch
new file mode 100644
index 0000000000..9ce6693061
--- /dev/null
+++ b/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch
@@ -0,0 +1,42 @@
+From 952bad1469ea747012bdc48c48993bd5f13eec04 Mon Sep 17 00:00:00 2001
+From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+Date: Fri, 21 Mar 2025 05:02:23 +0000
+Subject: [PATCH] Explicit header: stdint
+Fix building with GCC-15. It no longer includes it by default.
+Upstream-Status: Backport [https://github.com/apitrace/apitrace/commit/952bad1469ea747012bdc48c48993bd5f13eec04]
+Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+---
+ frametrim/ft_dependecyobject.hpp | 1 +
+ retrace/metric_writer.cpp        | 1 +
+ 2 files changed, 2 insertions(+)
+diff --git a/frametrim/ft_dependecyobject.hpp b/frametrim/ft_dependecyobject.hpp
+index 2cd0b768..0f17b601 100644
+--- a/frametrim/ft_dependecyobject.hpp
+++ b/frametrim/ft_dependecyobject.hpp
+@@ -28,6 +28,7 @@
+ #pragma once
+ 
+ #include "ft_tracecall.hpp"
+#include <stdint.h>
+ 
+ namespace frametrim {
+ 
+diff --git a/retrace/metric_writer.cpp b/retrace/metric_writer.cpp
+index e923ed1d..4e4ce748 100644
+--- a/retrace/metric_writer.cpp
+++ b/retrace/metric_writer.cpp
+@@ -24,6 +24,7 @@
+  **************************************************************************/
+ 
+ #include <iostream>
+#include <stdint.h>
+ 
+ #include "metric_writer.hpp"
+ 
+-- 
+2.34.1
diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb b/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
index d872c4dbb5..244d9a3c6f 100644
--- a/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
+++ b/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \
 SRCREV = "9352fc02bba106fbbeef9e8452ef34643c0d0764"
 PV .= "+11.1+git"
 SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
+           file://0001-Explicit-header-stdint.patch \
          "
-S = "${WORKDIR}/git"
 DEPENDS += "zlib libpng python3-native"
diff --git a/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb b/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb
deleted file mode 100644
index d0e0446eb8..0000000000
--- a/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb
+++ /dev/null
@@ -1,67 +0,0 @@
-SUMMARY = "A GNU tool that produce shell scripts to automatically configure software"
-DESCRIPTION = "Autoconf is an extensible package of M4 macros that produce shell scripts to automatically \ 
-configure software source code packages. Autoconf creates a configuration script for a package from a template \
-file that lists the operating system features that the package can use, in the form of M4 macro calls."
-SECTION = "devel"
-HOMEPAGE = "http://www.gnu.org/software/autoconf/"
-LICENSE = "GPL-3.0-only"
-LICENSE = "GPL-2.0-only & GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
-SRC_URI = " \
-    ${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \
-    file://0001-Add-config.guess-config.sub-install-to-destdir.patch \
-"
-S = "${WORKDIR}/${BPN}"
-SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711"
-SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e"
-inherit texinfo native
-DEPENDS += "m4-native gnu-config-native"
-RDEPENDS:${PN} = "m4-native gnu-config-native"
-PERL = "${USRBINPATH}/perl"
-CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'"
-CONFIGUREOPTS = " \
-    --build=${BUILD_SYS} \
-    --host=${HOST_SYS} \
-    --target=${TARGET_SYS} \
-    --prefix=${prefix} \
-    --exec_prefix=${exec_prefix} \
-    --bindir=${bindir} \
-    --sbindir=${sbindir} \
-    --libexecdir=${libexecdir} \
-    --datadir=${datadir} \
-    --sysconfdir=${sysconfdir} \
-    --sharedstatedir=${sharedstatedir} \
-    --localstatedir=${localstatedir} \
-    --libdir=${libdir} \
-    --includedir=${includedir} \
-    --oldincludedir=${includedir} \
-    --infodir=${infodir} \
-    --mandir=${mandir} \
-    --disable-silent-rules \
-"
-EXTRA_OECONF += "ac_cv_path_M4=m4 ac_cv_prog_TEST_EMACS=no"
-do_configure() {
-    ./configure ${CONFIGUREOPTS}
-}
-do_install() {
-        oe_runmake 'DESTDIR=${D}' install
-    # avoid conflicts with standard autotools
-    ver="213"
-    for file in `find ${D}${bindir} -type f`; do
-        mv $file $file$ver
-    done
-        mv ${D}${datadir}/autoconf ${D}${datadir}/autoconf213
-}
diff --git a/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13/0001-Add-config.guess-config.sub-install-to-destdir.patch b/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13/0001-Add-config.guess-config.sub-install-to-destdir.patch
deleted file mode 100644
index f6e9ecb9a0..0000000000
--- a/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13/0001-Add-config.guess-config.sub-install-to-destdir.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 3d3e23f7b14e87849405a4e109a69b76696615fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 11 Dec 2019 23:18:19 +0100
-Subject: [PATCH] Add config.guess config.sub / install to destdir
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Upstream-Status: Inappropriate [Configuration]
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- Makefile.in | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-diff --git a/Makefile.in b/Makefile.in
-index a6c94d4..4b1b708 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -137,23 +137,23 @@ installcheck: all install
-        cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
- 
- installdirs:
-       $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
-+       $(SHELL) ${srcdir}/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(infodir) ${DESTDIR}$(acdatadir)
- 
- install: all $(M4FILES) acconfig.h installdirs install-info
-        for p in $(ASCRIPTS); do \
-         $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+         $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/`echo $$p|sed '$(transform)'`; \
-        done
-        for i in $(M4FROZEN); do \
-         $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
-+         $(INSTALL_DATA) $$i ${DESTDIR}$(acdatadir)/$$i; \
-        done
-        for i in $(M4FILES) acconfig.h; do \
-         $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
-+         $(INSTALL_DATA) $(srcdir)/$$i ${DESTDIR}$(acdatadir)/$$i; \
-        done
-        -if test -f autoscan; then \
-       $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
-+       $(INSTALL_PROGRAM) autoscan ${DESTDIR}$(bindir)/`echo autoscan|sed '$(transform)'`; \
-        for i in acfunctions acheaders acidentifiers acprograms \
-         acmakevars; do \
-       $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
-+         acmakevars config.guess config.sub; do \
-+       $(INSTALL_DATA) $(srcdir)/$$i ${DESTDIR}$(acdatadir)/$$i; \
-        done; \
-        else :; fi
- 
-@@ -161,11 +161,11 @@ install: all $(M4FILES) acconfig.h installdirs install-info
- install-info: info installdirs
-        if test -f autoconf.info; then \
-          for i in *.info*; do \
-           $(INSTALL_DATA) $$i $(infodir)/$$i; \
-+           $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
-          done; \
-        else \
-          for i in $(srcdir)/*.info*; do \
-           $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-+           $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-          done; \
-        fi
- 
-- 
-2.21.0
diff --git a/meta-oe/recipes-devtools/b4/b4_0.14.2.bb b/meta-oe/recipes-devtools/b4/b4_0.14.2.bb
new file mode 100644
index 0000000000..794e1d24dd
--- /dev/null
+++ b/meta-oe/recipes-devtools/b4/b4_0.14.2.bb
@@ -0,0 +1,13 @@
+SUMMARY = "Utility to work with patches made available via a public-inbox archive like lore.kernel.org."
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+inherit pypi python_pep517 python_setuptools_build_meta
+SRC_URI[sha256sum] = "4f835b6e5ae30eff6004bb25c15fd8f4f6ecd1105596e86db1871fef7d18113d"
+RDEPENDS:${PN} += " \
+    python3-mailbox \
+    python3-requests \
+"
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb b/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
index 3bf4371e85..0e51289507 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
+++ b/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
@@ -27,9 +27,9 @@ SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac"
 SRCREV_lss = "9719c1e1e676814c456b55f5f070eabad6709d31"
 SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \
-           git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest;branch=main;protocol=https \
+           git://github.com/google/googletest.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/testing/gtest;name=gtest;branch=main;protocol=https \
-           git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \
+           git://github.com/protocolbuffers/protobuf.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \
-           git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=git/src/third_party/lss;name=lss \
+           git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/third_party/lss;name=lss \
           file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \
           file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \
           file://0001-Turn-off-sign-compare-for-musl-libc.patch \
@@ -41,7 +41,6 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=h
           file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \
           file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \
 "
-S = "${WORKDIR}/git"
 CXXFLAGS += "-D_GNU_SOURCE"
 LDFLAGS:append:libc-musl = " -lucontext"
diff --git a/meta-oe/recipes-devtools/capnproto/capnproto/0001-Export-binaries-only-for-native-build.patch b/meta-oe/recipes-devtools/capnproto/capnproto/0001-Export-binaries-only-for-native-build.patch
new file mode 100644
index 0000000000..7677d96b23
--- /dev/null
+++ b/meta-oe/recipes-devtools/capnproto/capnproto/0001-Export-binaries-only-for-native-build.patch
@@ -0,0 +1,53 @@
+From e654a7015f5e8f20bf7681681cc2b80082303007 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Tue, 25 Feb 2025 13:43:42 +0100
+Subject: [PATCH] Export binaries only for native build
+By default, the cmake configuratione exports all generated files,
+so when using the generated cmake file with a find_package command,
+it verifies that these files actually exist.
+When using the cross-compiled version of capnproto, the generated
+binaries are not available in RECIPE_SYSROOT (since they can be
+used as RDEPENDS only, but not usable as DEPENDS), and due to
+this the compilation fails.
+To avoid this, check during the compilation of capnproto if it is
+being cross-compiled, or not. If is it cross-compiled, then only
+install the generated binary files in their final location, but
+don't export them. When not cross-compiling, do the same, but also
+export the files (which is the default behavior).
+Upstream-Status: Inappropriate [oe specific: see above message]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ c++/src/capnp/CMakeLists.txt | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+diff --git a/c++/src/capnp/CMakeLists.txt b/c++/src/capnp/CMakeLists.txt
+index 9980fde6..8732db93 100644
+--- a/src/capnp/CMakeLists.txt
+++ b/src/capnp/CMakeLists.txt
+@@ -210,7 +210,20 @@ if(NOT CAPNP_LITE)
+   target_link_libraries(capnpc_capnp capnp kj)
+   set_target_properties(capnpc_capnp PROPERTIES OUTPUT_NAME capnpc-capnp)
+ 
+-  install(TARGETS capnp_tool capnpc_cpp capnpc_capnp ${INSTALL_TARGETS_DEFAULT_ARGS})
+  if(NOT CMAKE_CROSSCOMPILING)
+    install(TARGETS capnp_tool capnpc_cpp capnpc_capnp ${INSTALL_TARGETS_DEFAULT_ARGS})
+  else()
+    # INSTALL_TARGETS_CROSS_COMPILED_BINARY_ARGS is identical to INSTALL_TARGETS_DEFAULT_ARGS,
+    # except that the installed files are not exported, so when the generated cmake file
+    # is used by a find_package command, it won't try to find these files.
+    set(INSTALL_TARGETS_CROSS_COMPILED_BINARY_ARGS
+      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    )
+
+    install(TARGETS capnp_tool capnpc_cpp capnpc_capnp ${INSTALL_TARGETS_CROSS_COMPILED_BINARY_ARGS})
+  endif()
+ 
+   if(WIN32)
+     # On Windows platforms symlinks are not guaranteed to support. Also different version of CMake handle create_symlink in a different way.
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 cb4aef5224..0ea243fd20 100644
--- a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
+++ b/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
@@ -5,13 +5,16 @@ SECTION = "console/tools"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9"
-SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https"
+SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \
+           file://0001-Export-binaries-only-for-native-build.patch"
 SRCREV = "1a0e12c0a3ba1f0dbbad45ddfef555166e0a14fc"
-S = "${WORKDIR}/git/c++"
+S = "${UNPACKDIR}/${BP}/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/cbindgen/cbindgen/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch b/meta-oe/recipes-devtools/cbindgen/cbindgen/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch
new file mode 100644
index 0000000000..75086aba75
--- /dev/null
+++ b/meta-oe/recipes-devtools/cbindgen/cbindgen/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch
@@ -0,0 +1,38 @@
+From 6ab6af57cbd3b3b0cd4ba04f7f65693e1ca69870 Mon Sep 17 00:00:00 2001
+From: Dan Gohman <dev@sunfishcode.online>
+Date: Sun, 6 Apr 2025 05:22:49 -0700
+Subject: [PATCH] Define more ioctl codes on riscv32gc-unknown-linux-gnu
+Define ioctl codes including `FICLONE` and `FS_IOC32_GETVERSION` on
+riscv32gc-unknown-linux-gnu.
+Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/4382]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/unix/linux_like/linux/arch/generic/mod.rs | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs
+index 2f437e1..db1f1e7 100644
+--- a/src/unix/linux_like/linux/arch/generic/mod.rs
+++ b/src/unix/linux_like/linux/arch/generic/mod.rs
+@@ -114,6 +114,7 @@ cfg_if! {
+                  target_arch = "x86_64",
+                  target_arch = "arm",
+                  target_arch = "aarch64",
+                 target_arch = "riscv32",
+                  target_arch = "riscv64",
+                  target_arch = "s390x",
+                  target_arch = "csky",
+@@ -218,7 +219,10 @@ cfg_if! {
+     // where S stands for size (int, long, struct...)
+     // where T stands for type ('f','v','X'...)
+     // where N stands for NR (NumbeR)
+-    if #[cfg(any(target_arch = "x86", target_arch = "arm", target_arch = "csky"))] {
+    if #[cfg(any(target_arch = "x86",
+                 target_arch = "arm",
+                 target_arch = "riscv32",
+                 target_arch = "csky"))] {
+         pub const FS_IOC_GETFLAGS: ::Ioctl = 0x80046601;
+         pub const FS_IOC_SETFLAGS: ::Ioctl = 0x40046602;
+         pub const FS_IOC_GETVERSION: ::Ioctl = 0x80047601;
diff --git a/meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb b/meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
new file mode 100644
index 0000000000..8a6337a0d2
--- /dev/null
+++ b/meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
@@ -0,0 +1,148 @@
+SUMMARY = "cbindgen creates C/C++11 headers for Rust libraries which expose a public C API"
+HOMEPAGE = "https://github.com/mozilla/cbindgen"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
+SRC_URI += "git://github.com/mozilla/cbindgen.git;protocol=https;branch=master \
+            file://0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/libc-0.2.155"
+SRCREV = "bd78bbe59b10eda6ef1255e4acda95c56c6d0279"
+inherit cargo pkgconfig
+SRC_URI += " \
+    crate://crates.io/anstream/0.6.15 \
+    crate://crates.io/anstyle-parse/0.2.5 \
+    crate://crates.io/anstyle-query/1.1.1 \
+    crate://crates.io/anstyle-wincon/3.0.4 \
+    crate://crates.io/anstyle/1.0.8 \
+    crate://crates.io/autocfg/1.3.0 \
+    crate://crates.io/bitflags/2.6.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/clap/4.5.15 \
+    crate://crates.io/clap_builder/4.5.15 \
+    crate://crates.io/clap_lex/0.7.2 \
+    crate://crates.io/colorchoice/1.0.2 \
+    crate://crates.io/dashmap/5.5.3 \
+    crate://crates.io/diff/0.1.13 \
+    crate://crates.io/equivalent/1.0.1 \
+    crate://crates.io/errno/0.3.9 \
+    crate://crates.io/fastrand/2.1.0 \
+    crate://crates.io/hashbrown/0.14.5 \
+    crate://crates.io/heck/0.4.1 \
+    crate://crates.io/indexmap/2.3.0 \
+    crate://crates.io/is_terminal_polyfill/1.70.1 \
+    crate://crates.io/itoa/1.0.11 \
+    crate://crates.io/lazy_static/1.5.0 \
+    crate://crates.io/libc/0.2.155 \
+    crate://crates.io/linux-raw-sys/0.4.14 \
+    crate://crates.io/lock_api/0.4.12 \
+    crate://crates.io/log/0.4.22 \
+    crate://crates.io/memchr/2.7.4 \
+    crate://crates.io/once_cell/1.19.0 \
+    crate://crates.io/parking_lot/0.12.3 \
+    crate://crates.io/parking_lot_core/0.9.10 \
+    crate://crates.io/pretty_assertions/1.4.0 \
+    crate://crates.io/proc-macro2/1.0.86 \
+    crate://crates.io/quote/1.0.36 \
+    crate://crates.io/redox_syscall/0.5.3 \
+    crate://crates.io/rustix/0.38.34 \
+    crate://crates.io/ryu/1.0.18 \
+    crate://crates.io/scopeguard/1.2.0 \
+    crate://crates.io/serde/1.0.205 \
+    crate://crates.io/serde_derive/1.0.205 \
+    crate://crates.io/serde_json/1.0.122 \
+    crate://crates.io/serde_spanned/0.6.7 \
+    crate://crates.io/serial_test/2.0.0 \
+    crate://crates.io/serial_test_derive/2.0.0 \
+    crate://crates.io/smallvec/1.13.2 \
+    crate://crates.io/strsim/0.11.1 \
+    crate://crates.io/syn/2.0.85 \
+    crate://crates.io/tempfile/3.12.0 \
+    crate://crates.io/toml/0.8.19 \
+    crate://crates.io/toml_datetime/0.6.8 \
+    crate://crates.io/toml_edit/0.22.20 \
+    crate://crates.io/unicode-ident/1.0.12 \
+    crate://crates.io/utf8parse/0.2.2 \
+    crate://crates.io/windows-sys/0.52.0 \
+    crate://crates.io/windows-sys/0.59.0 \
+    crate://crates.io/windows-targets/0.52.6 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
+    crate://crates.io/windows_aarch64_msvc/0.52.6 \
+    crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.52.6 \
+    crate://crates.io/windows_i686_msvc/0.52.6 \
+    crate://crates.io/windows_x86_64_gnu/0.52.6 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
+    crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/winnow/0.6.18 \
+    crate://crates.io/yansi/0.5.1 \
+"
+SRC_URI[anstream-0.6.15.sha256sum] = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+SRC_URI[anstyle-parse-0.2.5.sha256sum] = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+SRC_URI[anstyle-query-1.1.1.sha256sum] = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+SRC_URI[anstyle-wincon-3.0.4.sha256sum] = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+SRC_URI[anstyle-1.0.8.sha256sum] = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[clap-4.5.15.sha256sum] = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
+SRC_URI[clap_builder-4.5.15.sha256sum] = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+SRC_URI[clap_lex-0.7.2.sha256sum] = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+SRC_URI[colorchoice-1.0.2.sha256sum] = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+SRC_URI[dashmap-5.5.3.sha256sum] = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+SRC_URI[fastrand-2.1.0.sha256sum] = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+SRC_URI[indexmap-2.3.0.sha256sum] = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
+SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+SRC_URI[itoa-1.0.11.sha256sum] = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+SRC_URI[lock_api-0.4.12.sha256sum] = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+SRC_URI[parking_lot-0.12.3.sha256sum] = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+SRC_URI[parking_lot_core-0.9.10.sha256sum] = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+SRC_URI[redox_syscall-0.5.3.sha256sum] = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+SRC_URI[rustix-0.38.34.sha256sum] = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+SRC_URI[serde-1.0.205.sha256sum] = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150"
+SRC_URI[serde_derive-1.0.205.sha256sum] = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1"
+SRC_URI[serde_json-1.0.122.sha256sum] = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
+SRC_URI[serde_spanned-0.6.7.sha256sum] = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+SRC_URI[serial_test-2.0.0.sha256sum] = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d"
+SRC_URI[serial_test_derive-2.0.0.sha256sum] = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
+SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+SRC_URI[syn-2.0.85.sha256sum] = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+SRC_URI[tempfile-3.12.0.sha256sum] = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+SRC_URI[toml-0.8.19.sha256sum] = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+SRC_URI[toml_datetime-0.6.8.sha256sum] = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+SRC_URI[toml_edit-0.22.20.sha256sum] = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[winnow-0.6.18.sha256sum] = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb
index 922dfc7763..fbd3618b4f 100644
--- a/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb
+++ b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb
@@ -13,6 +13,8 @@ SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \
           file://0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch"
 SRC_URI[sha256sum] = "0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1"
+EXTRA_AUTORECONF += "-I config"
 CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes"
 EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \
    --with-ncurses=${STAGING_LIBDIR}"
diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.17.bb b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb
index 6c8934b342..33c8c28531 100644
--- a/meta-oe/recipes-devtools/cjson/cjson_1.7.17.bb
+++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0"
 SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \
           file://run-ptest \
         "
-SRCREV = "87d8f0961a01bf09bef98ff89bae9fdec42181ee"
+SRCREV = "acc76239bee01d8e9c858ae2cab296704e52d916"
-S = "${WORKDIR}/git"
 inherit cmake pkgconfig ptest
@@ -24,6 +23,11 @@ do_install_ptest() {
        sed s#${B}#${PTEST_PATH}# ${B}/CTestTestfile.cmake > ${D}${PTEST_PATH}/CTestTestfile.cmake
        sed s#${B}#${PTEST_PATH}# ${B}/tests/CTestTestfile.cmake > ${D}${PTEST_PATH}/tests/CTestTestfile.cmake
        sed s#${B}#${PTEST_PATH}# ${B}/fuzzing/CTestTestfile.cmake > ${D}${PTEST_PATH}/fuzzing/CTestTestfile.cmake
+        # The cmake files also contain full paths to original CMakeLists.txt file in _BACKTRACE_TRIPLES property;
+        # these are not needed for successful ptests as we don't install the CMakeLists.txt files anyway.
+        sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/CTestTestfile.cmake
+        sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/tests/CTestTestfile.cmake
+        sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/fuzzing/CTestTestfile.cmake
        # install test artifacts
        install ${B}/cJSON_test ${D}${PTEST_PATH}
        install ${B}/tests/cjson_add ${B}/tests/*_tests ${B}/tests/parse_*  ${B}/tests/print_*  ${B}/tests/readme_examples ${D}${PTEST_PATH}/tests/
diff --git a/meta-oe/recipes-devtools/cloc/cloc_1.98.bb b/meta-oe/recipes-devtools/cloc/cloc_1.98.bb
index ea5f00669f..6d349c1e58 100644
--- a/meta-oe/recipes-devtools/cloc/cloc_1.98.bb
+++ b/meta-oe/recipes-devtools/cloc/cloc_1.98.bb
@@ -1,13 +1,14 @@
 SUMMARY = "Count blank lines, comment lines, and physical lines of source code \
 in many programming languages."
-LICENSE="GPL-2.0-only"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2"
 SRC_URI = "https://github.com/AlDanial/cloc/releases/download/v${PV}/${BP}.tar.gz"
 SRC_URI[sha256sum] = "5fe0b159eb75718df7308a4f61470eaddf82170733929999e37a3fbb4651cf8a"
 UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
index 47a3d88853..ab4e6148e9 100644
--- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
+++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/concurrencykit/ck.git;branch=master;protocol=https \
           file://0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch \
           file://0001-build-Use-ilp32d-abi-on-riscv32-and-lp64d-on-rv64.patch"
-S = "${WORKDIR}/git"
 COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64|powerpc|powerpc64|riscv32|riscv64).*-linux*"
diff --git a/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb b/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb
new file mode 100644
index 0000000000..6e709b6e7e
--- /dev/null
+++ b/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb
@@ -0,0 +1,13 @@
+SUMMARY = "C++ Code Generator library"
+BUGTRACKER = "https://github.com/rm5248/libcppgenerate/issues"
+SECTION = "libs"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+SRC_URI = "git://github.com/rm5248/libcppgenerate.git;branch=master;protocol=https"
+SRCREV = "930c5503f76c877b72b9ff8546353d6f422bd010"
+inherit cmake
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb b/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb
index ed339e0160..36614ca19d 100644
--- a/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb
+++ b/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "cpuid dumps detailed information about the CPU(s) gathered \
 from the CPUID instruction, and also determines the exact model of CPU(s). \
 It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, \
 UMC, NexGen, Rise, and SiS CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
+HOMEPAGE = "http://www.etallen.com/cpuid.html"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
@@ -17,9 +17,7 @@ COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 inherit perlnative
 do_install () {
-    oe_runmake DESTDIR=${D} bindir=${bindir} mandir=${mandir} install
+    oe_runmake DESTDIR=${D} bindir=${bindir} mandir=${mandir} INSTALL_STRIP="" install
 }
 RDEPENDS:${PN} = "perl"
-INSANE_SKIP:${PN} += "already-stripped"
diff --git a/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb b/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb
new file mode 100644
index 0000000000..98419a8069
--- /dev/null
+++ b/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Cpuset manipulation tool"
+HOMEPAGE = "https://github.com/SUSE/cpuset"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+SRC_URI = "git://github.com/SUSE/cpuset.git;protocol=https;branch=master"
+SRCREV = "4f80263208935f0df4f616cf9d8cb7285599a670"
+inherit setuptools3
+RDEPENDS:${PN} += "python3-core python3-logging python3-pydoc"
diff --git a/meta-oe/recipes-devtools/cscope/cscope_15.9.bb b/meta-oe/recipes-devtools/cscope/cscope_15.9.bb
index 99f3ba85de..fad885dd43 100644
--- a/meta-oe/recipes-devtools/cscope/cscope_15.9.bb
+++ b/meta-oe/recipes-devtools/cscope/cscope_15.9.bb
@@ -20,5 +20,4 @@ DEPENDS += "ncurses"
 SRC_URI = "http://downloads.sourceforge.net/project/cscope/cscope/v${PV}/${BP}.tar.gz"
-SRC_URI[md5sum] = "16f3cce078b6c0e42299def4028eea6f"
 SRC_URI[sha256sum] = "c5505ae075a871a9cd8d9801859b0ff1c09782075df281c72c23e72115d9f159"
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240310.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.2.20250615.0.bb
index d4ffbb7f03..c794278f57 100644
--- a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240310.0.bb
+++ b/meta-oe/recipes-devtools/ctags/ctags_6.2.20250615.0.bb
@@ -14,10 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 inherit autotools-brokensep pkgconfig manpages
-SRCREV = "38fd8e39b877a79666393b90e38400fd8d7d5d14"
+SRCREV = "0644fb80a8250cc3ca6ba00037e490768fe4492e"
-SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https"
+SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https;tag=p${PV}"
-S = "${WORKDIR}/git"
 PACKAGECONFIG ??= " \
    readcmd \
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch
index 12dd238108..faa66e0268 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch
@@ -1,20 +1,20 @@
-From 87d0174e8d56e7458dc94f05f82ab7a67a5cf7d0 Mon Sep 17 00:00:00 2001
+From 6c8b0a3f9c09a7a135d95ff18038bcba22e87b86 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 8 Apr 2021 14:06:05 +0800
-Subject: [PATCH 1/2] support to override /usr/sbin and /usr/share
+Subject: [PATCH] support to override /usr/sbin and /usr/share
 Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55]
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- Makefile | 12 +++++++-----
+ Makefile | 10 ++++++----
- 1 file changed, 7 insertions(+), 5 deletions(-)
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 diff --git a/Makefile b/Makefile
-index 8516803..a2d8c00 100644
+index 21a9a39..649f465 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -5,14 +5,16 @@ all:
+@@ -5,13 +5,15 @@ all:
 
 clean:
 
@@ -28,14 +28,12 @@ index 8516803..a2d8c00 100644
 +       mkdir -p $(DESTDIR)$(sbindir)
 
        cp -a scripts/* $(DSDIR)/scripts/
-        install -o root -g root -m 0644 functions $(DSDIR)/
+        install -m 0644 functions $(DSDIR)/
 
 -       sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
-       chown root:root $(DESTDIR)/usr/sbin/debootstrap
 -       chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
 +       sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap
-+       chown root:root $(DESTDIR)$(sbindir)/debootstrap
 +       chmod 0755 $(DESTDIR)$(sbindir)/debootstrap
 -- 
-2.17.1
+2.25.1
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch
index 69329df4ea..daec80f614 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch
@@ -1,7 +1,7 @@
-From f0420b201f2fb5286ccf5657faa6b38cd2680e10 Mon Sep 17 00:00:00 2001
+From b7a476cbcd507c03094811690d5497a7e9e15afc Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 8 Apr 2021 14:08:06 +0800
-Subject: [PATCH 2/2] support to override /usr/bin/arch-test
+Subject: [PATCH] support to override /usr/bin/arch-test
 Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55]
@@ -11,12 +11,12 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 1 file changed, 8 insertions(+), 4 deletions(-)
 diff --git a/debootstrap b/debootstrap
-index 9b9e58d..a3cf3af 100755
+index 43a7383..0cce33e 100755
 --- a/debootstrap
 +++ b/debootstrap
 @@ -51,6 +51,10 @@ INRELEASE_PATH=""
+ 
 DEF_MIRROR="http://deb.debian.org/debian"
- DEF_HTTPS_MIRROR="https://deb.debian.org/debian"
 
 +if [ -z "$ARCH_TEST" ]; then
 +       ARCH_TEST="/usr/bin/arch-test"
@@ -25,7 +25,7 @@ index 9b9e58d..a3cf3af 100755
 # set $CONTAINER
 detect_container
 
-@@ -645,12 +649,12 @@ fi
+@@ -666,12 +670,12 @@ fi
 
 ###########################################################################
 
@@ -42,6 +42,3 @@ index 9b9e58d..a3cf3af 100755
        else
                ret=3
        fi
-- 
-2.17.1
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch
index 2a5f233165..0c1a7a65a8 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch
@@ -1,4 +1,4 @@
-From e735fb23f46f0c3c7a1144ba6b4050bfc0015a05 Mon Sep 17 00:00:00 2001
+From 33c4bc9540d6d9aee6d885b89d530130d50b8052 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Wed, 2 Jun 2021 13:34:35 +0800
 Subject: [PATCH] do not hardcode the full path of dpkg
@@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/debootstrap b/debootstrap
-index a3cf3af..5e96c3e 100755
+index 0cce33e..7586c58 100755
 --- a/debootstrap
 +++ b/debootstrap
-@@ -538,7 +538,7 @@ fi
+@@ -553,7 +553,7 @@ fi
 
 if in_path dpkg && \
      dpkg --print-architecture >/dev/null 2>&1; then
@@ -28,6 +28,3 @@ index a3cf3af..5e96c3e 100755
 elif in_path udpkg && \
      udpkg --print-architecture >/dev/null 2>&1; then
        HOST_ARCH=$(/usr/bin/udpkg --print-architecture)
-- 
-2.27.0
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb
index c28a51749c..9287962ab7 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb
@@ -2,18 +2,18 @@ SUMMARY = "Install a Debian system into a subdirectory"
 HOMEPAGE = "https://wiki.debian.org/Debootstrap"
 SECTION = "devel"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7b45429ef05610abf91ac199fdb3a6e"
 SRC_URI  = "\
    ${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz \
    file://0001-support-to-override-usr-sbin-and-usr-share.patch \
    file://0002-support-to-override-usr-bin-arch-test.patch \
-    file://0001-do-not-hardcode-the-full-path-of-dpkg.patch \
+    file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \
 "
-SRC_URI[sha256sum] = "d963a465314ac0e8fd5392573def042e6663e8edf3d08ace4bbd0d27ee8431f7"
+SRC_URI[sha256sum] = "232ec755f4b1f445f829996885846abba6f1b6fd55d049476ab26ddd8c4b4e1b"
-S = "${WORKDIR}/debootstrap"
+S = "${UNPACKDIR}/debootstrap"
 DEPENDS = " \
    virtual/fakeroot-native \
diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb b/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb
index 2f0d8a3400..79252f94ae 100644
--- a/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb
+++ b/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb
@@ -28,7 +28,6 @@ SRC_URI = "http://dmalloc.com/releases/dmalloc-${PV}.tgz \
           file://0001-undefined-strdup-macro.patch \
 "
-SRC_URI[md5sum] = "f92e5606c23a8092f3d5694e8d1c932e"
 SRC_URI[sha256sum] = "d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a"
 ARM_INSTRUCTION_SET = "arm"
diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb
index 479b98d44d..bc558b7d62 100644
--- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb
+++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb
@@ -10,7 +10,6 @@ SRC_URI:append:class-target = " file://oe-remote.repo.sample"
 inherit setuptools3-base
-S = "${WORKDIR}/git"
 do_install:append() {
    install -d ${D}${datadir}/dnf
@@ -24,7 +23,7 @@ do_install:append() {
 do_install:append:class-target() {
    install -d ${D}${sysconfdir}/yum.repos.d
-    install -m 0644 ${WORKDIR}/oe-remote.repo.sample ${D}${sysconfdir}/yum.repos.d
+    install -m 0644 ${UNPACKDIR}/oe-remote.repo.sample ${D}${sysconfdir}/yum.repos.d
 }
 do_install:append:class-nativesdk() {
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 47c8edb497..0000000000
--- 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 796bc61ddc..0000000000
--- 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.14.0.bb
index 8bd0992bd6..512a63549e 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb
@@ -4,13 +4,16 @@ 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"
+SRCREV = "cbe58f6237b2238c9af7f51c6b7afb8bbf52c866"
+UPSTREAM_CHECK_GITTAGREGEX = "Release_(?P<pver>\d+(\_\d+)+)"
 inherit cmake python3native
@@ -18,4 +21,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/editorconfig/editorconfig-core-c_0.12.6.bb b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb
index 976120b515..c6db2ef38c 100644
--- a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.6.bb
+++ b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb
@@ -2,12 +2,11 @@ SUMMARY = "EditorConfig helps maintain consistent coding styles across various e
 HOMEPAGE = "https://https://editorconfig.org"
 SECTION = "libs"
 LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f515fff3ea0a2b9797eda60d83c0e5ca"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=38f617473e9f7373b5e79baf437accf8"
 SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
+SRCREV = "e082c947e7f7b14240195d55c060a6e1eda1b0a1"
-SRCREV = "b7837029494c03af5ea70ed9d265e8c2123bff53"
 inherit cmake
diff --git a/meta-oe/recipes-devtools/exprtk/exprtk_git.bb b/meta-oe/recipes-devtools/exprtk/exprtk_git.bb
index 4019f26899..bdaa39b402 100644
--- a/meta-oe/recipes-devtools/exprtk/exprtk_git.bb
+++ b/meta-oe/recipes-devtools/exprtk/exprtk_git.bb
@@ -1,13 +1,12 @@
 SUMMARY = "Expression parser"
-HOMEPAGE = "https://github.com/ArashPartow/exprtk"
+HOMEPAGE = "https://www.partow.net/programming/exprtk/index.html"
 SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-SRCREV = "f46bffcd6966d38a09023fb37ba9335214c9b959"
+SRCREV = "a4b17d543f072d2e3ba564e4bc5c3a0d2b05c338"
 SRC_URI = "git://github.com/ArashPartow/exprtk.git;branch=release;protocol=https"
-S = "${WORKDIR}/git"
 # other packages commonly reference the file directly as "exprtk.hpp"
 # create symlink to allow this usage
diff --git a/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb b/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb
index a4cd7ad157..83e9383d4a 100644
--- a/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb
+++ b/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb
@@ -7,7 +7,6 @@ DEPENDS = "openssl"
 SRC_URI = "git://git.pengutronix.de/git/extract-cert;protocol=https;branch=master;"
 SRCREV = "d652b4e8279aef2a85f58676ab472744bafeafc9"
-S = "${WORKDIR}/git"
 inherit meson pkgconfig
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
index 183554e2c8..c51a49ba01 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
@@ -13,7 +13,6 @@ DEPENDS = "flatbuffers-native"
 RDEPENDS:${PN}-compiler = "${PN}"
 RDEPENDS:${PN}-dev += "${PN}-compiler"
-S = "${WORKDIR}/git"
 EXTRA_OECMAKE += " \
    -DFLATBUFFERS_BUILD_TESTS=OFF \    
@@ -23,6 +22,11 @@ EXTRA_OECMAKE:append:class-target = " -DFLATBUFFERS_FLATC_EXECUTABLE=${STAGING_B
 inherit cmake python3native
+rm_flatc_cmaketarget_for_target() {
+    rm -f "${SYSROOT_DESTDIR}/${libdir}/cmake/flatbuffers/FlatcTargets.cmake"
+}
+SYSROOT_PREPROCESS_FUNCS:class-target += "rm_flatc_cmaketarget_for_target"
 FILES:${PN}-compiler = "${bindir}"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc
index 8f6c4c68f1..36b448a41c 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc
@@ -1,3 +1,3 @@
-PV = "24.3.25"
+PV = "25.2.10"
-SRCREV = "595bf0007ab1929570c7671f091313c8fc20644e"
+SRCREV = "1c514626e83c20fffa8557e75641848e1e15cd5e"
 SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https"
diff --git a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
index 5d3c73fd9a..feb206f27c 100644
--- a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 require flatbuffers.inc
-S = "${WORKDIR}/git/python"
+S = "${UNPACKDIR}/${BP}/python"
 RDEPENDS:${PN} = "flatbuffers"
 inherit setuptools3
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/flatcc/flatcc_git.bb b/meta-oe/recipes-devtools/flatcc/flatcc_git.bb
index 2530dac526..2565e3b9bd 100644
--- a/meta-oe/recipes-devtools/flatcc/flatcc_git.bb
+++ b/meta-oe/recipes-devtools/flatcc/flatcc_git.bb
@@ -14,7 +14,6 @@ SRC_URI = " \
 "
 SRCREV = "1653ec964730ec7d9892a08a1695ada6d20f5196"
-S = "${WORKDIR}/git"
 inherit cmake
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch
new file mode 100644
index 0000000000..5a0650aec1
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch
@@ -0,0 +1,24 @@
+From 8dfd7f2cba428f5eb232fbbe3427c64171bae0f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
+Date: Tue, 5 Mar 2024 18:36:37 +0100
+Subject: [PATCH 1/3] projectorganizer: fix invalid string comparison
+Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/8dfd7f2cba428f5eb232fbbe3427c64171bae0f4]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ projectorganizer/src/prjorg-sidebar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c
+index b6422f0..0139473 100644
+--- a/projectorganizer/src/prjorg-sidebar.c
+++ b/projectorganizer/src/prjorg-sidebar.c
+@@ -346,7 +346,7 @@ static gchar *get_fallback_dir_of_selection(void)
+                {
+                        locale_path = g_path_get_dirname(doc->real_path);
+ 
+-                       if (locale_path && locale_path == '.')
+                       if (locale_path && *locale_path == '.')
+                        {
+                                g_free(locale_path);
+                                locale_path = NULL;
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch
new file mode 100644
index 0000000000..c70f4d6e15
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch
@@ -0,0 +1,45 @@
+From 58d47e60bdcec62fe74b4a38eaf39d16a9c80d42 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
+Date: Tue, 5 Mar 2024 18:40:10 +0100
+Subject: [PATCH 2/3] projectorganizer: fix various warnings
+Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/58d47e60bdcec62fe74b4a38eaf39d16a9c80d42]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ projectorganizer/src/prjorg-sidebar.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c
+index 0139473..e67cce2 100644
+--- a/projectorganizer/src/prjorg-sidebar.c
+++ b/projectorganizer/src/prjorg-sidebar.c
+@@ -382,7 +382,8 @@ void on_open_file_manager(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gp
+ 
+        if (locale_path)
+        {
+-               gchar *command, *open_command;
+               const gchar *open_command;
+               gchar *command;
+ 
+                open_command = PRJORG_COMMAND_OPEN;
+                command = g_strconcat (open_command, " \"", locale_path, "\"", NULL);
+@@ -1562,7 +1563,7 @@ gchar **prjorg_sidebar_get_expanded_paths(void)
+                (GtkTreeViewMappingFunc)on_map_expanded, expanded_paths);
+        g_ptr_array_add(expanded_paths, NULL);
+ 
+-       return g_ptr_array_free(expanded_paths, FALSE);
+       return (gchar **)g_ptr_array_free(expanded_paths, FALSE);
+ }
+ 
+ 
+@@ -1587,10 +1588,6 @@ void prjorg_sidebar_update_full(gboolean reload, gchar **expanded_paths)
+ 
+        if (reload)
+        {
+-               GtkTreeSelection *treesel;
+-               GtkTreeIter iter;
+-               GtkTreeModel *model;
+-
+                expand_data->expanded_paths = expanded_paths != NULL ? expanded_paths : prjorg_sidebar_get_expanded_paths();
+                expand_data->selected_path = get_selected_path();
+ 
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch
new file mode 100644
index 0000000000..4c4e11c6cd
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch
@@ -0,0 +1,89 @@
+From a4a7c4af7f62eb55c0bd100ed1d308e6512a66ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
+Date: Tue, 23 Apr 2024 18:43:51 +0200
+Subject: [PATCH 3/3] projectorganizer: Use g_pattern_spec_match_string() instead of g_pattern_match_string()
+Eliminates a warning on newer glib versions. Adds a fallback on older versions.
+Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/a4a7c4af7f62eb55c0bd100ed1d308e6512a66ce]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ projectorganizer/src/prjorg-project.c | 2 +-
+ projectorganizer/src/prjorg-sidebar.c | 4 ++--
+ projectorganizer/src/prjorg-utils.c   | 4 ++--
+ projectorganizer/src/prjorg-utils.h   | 5 +++++
+ 4 files changed, 10 insertions(+), 5 deletions(-)
+diff --git a/projectorganizer/src/prjorg-project.c b/projectorganizer/src/prjorg-project.c
+index a767ab8..71dc6e1 100644
+--- a/projectorganizer/src/prjorg-project.c
+++ b/projectorganizer/src/prjorg-project.c
+@@ -216,7 +216,7 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data)
+        {
+                GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]);
+ 
+-               if (g_pattern_match_string(pattern, utf8_base_filename))
+               if (g_pattern_spec_match_string(pattern, utf8_base_filename))
+                {
+                        ret = TRUE;
+                        g_pattern_spec_free(pattern);
+diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c
+index e67cce2..b7536ee 100644
+--- a/projectorganizer/src/prjorg-sidebar.c
+++ b/projectorganizer/src/prjorg-sidebar.c
+@@ -657,7 +657,7 @@ static void find_file_recursive(GtkTreeIter *iter, gboolean case_sensitive, gboo
+                if (!case_sensitive)
+                        SETPTR(utf8_name, g_utf8_strdown(utf8_name, -1));
+ 
+-               if (g_pattern_match_string(pattern, utf8_name))
+               if (g_pattern_spec_match_string(pattern, utf8_name))
+                {
+                        gchar *utf8_base_path = get_project_base_path();
+                        gchar *utf8_path, *rel_path;
+@@ -840,7 +840,7 @@ static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gbool
+                                matches = g_strcmp0(name_case, name) == 0;
+                                break;
+                        case MATCH_PATTERN:
+-                               matches = g_pattern_match_string(pspec, name_case);
+                               matches = g_pattern_spec_match_string(pspec, name_case);
+                                break;
+                        case MATCH_PREFIX:
+                                matches = g_str_has_prefix(name_case, name);
+diff --git a/projectorganizer/src/prjorg-utils.c b/projectorganizer/src/prjorg-utils.c
+index 2a8847e..0b573e5 100644
+--- a/projectorganizer/src/prjorg-utils.c
+++ b/projectorganizer/src/prjorg-utils.c
+@@ -80,7 +80,7 @@ gboolean patterns_match(GSList *patterns, const gchar *str)
+        foreach_slist (elem, patterns)
+        {
+                GPatternSpec *pattern = elem->data;
+-               if (g_pattern_match_string(pattern, str))
+               if (g_pattern_spec_match_string(pattern, str))
+                        return TRUE;
+        }
+        return FALSE;
+@@ -269,7 +269,7 @@ gchar *try_find_header_source(gchar *utf8_file_name, gboolean is_header, GSList
+                full_name = elem->data;
+                gchar *base_name = g_path_get_basename(full_name);
+ 
+-               if (g_pattern_match_string(pattern, base_name))
+               if (g_pattern_spec_match_string(pattern, base_name))
+                {
+                        if ((is_header && patterns_match(source_patterns, base_name)) ||
+                                (!is_header && patterns_match(header_patterns, base_name)))
+diff --git a/projectorganizer/src/prjorg-utils.h b/projectorganizer/src/prjorg-utils.h
+index c3719a9..50ed123 100644
+--- a/projectorganizer/src/prjorg-utils.h
+++ b/projectorganizer/src/prjorg-utils.h
+@@ -19,6 +19,11 @@
+ #ifndef __PRJORG_UTILS_H__
+ #define __PRJORG_UTILS_H__
+ 
+
+ #if ! GLIB_CHECK_VERSION(2, 70, 0)
+ # define g_pattern_spec_match_string g_pattern_match_string
+ #endif
+ 
+ gchar *get_relative_path(const gchar *utf8_parent, const gchar *utf8_descendant);
+ 
+ gboolean patterns_match(GSList *patterns, const gchar *str);
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch b/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch
new file mode 100644
index 0000000000..563416bf92
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch
@@ -0,0 +1,30 @@
+Fix build with GCC-15
+Upstream-Status: Backport [https://github.com/geany/geany-plugins/pull/1389]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/git-changebar/src/gcb-plugin.c
+++ b/git-changebar/src/gcb-plugin.c
+@@ -1410,9 +1410,9 @@ read_setting_boolean (GKeyFile     *kf,
+                       const gchar  *key,
+                       gpointer      value)
+ {
+-  gboolean *bool = value;
+  gboolean *boolean = value;
+   
+-  *bool = utils_get_setting_boolean (kf, group, key, *bool);
+  *boolean = utils_get_setting_boolean (kf, group, key, *boolean);
+ }
+ 
+ static void
+@@ -1421,9 +1421,9 @@ write_setting_boolean (GKeyFile      *kf,
+                        const gchar   *key,
+                        gconstpointer  value)
+ {
+-  const gboolean *bool = value;
+  const gboolean *boolean = value;
+   
+-  g_key_file_set_boolean (kf, group, key, *bool);
+  g_key_file_set_boolean (kf, group, key, *boolean);
+ }
+ 
+ /* loads @filename in @kf and return %FALSE if failed, emitting a warning
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb b/meta-oe/recipes-devtools/geany/geany-plugins_2.0.bb
index 1ed2993bf0..9a19e5dc98 100644
--- a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb
+++ b/meta-oe/recipes-devtools/geany/geany-plugins_2.0.bb
@@ -15,7 +15,7 @@ DEPENDS = " \
    fribidi \
    geany \
    libxml2 \
-    libsoup-2.4 \
+    libsoup \
    enchant2 \
    intltool-native \
    libassuan \
@@ -30,12 +30,12 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = " \
    https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \
-    file://0001-Use-pkg-config-to-find-gpgme.patch \
+    file://geany-plugins-2.0-gcc15.patch \
-    file://0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch \
+    file://0001-projectorganizer-fix-invalid-string-comparison.patch \
-    file://0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch \
+    file://0002-projectorganizer-fix-various-warnings.patch \
-    file://0001-scope-Use-0-instead-of-NULL-for-gboolean.patch \
+    file://0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch \
 "
-SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586"
+SRC_URI[sha256sum] = "9fc2ec5c99a74678fb9e8cdfbd245d3e2061a448d70fd110a6aefb62dd514705"
 do_configure:prepend() {
    rm -f ${S}/build/cache/glib-gettext.m4
@@ -75,8 +75,6 @@ PLUGINS += "${PN}-defineformat"
 LIC_FILES_CHKSUM += "file://defineformat/COPYING;md5=751419260aa954499f7abaabaa882bbe"
 FILES:${PN}-defineformat = "${libdir}/geany/defineformat.so"
-# no gnome devhelp in some common layer
-EXTRA_OECONF += "--disable-devhelp"
 #PLUGINS += "${PN}-devhelp"
 #LIC_FILES_CHKSUM += "file://devhelp/COPYING;md5=d32239bcb673463ab874e80d47fae504"
 #LICENSE:${PN}-devhelp = "GPLv3"
@@ -165,8 +163,6 @@ EXTRA_OECONF += "--disable-peg-markdown"
 #LIC_FILES_CHKSUM += "file://markdown/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 #FILES:${PN}-markdown = "${libdir}/geany/markdown.so"
-# | checking whether the GTK version in use is compatible with plugin multiterm... no
-EXTRA_OECONF += "--disable-multiterm"
 #PLUGINS += "${PN}-multiterm"
 #LIC_FILES_CHKSUM += "file://multiterm/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 #FILES:${PN}-multiterm = "${libdir}/geany/multiterm.so"
diff --git a/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
index b966847195..e6db688974 100644
--- a/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
+++ b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
@@ -11,12 +11,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 --- a/configure.ac
 +++ b/configure.ac
-@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux])
+@@ -9,6 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects])
 AC_CONFIG_HEADERS([config.h])
-
-+AC_PROG_INTLTOOL
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
- GEANY_PREFIX
+AC_PROG_INTLTOOL
+ # Silence "AC_LINK_IFELSE before AC_USE_SYSTEM_EXTENSIONS" warnings
+ # Note: Enables _GNU_SOURCE on Linux
+ AC_USE_SYSTEM_EXTENSIONS
diff --git a/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch b/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch
new file mode 100644
index 0000000000..2886b73d22
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch
@@ -0,0 +1,146 @@
+Fix build with GCC-15
+Upstream-Status: Backport [https://sourceforge.net/p/scintilla/code/ci/c7ffad21b23dfad4e8e9f36bb587acc2f6e84fee/]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/scintilla/gtk/PlatGTK.cxx
+++ b/scintilla/gtk/PlatGTK.cxx
+@@ -5,6 +5,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
+#include <cstdint>
+ #include <cstring>
+ #include <cstdio>
+ #include <cmath>
+--- a/scintilla/src/AutoComplete.cxx
+++ b/scintilla/src/AutoComplete.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
+#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/CallTip.cxx
+++ b/scintilla/src/CallTip.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
+#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/CellBuffer.cxx
+++ b/scintilla/src/CellBuffer.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
+#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/ChangeHistory.cxx
+++ b/scintilla/src/ChangeHistory.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
+#include <cstdint>
+ #include <cassert>
+ 
+ #include <stdexcept>
+--- a/scintilla/src/Decoration.cxx
+++ b/scintilla/src/Decoration.cxx
+@@ -6,6 +6,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
+#include <cstdint>
+ #include <cstring>
+ #include <cstdio>
+ #include <cstdarg>
+--- a/scintilla/src/Document.cxx
+++ b/scintilla/src/Document.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
+#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/Indicator.cxx
+++ b/scintilla/src/Indicator.cxx
+@@ -5,6 +5,7 @@
+ // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+#include <cstdint>
+ #include <cmath>
+ 
+ #include <stdexcept>
+--- a/scintilla/src/KeyMap.cxx
+++ b/scintilla/src/KeyMap.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstdlib>
+#include <cstdint>
+ 
+ #include <stdexcept>
+ #include <string_view>
+--- a/scintilla/src/LineMarker.cxx
+++ b/scintilla/src/LineMarker.cxx
+@@ -5,6 +5,7 @@
+ // Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+#include <cstdint>
+ #include <cstring>
+ #include <cmath>
+ 
+--- a/scintilla/src/PerLine.cxx
+++ b/scintilla/src/PerLine.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstddef>
+#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ 
+--- a/scintilla/src/Style.cxx
+++ b/scintilla/src/Style.cxx
+@@ -5,6 +5,8 @@
+ // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+#include <cstdint>
+
+ #include <stdexcept>
+ #include <string_view>
+ #include <vector>
+--- a/scintilla/src/ViewStyle.cxx
+++ b/scintilla/src/ViewStyle.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstddef>
+#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cmath>
+--- a/scintilla/src/XPM.cxx
+++ b/scintilla/src/XPM.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstdlib>
+#include <cstdint>
+ #include <cstring>
+ #include <climits>
+ 
diff --git a/meta-oe/recipes-devtools/geany/geany_1.38.bb b/meta-oe/recipes-devtools/geany/geany_2.0.bb
index d75e3b57fb..4b51195e08 100644
--- a/meta-oe/recipes-devtools/geany/geany_1.38.bb
+++ b/meta-oe/recipes-devtools/geany/geany_2.0.bb
@@ -11,8 +11,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \
           file://0001-configure-Upgrade-to-a-modern-Gettext.patch \
+           file://geany-2.0-gcc15.patch \
          "
-SRC_URI[sha256sum] = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546"
+SRC_URI[sha256sum] = "565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92"
 FILES:${PN} += "${datadir}/icons"
diff --git a/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch b/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch
new file mode 100644
index 0000000000..dc87ed60b9
--- /dev/null
+++ b/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch
@@ -0,0 +1,34 @@
+From 7f0cd4b6b56183b0afbefd01425e5ebd2b8733b4 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Mon, 8 Jul 2024 13:18:11 +0200
+Subject: [PATCH] Makefile: fix typo in soname argument
+* introduced in:
+  https://sourceforge.net/p/giflib/code/ci/b65c7ac2905c0842e7977a7b51d83af4486ca7b8/
+  there is no LIBUTILMAJOR variable only LIBUTILSOMAJOR leading to:
+  ld: fatal error: -soname: must take a non-empty argument
+  collect2: error: ld returned 1 exit status
+  with some linkers like GOLD
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+Upstream-Status: Submitted [https://sourceforge.net/p/giflib/code/merge-requests/17/]
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/Makefile b/Makefile
+index 87966a9..41b149e 100644
+--- a/Makefile
+++ b/Makefile
+@@ -109,7 +109,7 @@ $(LIBUTILSO): $(UOBJECTS) $(UHEADERS)
+ ifeq ($(UNAME), Darwin)
+        $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO)
+ else
+-       $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
+       $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILSOMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
+ endif
+ 
+ libutil.a: $(UOBJECTS) $(UHEADERS)
diff --git a/meta-oe/recipes-devtools/giflib/giflib_5.2.1.bb b/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb
index 79afe9a70f..aa47f93095 100644
--- a/meta-oe/recipes-devtools/giflib/giflib_5.2.1.bb
+++ b/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb
@@ -7,8 +7,13 @@ CVE_PRODUCT = "giflib_project:giflib"
 DEPENDS = "xmlto-native"
-SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz \
-SRC_URI[sha256sum] = "31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd"
+           https://sourceforge.net/p/giflib/code/ci/d54b45b0240d455bbaedee4be5203d2703e59967/tree/doc/giflib-logo.gif?format=raw;subdir=${BP}/doc;name=logo;downloadfilename=giflib-logo.gif \
+           file://0001-Makefile-fix-typo-in-soname-argument.patch \
+"
+SRC_URI[logo.sha256sum] = "1a54383986adad1521d00e003b4c482c27e8bc60690be944a1f3319c75abc2c9"
+SRC_URI[sha256sum] = "be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb"
 do_install() {
    # using autotools's default will end up in /usr/local
diff --git a/meta-oe/recipes-devtools/glade/glade/CVE-2020-36774.patch b/meta-oe/recipes-devtools/glade/glade/CVE-2020-36774.patch
new file mode 100644
index 0000000000..ae44862ccf
--- /dev/null
+++ b/meta-oe/recipes-devtools/glade/glade/CVE-2020-36774.patch
@@ -0,0 +1,54 @@
+From 8f1ed202ad21c787ec406f531905b4cda64fb13c Mon Sep 17 00:00:00 2001
+From: Juan Pablo Ugarte <juanpablougarte@gmail.com>
+Date: Fri, 2 Oct 2020 16:08:23 -0300
+Subject: [PATCH] GladeGtkBox: fix glade_gtk_box_post_create
+Some widgets with contruct properties like GtkMessageDialog get
+rebuilt right after they are created on project loading so we need
+to check glade_project_is_loading() intead of GLADE_CREATE_LOAD
+and use the object ad the connect data to make sure it gets disconected
+if it was the object being rebuilt
+Fix issue #479 "Glade 3.36.0 segfaults when opening a file"
+CVE: CVE-2020-36774
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glade/-/commit/7acdd3c6f6934f47b8974ebc2190a59ea5d2ed17]
+Signed-off-by: Peng Zhang <peng.zhang1.cn@windriver.com>
+---
+ plugins/gtk+/glade-gtk-box.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+diff --git a/plugins/gtk+/glade-gtk-box.c b/plugins/gtk+/glade-gtk-box.c
+index 1153c957..c995524e 100644
+--- a/plugins/gtk+/glade-gtk-box.c
+++ b/plugins/gtk+/glade-gtk-box.c
+@@ -57,9 +57,9 @@ glade_gtk_box_create_editable (GladeWidgetAdaptor *adaptor,
+ }
+ 
+ static void
+-glade_gtk_box_parse_finished (GladeProject *project, GladeWidget *gbox)
+glade_gtk_box_parse_finished (GladeProject *project, GObject *box)
+ {
+-  GObject *box = glade_widget_get_object (gbox);
+  GladeWidget *gbox = glade_widget_get_from_gobject (box);
+ 
+   glade_widget_property_set (gbox, "use-center-child",
+                              gtk_box_get_center_widget (GTK_BOX (box)) != NULL);
+@@ -86,11 +86,11 @@ glade_gtk_box_post_create (GladeWidgetAdaptor *adaptor,
+   g_signal_connect (G_OBJECT (gwidget), "configure-end",
+                     G_CALLBACK (glade_gtk_box_configure_end), container);
+ 
+-  if (reason == GLADE_CREATE_LOAD)
+  if (glade_project_is_loading (project))
+     {
+       g_signal_connect_object (project, "parse-finished",
+                                G_CALLBACK (glade_gtk_box_parse_finished),
+-                               gwidget, 0);
+                               container, 0);
+     }
+ }
+ 
+-- 
+2.34.1
diff --git a/meta-oe/recipes-devtools/glade/glade_3.22.2.bb b/meta-oe/recipes-devtools/glade/glade_3.36.0.bb
index d11751a4b2..3645de3cc3 100644
--- a/meta-oe/recipes-devtools/glade/glade_3.22.2.bb
+++ b/meta-oe/recipes-devtools/glade/glade_3.36.0.bb
@@ -1,26 +1,33 @@
 SUMMARY = "Glade - A User Interface Designer"
-HOMEPAGE = "http://www.gnu.org/software/gnash"
+HOMEPAGE = "https://glade.gnome.org"
 LICENSE = "GPL-2.0-only & LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
-                    file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
+                    file://COPYING.GPL;md5=4641e94ec96f98fabc56ff9cc48be14b \
-                    file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
+                    file://COPYING.LGPL;md5=81227099add6b483afd7b1d4fc4e93b7"
-DEPENDS = "gtk+3 glib-2.0 libxml2 intltool-native \
+DEPENDS = "gtk+3 glib-2.0 libxml2 intltool-native itstool-native \
           gnome-common-native \
           autoconf-archive-native \
 "
 GNOMEBASEBUILDCLASS = "autotools"
-inherit features_check autotools pkgconfig gnomebase gobject-introspection mime-xdg gtk-doc
+inherit features_check autotools gettext pkgconfig gnomebase gobject-introspection mime-xdg gtk-doc
 # xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
 # cairo would at least needed to be built with xlib.
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade/3.22/glade-${PV}.tar.xz \
+SRC_URI = "${GNOME_MIRROR}/glade/3.36/glade-${PV}.tar.xz \
           file://remove-yelp-help-rules-var.patch \
+           file://CVE-2020-36774.patch \
          "
-SRC_URI[md5sum] = "c074fa378c8f1ad80d20133c4ae6f42d"
+SRC_URI[sha256sum] = "19b546b527cc46213ccfc8022d49ec57e618fe2caa9aa51db2d2862233ea6f08"
-SRC_URI[sha256sum] = "edefa6eb24b4d15bd52589121dc109bc08c286157c41288deb74dd9cc3f26a21"
 EXTRA_OECONF += "--disable-man-pages"
 FILES:${PN} += "${datadir}/glade ${datadir}/metainfo ${libdir}/glade/modules/libgladegtk.so"
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.60.1.bb b/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb
index 63c696a623..53867b8fe6 100644
--- a/meta-oe/recipes-devtools/grpc/grpc_1.60.1.bb
+++ b/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb
@@ -3,11 +3,15 @@ Provides gRPC libraries for multiple languages written on top of shared C core l
 (C++, Node.js, Python, Ruby, Objective-C, PHP, C#)"
 HOMEPAGE = "https://github.com/grpc/grpc"
 SECTION = "libs"
-LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0"
+LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0 & MIT & BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906 \
+    file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \
+    file://third_party/xxhash/LICENSE;md5=cdfe7764d5685d8e08b3df302885d7f3 \
+"
-DEPENDS = "c-ares protobuf protobuf-native openssl libnsl2 abseil-cpp re2 zlib"
+DEPENDS = "abseil-cpp c-ares openssl protobuf protobuf-native re2 zlib"
-DEPENDS:append:class-target = " googletest grpc-native "
+DEPENDS:append:class-target = " grpc-native"
 DEPENDS:append:class-nativesdk = " grpc-native "
 PACKAGE_BEFORE_PN = "${PN}-compiler"
@@ -19,14 +23,11 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler"
 # Both dependencies are mutually exclusive
 # RDEPENDS:${PN}-dev += "${PN}-compiler"
-S = "${WORKDIR}/git"
+SRCREV_grpc = "4e9357bca1408596663a218c0c608a4c0560a867"
-SRCREV_grpc = "e5ae3b6b44bf3b64d24bfb4b4f82556239b986db"
+BRANCH = "v1.71.x"
-BRANCH = "v1.60.x"
 SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \
           file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \
           "
-# Fixes build with older compilers 4.8 especially on ubuntu 14.04
-CXXFLAGS:append:class-native = " -Wl,--no-as-needed"
 inherit cmake pkgconfig
@@ -52,7 +53,7 @@ PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUI
 PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF"
 PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF"
 PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF"
-PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite"
+PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF"
 PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,,"
 do_configure:prepend() {
diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb b/meta-oe/recipes-devtools/guider/guider_3.9.9.bb
index 0d93297a07..27f39ed1e1 100644
--- a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
+++ b/meta-oe/recipes-devtools/guider/guider_3.9.9.bb
@@ -1,16 +1,15 @@
-SUMMARY = "performance analyzer"
+SUMMARY = "unified performance analyzer"
 HOMEPAGE = "https://github.com/iipeace/guider"
 BUGTRACKER = "https://github.com/iipeace/guider/issues"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2"
-PV = "3.9.8+git"
+PV = "3.9.9"
-SRC_URI = "git://github.com/iipeace/${BPN};branch=master;protocol=https"
+SRC_URI = "git://github.com/iipeace/${BPN};branch=master;protocol=https;tag=versions/${PV}"
-SRCREV = "a502cd93b13235b7539557a91328de00b7c51bc3"
+SRCREV = "118ab61773463e56dedc78f5cf6723b97a4ad946"
-S = "${WORKDIR}/git"
 inherit setuptools3
diff --git a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
index be2c0f5394..3aca51ee3e 100644
--- a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
+++ b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https;branch=master \
 SRCREV = "bc9e3744bcc47de978673d1e382f4125a1ab5fa8"
-S = "${WORKDIR}/git"
 inherit cmake
@@ -30,3 +29,33 @@ COMPATIBLE_HOST:riscv32 = "null"
 COMPATIBLE_HOST:riscv64 = "null"
 BBCLASSEXTEND = "native"
+# http://errors.yoctoproject.org/Errors/Details/766879/
+#     buildResult:
+#       variable: "LIBUNWIND_HAS_UNW_BACKTRACE"
+#       cached: true
+#       stdout: |
+#         Change Dir: '/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO'
+# 
+#         Run Build Command(s): ninja -v cmTC_51d86
+#         [1/2] ccache /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/aarch64-webos-linux-gcc --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -DLIBUNWIND_HAS_UNW_BACKTRACE  -mcpu=cortex-a72+crc -mbranch-protection=standard -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type  --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot  -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot=  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot=  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native= -o CMakeFiles/cmTC_51d86.dir/src.c.o -c /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO/src.c
+#         FAILED: CMakeFiles/cmTC_51d86.dir/src.c.o
+#         ccache /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/aarch64-webos-linux-gcc --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -DLIBUNWIND_HAS_UNW_BACKTRACE  -mcpu=cortex-a72+crc -mbranch-protection=standard -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type  --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot  -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot=  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot=  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native= -o CMakeFiles/cmTC_51d86.dir/src.c.o -c /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO/src.c
+#         src.c: In function 'main':
+#         src.c:3:43: error: passing argument 1 of 'unw_backtrace' from incompatible pointer type [-Wincompatible-pointer-types]
+#             3 | int main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; }
+#               |                                           ^~~~
+#               |                                           |
+#               |                                           void * (*)[10]
+#         In file included from ../../../../recipe-sysroot/usr/include/libunwind-aarch64.h:232,
+#                          from ../../../../recipe-sysroot/usr/include/libunwind-64.h:7,
+#                          from ../../../../recipe-sysroot/usr/include/libunwind.h:27,
+#                          from src.c:2:
+#         ../../../../recipe-sysroot/usr/include/libunwind-common.h:290:27: note: expected 'void **' but argument is of type 'void * (*)[10]'
+#           290 | extern int unw_backtrace (void **, int);
+#               |                           ^~~~~~~
+#         ninja: build stopped: subcommand failed.
+# 
+#       exitCode: 1
+# 
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
new file mode 100644
index 0000000000..1f8730aba0
--- /dev/null
+++ b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
@@ -0,0 +1,27 @@
+Description: Fix hotspot y coordinate
+Author: Tim Swast <tswast@gmail.com>
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/main.c
+++ b/src/main.c
+@@ -103,7 +103,7 @@
+   if (n_channels == 3)
+     {
+       out->x = start_x;
+-      out->y = start_x;
+      out->y = start_y;
+       out->width = source->gridsize;
+       out->height = source->gridsize;
+       
+@@ -137,8 +137,8 @@
+                    {
+                      min_x = start_x + i;
+                      max_x = start_x + i + 1;
+-                     min_y = start_y + i;
+-                     max_y = start_y + i + 1;
+                     min_y = start_y + j;
+                     max_y = start_y + j + 1;
+ 
+                      found = TRUE;
+                    }
diff --git a/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
index 8e7b0ba5a0..f9ae4de0fb 100644
--- a/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
+++ b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
@@ -1,13 +1,16 @@
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "gdk-pixbuf popt"
+DEPENDS = "gdk-pixbuf popt xcursorgen"
 SRC_URI = "http://freedesktop.org/software/${BPN}/releases/${BPN}-${PV}.tar.gz \
-           file://0001-Makefile.am-no-examples.patch"
+           file://0001-Makefile.am-no-examples.patch \
-SRC_URI[md5sum] = "5c5374d4f265b0abe4daef1d03f87104"
+           file://hotspotfix.patch \
+           "
 SRC_URI[sha256sum] = "05f0216dd0c25a17859de66357f64da5033375b6fbf5f31ca54867311160b64d"
-inherit autotools pkgconfig
+inherit autotools pkgconfig features_check
+# because of xcursorgen dependency
+REQUIRED_DISTRO_FEATURES = "x11"
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb b/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb
index 0f6bbb4d54..f9e2c7873c 100644
--- a/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb
+++ b/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb
@@ -42,7 +42,7 @@ do_compile() {
 do_install() {
    oe_runmake DESTDIR=${D} install
    install -D -m 0644 -p ${S}/iptraf-ng-logrotate.conf ${D}${sysconfdir}/logrotate.d/iptraf-ng
-    install -Dm 0644 ${WORKDIR}/iptraf-ng-tmpfiles.conf ${D}${libdir}/tmpfiles.d/iptraf-ng-tmpfiles.conf
+    install -Dm 0644 ${UNPACKDIR}/iptraf-ng-tmpfiles.conf ${D}${libdir}/tmpfiles.d/iptraf-ng-tmpfiles.conf
 }
 FILES:${PN} += "${libdir}/tmpfiles.d"
diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
index 7e0272f898..aa1f417604 100644
--- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
+++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
@@ -17,8 +17,9 @@ SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=dev;protocol=https \
           file://run-ptest \
           "
 SRCREV = "630434bb0ac619f7beec927569782d924c459385"
+PV_LONG := "${PV}-171-g${SRCREV}"
+PV .= "+git"
-S = "${WORKDIR}/git"
 inherit autotools ptest
@@ -27,7 +28,7 @@ EXTRA_AUTORECONF += "--exclude=autoheader"
 EXTRA_OECONF:append:libc-musl = " --with-jemalloc-prefix=je_"
 # For some reason VERSION file populated only in tarball distribution.
 # Adding jemalloc version since this recipe is using source code from git tag
-EXTRA_OECONF:append = " --with-version=${PV}-0-g${SRCREV} --enable-xmalloc"
+EXTRA_OECONF:append = " --with-version=${PV_LONG} --enable-xmalloc"
 do_install:append() {
        sed -i -e 's@${STAGING_DIR_HOST}@@g' \
diff --git a/meta-oe/recipes-devtools/jq/jq_1.7.1.bb b/meta-oe/recipes-devtools/jq/jq_1.8.0.bb
index 6b12335513..4aaf27da9a 100644
--- a/meta-oe/recipes-devtools/jq/jq_1.7.1.bb
+++ b/meta-oe/recipes-devtools/jq/jq_1.8.0.bb
@@ -6,13 +6,13 @@ HOMEPAGE = "https://jqlang.github.io/jq/"
 BUGTRACKER = "https://github.com/jqlang/jq/issues"
 SECTION = "utils"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=488f4e0b04c0456337fb70d1ac1758ba"
+LIC_FILES_CHKSUM = "file://COPYING;md5=08ffb5ac7e7e6bfc66968b89f01f512a"
 GITHUB_BASE_URI = "https://github.com/jqlang/${BPN}/releases/"
 SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
    file://run-ptest \
    "
-SRC_URI[sha256sum] = "478c9ca129fd2e3443fe27314b455e211e0d8c60bc8ff7df703873deeee580c2"
+SRC_URI[sha256sum] = "91811577f91d9a6195ff50c2bffec9b72c8429dc05ec3ea022fd95c06d2b319c"
 inherit autotools github-releases ptest
@@ -43,4 +43,6 @@ do_install_ptest() {
    sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest
 }
+RDEPENDS:${PN}-ptest += "tzdata"
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb
index 02dcdb2696..c6e910a137 100644
--- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb
+++ b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb
@@ -11,9 +11,10 @@ SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=main;protocol=
 SRCREV = "6b17782d6a5d1dee5d2c4fc5d25ffb1123913431"
-S = "${WORKDIR}/git"
 DEPENDS += "nlohmann-json"
 inherit cmake
 EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DJSON_VALIDATOR_BUILD_TESTS=OFF -DJSON_VALIDATOR_BUILD_EXAMPLES=OFF"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
index d6e42c81d5..56ddaf59a5 100644
--- a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
+++ b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
@@ -16,7 +16,7 @@ SRC_URI = "file://json_spirit_v${PV}.zip \
           file://0001-Link-to-libatomic.patch \
 "
-S = "${WORKDIR}/json_spirit_v${PV}"
+S = "${UNPACKDIR}/json_spirit_v${PV}"
 inherit cmake
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb
index c54dc94666..f68ffd2c0f 100644
--- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb
+++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb
@@ -13,13 +13,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926"
 PE = "1"
-SRCREV = "5defb4ed1a4293b8e2bf641e16b156fb9de498cc"
+SRCREV = "89e2973c754a9c02a49974d839779b151e95afd6"
 SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 inherit cmake
 EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DBUILD_OBJECT_LIBS=OFF -DJSONCPP_WITH_TESTS=OFF"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb
index 544922f05d..ae86e20a4a 100644
--- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb
+++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp;branch=master;protocol=http
 SRCREV = "ec5ce12fc9c0299e1454cc002c70218b5a6f005b"
-S = "${WORKDIR}/git"
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[coverage] = "-DWITH_COVERAGE=YES,-DWITH_COVERAGE=NO,,"
@@ -25,4 +24,8 @@ EXTRA_OECMAKE += "-DCOMPILE_TESTS=NO -DCOMPILE_STUBGEN=NO -DCOMPILE_EXAMPLES=NO
                  -DCMAKE_LIBRARY_PATH=${libdir} \
 "
+do_install:append() {
+        sed -i -e 's#${RECIPE_SYSROOT}#\${CMAKE_SYSROOT}#g' ${D}${libdir}/libjson-rpc-cpp/cmake/libjson-rpc-cppTargets.cmake
+}
 FILES:${PN}-dev += "${libdir}/libjson-rpc-cpp/cmake"
diff --git a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.0.bb b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb
index 19424337f7..5ad953d260 100644
--- a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.0.bb
+++ b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8325a5ce4414c65ffdda392e0d96a9ff"
 SRC_URI = "git://github.com/Thalhammer/jwt-cpp.git;branch=master;protocol=https \
            "
-SRCREV = "08bcf77a687fb06e34138e9e9fa12a4ecbe12332"
+SRCREV = "e71e0c2d584baff06925bbb3aad683f677e4d498"
-S = "${WORKDIR}/git"
 DEPENDS = "openssl"
diff --git a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
index b894f0ba03..43a61908f5 100644
--- a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
+++ b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
@@ -20,7 +20,9 @@ SRC_URI = "git://gitlab.com/ymorin/kconfig-frontends.git;protocol=https;branch=4
 SRCREV = "f22fce3a308be1c7790ebefc6bbedb33c5f7c86a"
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
 inherit autotools pkgconfig
 do_configure:prepend () {
diff --git a/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb b/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb
deleted file mode 100644
index fef9d3a80e..0000000000
--- a/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-SUMMARY = "Linear Algebra PACKage"
-URL = "http://www.netlib.org/lapack"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d0e7a458f9fcbf0a3ba97cef3128b85d"
-# Recipe needs FORTRAN support (copied from conf/local.conf.sample.extended)
-# Enabling FORTRAN
-# Note this is not officially supported and is just illustrated here to
-# show an example of how it can be done
-# You'll also need your fortran recipe to depend on libgfortran
-#FORTRAN:forcevariable = ",fortran"
-#RUNTIMETARGET:append:pn-gcc-runtime = " libquadmath"
-DEPENDS = "libgfortran \
-           ${@bb.utils.contains('PTEST_ENABLED', '1', 'rsync-native', '', d)} \
-          "
-RDEPENDS:${PN}-ptest += "cmake"
-SRCREV = "04b044e020a3560ccfa9988c8a80a1fb7083fc2e"
-SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master \
-           ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \
-          "
-S = "${WORKDIR}/git"
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[lapacke] = "-DLAPACKE=ON,-DLAPACKE=OFF"
-EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=ON \
-                  ${@bb.utils.contains('PTEST_ENABLED', '1', ' -DBUILD_TESTING=ON', '', d)} \
-                "
-OECMAKE_GENERATOR = "Unix Makefiles"
-inherit cmake pkgconfig ptest
-EXCLUDE_FROM_WORLD = "1"
-do_install_ptest () {
-    rsync -a ${B}/TESTING ${D}${PTEST_PATH} \
-          --exclude CMakeFiles \
-          --exclude cmake_install.cmake \
-          --exclude Makefile
-    rsync -a ${B}/BLAS ${D}${PTEST_PATH} \
-          --exclude CMakeFiles \
-          --exclude cmake_install.cmake \
-          --exclude Makefile
-    rsync -a ${B}/LAPACKE ${D}${PTEST_PATH} \
-          --exclude CMakeFiles \
-          --exclude cmake_install.cmake \
-          --exclude Makefile
-    cp -r ${B}/bin ${D}${PTEST_PATH}
-    cp -r ${B}/lapack_testing.py ${D}${PTEST_PATH}
-    cp ${B}/CTestTestfile.cmake ${D}${PTEST_PATH}
-    cp ${S}/TESTING/*.in ${S}/TESTING/runtest.cmake ${D}${PTEST_PATH}/TESTING
-    cp ${S}/BLAS/TESTING/*.in ${D}${PTEST_PATH}/BLAS/TESTING
-    sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
-    sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
-    sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
-    sed -i -e 's#${PYTHON}#/usr/bin/python3#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
-    sed -i -e 's#${WORKDIR}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
-}
diff --git a/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb b/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb
new file mode 100644
index 0000000000..63069b4b83
--- /dev/null
+++ b/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb
@@ -0,0 +1,105 @@
+SUMMARY = "Linear Algebra PACKage"
+URL = "http://www.netlib.org/lapack"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d0e7a458f9fcbf0a3ba97cef3128b85d"
+# Recipe needs FORTRAN support (copied from conf/local.conf.sample.extended)
+# Enabling FORTRAN
+# Note this is not officially supported and is just illustrated here to
+# show an example of how it can be done
+# You'll also need your fortran recipe to depend on libgfortran
+#FORTRAN:forcevariable = ",fortran"
+#RUNTIMETARGET:append:pn-gcc-runtime = " libquadmath"
+DEPENDS = "libgfortran \
+           ${@bb.utils.contains('PTEST_ENABLED', '1', 'rsync-native', '', d)} \
+          "
+RDEPENDS:${PN}-ptest += "cmake"
+SRCREV = "5ebe92156143a341ab7b14bf76560d30093cfc54"
+SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master \
+           ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \
+          "
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[lapacke] = "-DLAPACKE=ON,-DLAPACKE=OFF"
+PACKAGECONFIG[cblas] = "-DCBLAS=ON,-DCBLAS=OFF"
+EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=ON \
+                  ${@bb.utils.contains('PTEST_ENABLED', '1', ' -DBUILD_TESTING=ON', '', d)} \
+                "
+OECMAKE_GENERATOR = "Unix Makefiles"
+inherit cmake pkgconfig ptest
+EXCLUDE_FROM_WORLD = "1"
+# The `xerbla.o` file contains an absolute path in `xerbla.f.o`, but the options
+# `-fdebug-prefix-map` and `-ffile-prefix-map` cannot be used because gfortran does
+# not support them. And we cannot easily change CMake to use relative paths, because
+# it will convert them to absolute paths when generating Unix Makefiles or Ninja:
+# https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#why-does-cmake-use-full-paths-or-can-i-copy-my-build-tree
+# https://gitlab.kitware.com/cmake/cmake/-/issues/13894
+#
+# To address this issue, we manually replace the absolute path with a relative path
+# in the generated `build.make` file.
+#
+# An issue has been reported: https://github.com/Reference-LAPACK/lapack/issues/1087,
+# requesting a fix in the source code.
+#
+# This workaround resolves the TMPDIR [buildpaths] issue by converting the absolute path
+# of `xerbla.f` to a relative path. The steps are as follows:
+#
+# 1. Locate all `build.make` files after the `do_configure` step is completed.
+# 2. Compute the relative path for various `*.f` files based on the current build directory.
+# 3. Replace the absolute path with the calculated relative path in the `build.make` files
+#
+# Additionally, when ptests are enabled, apply a simpler workaround for ptest code:
+# - Replace occurrences of `${WORKDIR}` in all `build.make` files under the TESTING directory, excluding
+#   the MATGEN subdirectory, with a relative path prefix of `"../../.."`.
+do_configure:append(){
+    for file in `find ${B} -name build.make`; do
+        # Replacing all .f files found with:
+        # for f in $(find ${S} -name \*.f -printf " %f" | sort -u); do
+        # would be more reliable with other optional PACKAGECONFIGs, but also very slow as there are
+        # ~ 3500 of them and this loop takes around 20 minutes
+        for f in xerbla.f c_cblat1.f c_cblat2.f c_cblat3.f c_dblat1.f c_dblat2.f c_dblat3.f c_sblat1.f c_sblat2.f c_sblat3.f c_zblat1.f c_zblat2.f c_zblat3.f cchkdmd.f90 dchkdmd.f90 schkdmd.f90 zchkdmd.f90; do
+            sed -i -e "s#\(.*-c \).*\(/$f \)#\1$(grep "\-c .*$f" $file | awk -F'cd ' '{print $2}'| \
+                awk "{src=\$1; sub(/.*-c /, \"\"); sub(/$f.*/, \"\"); obj=\$0; print src, obj}" | \
+                while read src obj; do echo "$(realpath --relative-to="$src" "$obj")"; done)\2#g" $file
+         done
+    done
+    if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)} ; then
+        for file in `find . -name build.make -path '*TESTING*' -not -path '*MATGEN*'`; do
+            sed -i -e "s#\(.*-c \)\(${WORKDIR}\)\(.*.[f|F] \)#\1../../..\3#g" $file
+        done
+    fi
+}
+do_install_ptest () {
+    rsync -a ${B}/TESTING ${D}${PTEST_PATH} \
+          --exclude CMakeFiles \
+          --exclude cmake_install.cmake \
+          --exclude Makefile
+    rsync -a ${B}/BLAS ${D}${PTEST_PATH} \
+          --exclude CMakeFiles \
+          --exclude cmake_install.cmake \
+          --exclude Makefile
+    rsync -a ${B}/LAPACKE ${D}${PTEST_PATH} \
+          --exclude CMakeFiles \
+          --exclude cmake_install.cmake \
+          --exclude Makefile \
+          --exclude lapacke.pc
+    cp -r ${B}/bin ${D}${PTEST_PATH}
+    cp -r ${B}/lapack_testing.py ${D}${PTEST_PATH}
+    cp ${B}/CTestTestfile.cmake ${D}${PTEST_PATH}
+    cp ${S}/TESTING/*.in ${S}/TESTING/runtest.cmake ${D}${PTEST_PATH}/TESTING
+    cp ${S}/BLAS/TESTING/*.in ${D}${PTEST_PATH}/BLAS/TESTING
+    sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${PYTHON}#/usr/bin/python3#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${WORKDIR}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+}
+# It needs fortran compiler and we do not enable fortran with clang yet
+TOOLCHAIN = "gcc"
diff --git a/meta-oe/recipes-devtools/ldns/ldns_1.8.3.bb b/meta-oe/recipes-devtools/ldns/ldns_1.8.4.bb
index 16816e62d8..f071f579df 100644
--- a/meta-oe/recipes-devtools/ldns/ldns_1.8.3.bb
+++ b/meta-oe/recipes-devtools/ldns/ldns_1.8.4.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34330f15b2b4abbbaaa7623f79a6a019"
 SRC_URI = "https://www.nlnetlabs.nl/downloads/ldns/ldns-${PV}.tar.gz"
-SRC_URI[sha256sum] = "c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860"
+SRC_URI[sha256sum] = "838b907594baaff1cd767e95466a7745998ae64bc74be038dccc62e2de2e4247"
 DEPENDS = "openssl"
@@ -19,5 +19,6 @@ do_install:append() {
    sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \
        -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
        -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
-        -i ${D}${libdir}/pkgconfig/*.pc
+        -e 's@${RECIPE_SYSROOT}@@g' \
+        -i ${D}${libdir}/pkgconfig/*.pc ${D}${bindir}/ldns-config
 }
diff --git a/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb b/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb
index 2904a454dc..8a8491b76b 100644
--- a/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb
+++ b/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/sqlite/sqlite;protocol=https;branch=branch-3.44"
 SRCREV = "c8f9803dc32bfee78a9ca2b1abbe39499729219b"
-S = "${WORKDIR}/git"
 do_compile() {
    ${CC} ${CFLAGS} ${LDFLAGS} tool/lemon.c -o lemon
diff --git a/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch b/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch
new file mode 100644
index 0000000000..7c500e0b54
--- /dev/null
+++ b/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch
@@ -0,0 +1,91 @@
+From 0db4af09f1bf4456527b5f6ec60fc1305e770c4c Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Tue, 9 Jul 2024 15:19:35 +0100
+Subject: [PATCH] configure.ac: improve fts checks
+The current code checks explicitly for musl and if so uses pkg-config to
+find fts-standalone. This is suboptimal because musl may not be the only
+libc to need a standalone fts implementation, and fts-standalone is an
+old gentoo-specific name[1] so libabigail won't build on any other system
+against musl.
+Instead, use AC_SEARCH_LIBS to look for fts_open in libc then libfts. Do
+this before the check for behaviour just in case someone has a standalone
+and broken implementation.  I assume that the standalone fts is installed
+on the standard search path, which should be a fair assumption.
+As we're not using pkg-config anymore the required link flags are now in
+LIBS, so remove all instances of FTS_CFLAGS and FTS_LIBS.
+[1] https://gitweb.gentoo.org/repo/gentoo.git/commit/sys-libs/fts-standalone?id=a403fe6c61d1aaeecd58d521f3def2f6d3513449
+Upstream-Status: Submitted [https://sourceware.org/pipermail/libabigail/2024q3/005973.html]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ configure.ac      | 9 ++++-----
+ src/Makefile.am   | 4 ++--
+ tools/Makefile.am | 2 --
+ 3 files changed, 6 insertions(+), 9 deletions(-)
+diff --git a/configure.ac b/configure.ac
+index e118a9c0..0aff2ec2 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -281,6 +281,10 @@ fi
+ 
+ AC_SUBST(VISIBILITY_FLAGS)
+ 
+# glibc and BSD include fts into their libc, but musl does not so check if we
+# need to explicitly link to the standalone musl-fts.
+AC_SEARCH_LIBS([fts_open], [fts])
+
+ dnl Older glibc had a broken fts that didn't work with Large File Systems.
+ dnl We want the version that can handler LFS, but include workaround if we
+ dnl get a bad one. Add define to CFLAGS (not AC_DEFINE it) since we need to
+@@ -295,11 +299,6 @@ AS_IF([test "x$ac_cv_bad_fts" = "xyes"],
+       [CFLAGS="$CFLAGS -DBAD_FTS=1",
+        CXXFLAGS="$CXXFLAGS -DBAD_FTS=1"])
+ 
+-dnl On musl, we need to find fts-standalone
+-AS_CASE(
+-  [${host_os}], [*-musl*], [
+-    PKG_CHECK_MODULES([FTS], [fts-standalone])
+-])
+ 
+ dnl Check for dependency: libelf, libdw, libebl (elfutils)
+ dnl Note that we need to use at least elfutils 0.159 but
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3044c136..1c98bf84 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -52,12 +52,12 @@ if BTF_READER
+ libabigail_la_SOURCES += abg-btf-reader.cc
+ endif
+ 
+-libabigail_la_LIBADD = $(DEPS_LIBS) $(FTS_LIBS)
+libabigail_la_LIBADD = $(DEPS_LIBS)
+ libabigail_la_LDFLAGS = -lpthread -Wl,--as-needed -no-undefined -version-info $(LIBABIGAIL_SO_CURRENT):$(LIBABIGAIL_SO_REVISION):$(LIBABIGAIL_SO_AGE)
+ 
+ CUSTOM_MACROS = -DABIGAIL_ROOT_SYSTEM_LIBDIR=\"${libdir}\"
+ 
+ AM_CPPFLAGS=\
+-$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) $(FTS_CFLAGS) \
+$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) \
+ -Wall -I$(abs_top_srcdir) -I$(abs_top_srcdir)/include \
+ -I$(abs_top_builddir)/include -I$(abs_top_builddir)
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index cbb5ce10..ea2d300c 100644
+--- a/tools/Makefile.am
+++ b/tools/Makefile.am
+@@ -41,8 +41,6 @@ abicompatdir = $(bindir)
+ 
+ abipkgdiff_SOURCES = abipkgdiff.cc
+ abipkgdiffdir = $(bindir)
+-abipkgdiff_CPPFLAGS = $(FTS_CFLAGS)
+-abipkgdiff_LDADD = $(FTS_LIBS)
+ abipkgdiff_LDFLAGS = $(abs_top_builddir)/src/libabigail.la -pthread
+ 
+ kmidiff_SOURCES = kmidiff.cc
+-- 
+2.34.1
diff --git a/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb b/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb
new file mode 100644
index 0000000000..5c262d2880
--- /dev/null
+++ b/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb
@@ -0,0 +1,17 @@
+SUMMARY = "The ABI Generic Analysis and Instrumentation Library"
+HOMEPAGE = "https://sourceware.org/libabigail/"
+LICENSE = "Apache-2.0-with-LLVM-exception"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab"
+SRC_URI = "http://mirrors.kernel.org/sourceware/${BPN}/${BP}.tar.xz \
+           file://0001-Check-for-correct-fts-module.patch \
+           "
+SRC_URI[sha256sum] = "7cfc4e9b00ae38d87fb0c63beabb32b9cbf9ce410e52ceeb5ad5b3c5beb111f3"
+DEPENDS = "elfutils libxml2"
+DEPENDS:append:libc-musl = " fts"
+inherit autotools pkgconfig lib_package
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb b/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb
deleted file mode 100644
index 0ed6e8235d..0000000000
--- a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "libgee is a collection library providing GObject-based interfaces \
-and classes for commonly used data structures."
-HOMEPAGE = "http://live.gnome.org/Libgee"
-SECTION = "libs"
-DEPENDS = "glib-2.0"
-BBCLASSEXTEND = "native"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-GNOMEBASEBUILDCLASS = "autotools"
-inherit gnomebase vala gobject-introspection
-do_configure:prepend() {
-    MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-    for i in ${MACROS}; do
-        rm -f m4/$i
-    done
-}
-SRC_URI[archive.sha256sum] = "1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d"
diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.20.8.bb b/meta-oe/recipes-devtools/libgee/libgee_0.20.8.bb
new file mode 100644
index 0000000000..7e29c72c02
--- /dev/null
+++ b/meta-oe/recipes-devtools/libgee/libgee_0.20.8.bb
@@ -0,0 +1,58 @@
+DESCRIPTION = "libgee is a collection library providing GObject-based interfaces \
+and classes for commonly used data structures."
+HOMEPAGE = "http://live.gnome.org/Libgee"
+SECTION = "libs"
+DEPENDS = "glib-2.0"
+BBCLASSEXTEND = "native"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+GNOMEBASEBUILDCLASS = "autotools"
+inherit gnomebase vala gobject-introspection
+CFLAGS += "-Wno-incompatible-pointer-types"
+do_configure:prepend() {
+    MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
+    for i in ${MACROS}; do
+        rm -f m4/$i
+    done
+}
+SRC_URI[archive.sha256sum] = "189815ac143d89867193b0c52b7dc31f3aa108a15f04d6b5dca2b6adfad0b0ee"
+# http://errors.yoctoproject.org/Errors/Details/766884/
+# libgee-0.20.6/gee/concurrentlist.c:1169:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:1175:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2385:194: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2438:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2460:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2469:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2481:185: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2640:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2641:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2750:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:469:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:514:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:713:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:3635:185: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:4950:201: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5378:201: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5428:226: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5480:218: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5530:238: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5532:234: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5623:246: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5625:242: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:7088:194: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:7157:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:7184:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:7198:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:7215:185: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/hashmap.c:4089:30: error: assignment to 'gboolean (*)(GeeMapIterator *)' {aka 'int (*)(struct _GeeMapIterator *)'} from incompatible pointer type 'gboolean (*)(GeeHashMapNodeIterator *)' {aka 'int (*)(struct _GeeHashMapNodeIterator *)'} [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/hazardpointer.c:430:134: error: passing argument 4 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/hazardpointer.c:430:171: error: passing argument 5 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/hazardpointer.c:434:134: error: passing argument 4 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/hazardpointer.c:434:171: error: passing argument 5 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb b/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
index 9b18269bcb..3616eb519d 100644
--- a/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
+++ b/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
@@ -16,7 +16,6 @@ inherit autotools-brokensep pkgconfig
 # sombok-2.4.0
 SRCREV = "0098d85a037ef5c99a648a3669a077781a45e8cc"
-S = "${WORKDIR}/git"
 # Disable libthai support
 EXTRA_OECONF = "--disable-libthai"
diff --git a/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch
new file mode 100644
index 0000000000..c8c9922d55
--- /dev/null
+++ b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch
@@ -0,0 +1,46 @@
+From dee78f822d8a5b985e565e5c1ef42a59557aa8fc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 7 Mar 2025 11:35:46 -0800
+Subject: [PATCH] Remove whitespace in operator""
+Clang 20+ errors about this whitespace.
+Fixes
+include/toml11/impl/../fwd/literal_fwd.hpp:22:26: error: identifier '_toml' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator]
+|    22 | ::toml::value operator"" _toml(const char* str, std::size_t len);
+|       |               ~~~~~~~~~~~^~~~~
+|       |               operator""_toml
+Upstream-Status: Submitted [https://github.com/ToruNiina/toml11/pull/285]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/toml11/fwd/literal_fwd.hpp   | 2 +-
+ include/toml11/impl/literal_impl.hpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/include/toml11/fwd/literal_fwd.hpp b/include/toml11/fwd/literal_fwd.hpp
+index e46612c..82f62b7 100644
+--- a/include/toml11/fwd/literal_fwd.hpp
+++ b/include/toml11/fwd/literal_fwd.hpp
+@@ -19,7 +19,7 @@ inline namespace literals
+ inline namespace toml_literals
+ {
+ 
+-::toml::value operator"" _toml(const char* str, std::size_t len);
+::toml::value operator""_toml(const char* str, std::size_t len);
+ 
+ #if defined(TOML11_HAS_CHAR8_T)
+ // value of u8"" literal has been changed from char to char8_t and char8_t is
+diff --git a/include/toml11/impl/literal_impl.hpp b/include/toml11/impl/literal_impl.hpp
+index e8298c2..067d4ed 100644
+--- a/include/toml11/impl/literal_impl.hpp
+++ b/include/toml11/impl/literal_impl.hpp
+@@ -115,7 +115,7 @@ inline namespace toml_literals
+ {
+ 
+ TOML11_INLINE ::toml::value
+-operator"" _toml(const char* str, std::size_t len)
+operator""_toml(const char* str, std::size_t len)
+ {
+     if(len == 0)
+     {
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 0000000000..9bc480aa7f
--- /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.4.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
new file mode 100644
index 0000000000..38786b79ed
--- /dev/null
+++ b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
@@ -0,0 +1,38 @@
+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 = "be08ba2be2a964edcdb3d3e3ea8d100abc26f286"
+SRCREV_json = "8c391e04fe4195d8be862c97f38cfe10e2a3472e"
+SRCREV_doctest = "ae7a13539fb71f270b87eb2e874fbac80bc8dda2"
+SRC_URI = "git://github.com/ToruNiina/toml11;branch=main;protocol=https \
+           git://github.com/nlohmann/json;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/tests/extlib/json;name=json;branch=develop;protocol=https \
+           git://github.com/doctest/doctest;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/tests/extlib/doctest;name=doctest;branch=master;protocol=https \
+           file://0001-Remove-whitespace-in-operator.patch \
+           file://run-ptest \
+"
+SRCREV_FORMAT = "json_doctest"
+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/libubox/libubox_git.bb b/meta-oe/recipes-devtools/libubox/libubox_git.bb
index 39e18cdafd..394cf9c000 100644
--- a/meta-oe/recipes-devtools/libubox/libubox_git.bb
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -22,7 +22,9 @@ SRC_URI = "\
 SRCREV = "07413cce72e19520af55dfcbc765484f5ab41dd9"
 PV = "1.0.1+git"
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-devtools/lshw/lshw_02.20.bb b/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
index 0fb68d8684..95e2084255 100644
--- a/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
+++ b/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
@@ -18,7 +18,6 @@ SRC_URI = " \
    file://0001-disable-docbook2man.patch \
 "
-S = "${WORKDIR}/git"
 inherit pkgconfig
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch
deleted file mode 100644
index c896e3ebb0..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 95ff340a74af16cca89fd5c5ca99890821053209 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 22 Apr 2017 00:47:16 -0700
-Subject: [PATCH] ARM code has unreachable code after switch statement move
- initialization
-Fixed
-sysdeps/linux-gnu/arm/trace.c:173:33: error: statement will never be executed [-Werror=switch-unreachable]
-    uint32_t operand1, operand2, result = 0;
-                                 ^~~~~~
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- sysdeps/linux-gnu/arm/trace.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c
-index 5e51e91..f974d1f 100644
--- a/sysdeps/linux-gnu/arm/trace.c
-+++ b/sysdeps/linux-gnu/arm/trace.c
-@@ -155,6 +155,8 @@ arm_get_next_pcs(struct process *proc,
-        const unsigned cond = BITS(this_instr, 28, 31);
-        const unsigned opcode = BITS(this_instr, 24, 27);
- 
-+       uint32_t operand1, operand2, result = 0;
-+
-        if (cond == COND_NV)
-                switch (opcode) {
-                        arch_addr_t addr;
-@@ -170,7 +172,6 @@ arm_get_next_pcs(struct process *proc,
-                }
-        else
-                switch (opcode) {
-                       uint32_t operand1, operand2, result = 0;
-                case 0x0:
-                case 0x1:                       /* data processing */
-                case 0x2:
-- 
-2.12.2
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch
deleted file mode 100644
index a599d0e191..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From 0af8ced6376f2256b9daac301c851e1c99c3b035 Mon Sep 17 00:00:00 2001
-From: Adam Trhon <adam.trhon@tbs-biometrics.com>
-Date: Fri, 12 May 2017 13:39:11 +0200
-Subject: [PATCH] Fix tautological compare warning
-By default, gcc ignores warning from code generated by macros
-(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80369). When
-ltrace is compiled under icecream the warning *is generated*
-(https://github.com/icecc/icecream/issues/202)
-and the compilation fails (because of -Werror).
-Upstream-Status: Submitted [ltrace-devel@lists.alioth.debian.org]
-Signed-off-by: Adam Trhon <adam.trhon@tbs-biometrics.com>
---
- filter.c                        | 4 ++--
- sysdeps/linux-gnu/arm/fetch.c   | 2 +-
- sysdeps/linux-gnu/arm/trace.c   | 2 +-
- sysdeps/linux-gnu/ia64/fetch.c  | 2 +-
- sysdeps/linux-gnu/metag/trace.c | 2 +-
- sysdeps/linux-gnu/mips/plt.c    | 2 +-
- sysdeps/linux-gnu/ppc/fetch.c   | 2 +-
- sysdeps/linux-gnu/ppc/plt.c     | 2 +-
- sysdeps/linux-gnu/ppc/trace.c   | 4 ++--
- sysdeps/linux-gnu/s390/fetch.c  | 2 +-
- sysdeps/linux-gnu/s390/trace.c  | 4 ++--
- sysdeps/linux-gnu/x86/fetch.c   | 2 +-
- sysdeps/linux-gnu/x86/trace.c   | 4 ++--
- value.c                         | 4 ++--
- 14 files changed, 19 insertions(+), 19 deletions(-)
-diff --git a/filter.c b/filter.c
-index ba50c40..a65856d 100644
--- a/filter.c
-+++ b/filter.c
-@@ -79,7 +79,7 @@ filter_lib_matcher_name_init(struct filter_lib_matcher *matcher,
- {
-        switch (type) {
-        case FLM_MAIN:
-               assert(type != type);
-+               assert(!"Unexpected value of type");
-                abort();
- 
-        case FLM_SONAME:
-@@ -137,7 +137,7 @@ matcher_matches_library(struct filter_lib_matcher *matcher, struct library *lib)
-        case FLM_MAIN:
-                return lib->type == LT_LIBTYPE_MAIN;
-        }
-       assert(matcher->type != matcher->type);
-+       assert(!"Unexpected value of matcher->type");
-        abort();
- }
- 
-diff --git a/sysdeps/linux-gnu/arm/fetch.c b/sysdeps/linux-gnu/arm/fetch.c
-index b500448..8f75fcf 100644
--- a/sysdeps/linux-gnu/arm/fetch.c
-+++ b/sysdeps/linux-gnu/arm/fetch.c
-@@ -317,7 +317,7 @@ arch_fetch_retval(struct fetch_context *ctx, enum tof type,
-                memmove(data, ctx->regs.uregs, sz);
-                return 0;
-        }
-       assert(info->type != info->type);
-+       assert(!"Unexpected value of info->type");
-        abort();
- }
- 
-diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c
-index 5e51e91..e76bf63 100644
--- a/sysdeps/linux-gnu/arm/trace.c
-+++ b/sysdeps/linux-gnu/arm/trace.c
-@@ -701,7 +701,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info)
-                return (size_t)-2;
- 
-        default:
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
- }
-diff --git a/sysdeps/linux-gnu/ia64/fetch.c b/sysdeps/linux-gnu/ia64/fetch.c
-index 171c7a2..ee2fbc7 100644
--- a/sysdeps/linux-gnu/ia64/fetch.c
-+++ b/sysdeps/linux-gnu/ia64/fetch.c
-@@ -409,7 +409,7 @@ arch_fetch_arg_next(struct fetch_context *ctx, enum tof type,
-        case ARGTYPE_ARRAY:
-                /* Arrays decay into pointers.  XXX Fortran?  */
-        default:
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
- }
-diff --git a/sysdeps/linux-gnu/metag/trace.c b/sysdeps/linux-gnu/metag/trace.c
-index ad5fffe..7a843d6 100644
--- a/sysdeps/linux-gnu/metag/trace.c
-+++ b/sysdeps/linux-gnu/metag/trace.c
-@@ -142,7 +142,7 @@ get_regval_from_unit(enum metag_unitnum unit, unsigned int reg,
-                return regs->ax[reg][0];
-        /* We really shouldn't be here.  */
-        default:
-               assert(unit != unit);
-+               assert(!"Unexpected value of unit");
-                abort();
-        }
-        return 0;
-diff --git a/sysdeps/linux-gnu/mips/plt.c b/sysdeps/linux-gnu/mips/plt.c
-index c7c10ac..ca2307d 100644
--- a/sysdeps/linux-gnu/mips/plt.c
-+++ b/sysdeps/linux-gnu/mips/plt.c
-@@ -651,7 +651,7 @@ mips_stub_bp_continue(struct breakpoint *bp, struct process *proc)
-                break;
-        }
- 
-       assert(bp->libsym->arch.type != bp->libsym->arch.type);
-+       assert(!"Unexpected value of bp->libsym->arch.type");
-        abort();
- }
- 
-diff --git a/sysdeps/linux-gnu/ppc/fetch.c b/sysdeps/linux-gnu/ppc/fetch.c
-index c6cbd71..5db5675 100644
--- a/sysdeps/linux-gnu/ppc/fetch.c
-+++ b/sysdeps/linux-gnu/ppc/fetch.c
-@@ -502,7 +502,7 @@ allocate_argument(struct fetch_context *ctx, struct process *proc,
-        case ARGTYPE_ARRAY:
-                /* Arrays decay into pointers.  XXX Fortran?  */
-        default:
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
- 
-diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c
-index 5f81889..781da03 100644
--- a/sysdeps/linux-gnu/ppc/plt.c
-+++ b/sysdeps/linux-gnu/ppc/plt.c
-@@ -1085,7 +1085,7 @@ ppc_plt_bp_continue(struct breakpoint *bp, struct process *proc)
-                break;
-        }
- 
-       assert(bp->libsym->arch.type != bp->libsym->arch.type);
-+       assert(!"Unexpected value of bp->libsym->arch.type");
-        abort();
- }
- 
-diff --git a/sysdeps/linux-gnu/ppc/trace.c b/sysdeps/linux-gnu/ppc/trace.c
-index 5aab538..caa6035 100644
--- a/sysdeps/linux-gnu/ppc/trace.c
-+++ b/sysdeps/linux-gnu/ppc/trace.c
-@@ -217,7 +217,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info)
-                return (size_t)-2;
- 
-        default:
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-                break;
-        }
-@@ -231,7 +231,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info)
- 
-        switch (info->type) {
-        default:
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-                break;
- 
-diff --git a/sysdeps/linux-gnu/s390/fetch.c b/sysdeps/linux-gnu/s390/fetch.c
-index 4ad5951..4721c30 100644
--- a/sysdeps/linux-gnu/s390/fetch.c
-+++ b/sysdeps/linux-gnu/s390/fetch.c
-@@ -266,7 +266,7 @@ arch_fetch_arg_next(struct fetch_context *ctx, enum tof type,
-                return allocate_gpr(ctx, proc, info, valuep, sz);
- 
-        default:
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
-        return -1;
-diff --git a/sysdeps/linux-gnu/s390/trace.c b/sysdeps/linux-gnu/s390/trace.c
-index 78b04c3..24f7801 100644
--- a/sysdeps/linux-gnu/s390/trace.c
-+++ b/sysdeps/linux-gnu/s390/trace.c
-@@ -213,7 +213,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info)
-                return (size_t)-2;
- 
-        default:
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
- }
-@@ -226,7 +226,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info)
- 
-        switch (info->type) {
-        default:
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                break;
- 
-        case ARGTYPE_CHAR:
-diff --git a/sysdeps/linux-gnu/x86/fetch.c b/sysdeps/linux-gnu/x86/fetch.c
-index 6868101..ae2ed79 100644
--- a/sysdeps/linux-gnu/x86/fetch.c
-+++ b/sysdeps/linux-gnu/x86/fetch.c
-@@ -523,7 +523,7 @@ classify(struct process *proc, struct fetch_context *context,
- 
-        default:
-                /* Unsupported type.  */
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
-        abort();
-diff --git a/sysdeps/linux-gnu/x86/trace.c b/sysdeps/linux-gnu/x86/trace.c
-index 6a1a6a5..d8d2115 100644
--- a/sysdeps/linux-gnu/x86/trace.c
-+++ b/sysdeps/linux-gnu/x86/trace.c
-@@ -145,7 +145,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info)
-                return (size_t)-2;
- 
-        default:
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
- }
-@@ -158,7 +158,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info)
- 
-        switch (info->type) {
-        default:
-               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-                break;
- 
-diff --git a/value.c b/value.c
-index 2125ba9..30edb4e 100644
--- a/value.c
-+++ b/value.c
-@@ -363,7 +363,7 @@ value_set_word(struct value *value, long word)
-                u.u64 = word;
-                break;
-        default:
-               assert(sz != sz);
-+               assert(!"Unexpected value of sz");
-                abort();
-        }
- 
-@@ -414,7 +414,7 @@ value_extract_word(struct value *value, long *retp,
-                *retp = (long)u.u64;
-                return 0;
-        default:
-               assert(sz != sz);
-+               assert(!"Unexpected value of sz");
-                abort();
-        }
- }
-- 
-2.12.0
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch
deleted file mode 100644
index 9def41ca60..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 67a8fa478a4484bc4dbfb3ac74e11be1dd5af594 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 23 Dec 2019 19:35:48 -0800
-Subject: [PATCH] ensure the struct pointers are null initilized
-Do not delete if pointer is already null
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- expr.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/expr.c b/expr.c
-index 4059a32..5ffd0ad 100644
--- a/expr.c
-+++ b/expr.c
-@@ -189,10 +189,8 @@ int
- expr_clone(struct expr_node *retp, const struct expr_node *node)
- {
-        *retp = *node;
-
-+       struct expr_node *nlhs = 0, *nrhs = 0;
-        switch (node->kind) {
-               struct expr_node *nlhs;
-               struct expr_node *nrhs;
- 
-        case EXPR_OP_ARGNO:
-        case EXPR_OP_SELF:
-@@ -236,8 +234,10 @@ expr_clone(struct expr_node *retp, const struct expr_node *node)
-                if (expr_alloc_and_clone(&nlhs, node->lhs, node->own_lhs) < 0) {
-                        if (node->kind == EXPR_OP_CALL2
-                            && node->u.call.own_rhs) {
-                               expr_destroy(nrhs);
-                               free(nrhs);
-+                               if (nrhs) {
-+                                       expr_destroy(nrhs);
-+                                       free(nrhs);
-+                               }
-                                return -1;
-                        }
-                }
-- 
-2.24.1
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch
deleted file mode 100644
index 4793e561c0..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f47672bed5905ae382e80b09dafca9a8da45aa67 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 19 Apr 2022 18:44:36 -0700
-Subject: [PATCH] ppc/plt: do not free symbol libsym
-delete_symbol_chain() will call free as well if sybol is non-null
-it also fixes use-after-free warnings that compiler emits
-Upstream-Status: Submitted [https://gitlab.com/cespedes/ltrace/-/merge_requests/2]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- sysdeps/linux-gnu/ppc/plt.c | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c
-index 5f81889..7c1c025 100644
--- a/sysdeps/linux-gnu/ppc/plt.c
-+++ b/sysdeps/linux-gnu/ppc/plt.c
-@@ -687,7 +687,6 @@ arch_elf_add_func_entry(struct process *proc, struct ltelf *lte,
-                if (libsym == NULL
-                    || library_symbol_init(libsym, addr, full_name, 1,
-                                           LS_TOPLT_NONE) < 0) {
-                       free(libsym);
-                        delete_symbol_chain(libsym);
-                        libsym = NULL;
-                        fprintf(stderr, "Couldn't add symbol %s"
-- 
-2.36.0
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch
new file mode 100644
index 0000000000..3e166f0deb
--- /dev/null
+++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch
@@ -0,0 +1,34 @@
+From f2f6082cb112cf3b8a6a5bfc989e4a4f6a1bff27 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 3 Sep 2024 20:41:20 +0000
+Subject: [PATCH] proc: Make PROC_PID_FILE not use variable length array
+This helps in compiling with clang which is not happy about VLA
+| ../../../git/sysdeps/linux-gnu/proc.c:70:3: error: variable length array folded to constant array as an extension [-Werror,-Wgnu-folding-constant]
+|    70 |                 PROC_PID_FILE(proc_exe, "/proc/%d/exe", pid);
+|       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+| ../../../git/sysdeps/linux-gnu/proc.c:59:11: note: expanded from macro 'PROC_PID_FILE'
+|    59 |         char VAR[strlen(FORMAT) + 6];           \
+|       |                  ^~~~~~~~~~~~~~~~~~
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ sysdeps/linux-gnu/proc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c
+index b954997..f37e4e8 100644
+--- a/sysdeps/linux-gnu/proc.c
+++ b/sysdeps/linux-gnu/proc.c
+@@ -56,7 +56,8 @@
+ #define        MAX_DELAY       100000  /* 100000 microseconds = 0.1 seconds */
+ 
+ #define PROC_PID_FILE(VAR, FORMAT, PID)                \
+-       char VAR[strlen(FORMAT) + 6];           \
+       enum { buflen_ ## VAR = strlen(FORMAT)};                \
+       char VAR[buflen_ ## VAR + 6];           \
+        sprintf(VAR, FORMAT, PID)
+ 
+ /*
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
deleted file mode 100644
index 65c7d535eb..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 64f98f84fd88797e219f9dde1ca387fee4b509f0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 24 Apr 2016 16:58:17 -0700
-Subject: [PATCH] replace readdir_r with readdir
-glibc 2.24 has deprecated readdir_r
-https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Submitted
- sysdeps/linux-gnu/proc.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c
-index 953fd86..edb716d 100644
--- a/sysdeps/linux-gnu/proc.c
-+++ b/sysdeps/linux-gnu/proc.c
-@@ -242,9 +242,10 @@ process_tasks(pid_t pid, pid_t **ret_tasks, size_t *ret_n)
-        size_t alloc = 0;
- 
-        while (1) {
-               struct dirent entry;
-                struct dirent *result;
-               if (readdir_r(d, &entry, &result) != 0) {
-+               errno = 0;
-+               result = readdir(d);
-+               if (errno != 0) {
-                fail:
-                        free(tasks);
-                        closedir(d);
-- 
-2.8.0
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
index 63971970cf..f84d989eef 100644
--- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
+++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
@@ -11,36 +11,31 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 PE = "1"
 PV = "7.91+git"
-SRCREV = "c22d359433b333937ee3d803450dc41998115685"
+SRCREV = "8eabf684ba6b11ae7a1a843aca3c0657c6329d73"
 DEPENDS = "elfutils"
-SRC_URI = "git://github.com/sparkleholic/ltrace.git;protocol=https;branch=master \
+SRC_URI = "git://gitlab.com/cespedes/ltrace.git;protocol=https;branch=main \
           file://configure-allow-to-disable-selinux-support.patch \
-           file://0001-replace-readdir_r-with-readdir.patch \
           file://0001-Use-correct-enum-type.patch \
           file://0002-Fix-const-qualifier-error.patch \
-           file://0001-ARM-code-has-unreachable-code-after-switch-statement.patch \
-           file://0001-Fix-tautological-compare-warning.patch \
           file://0001-Add-support-for-mips64-n32-n64.patch \
           file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \
           file://0001-mips-plt.c-Delete-include-error.h.patch \
           file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \
           file://0001-hook-Do-not-append-int-to-std-string.patch \
           file://0001-Bug-fix-for-data-type-length-judgment.patch \
-           file://0001-ensure-the-struct-pointers-are-null-initilized.patch \
           file://0001-ppc-Remove-unused-host_powerpc64-function.patch \
           file://0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch \
-           file://0001-ppc-plt-do-not-free-symbol-libsym.patch \
           file://0001-Fix-type-of-single-bit-bitfields.patch \
+           file://0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch \
           "
 SRC_URI:append:libc-musl = " file://add_ppc64le.patch"
-S = "${WORKDIR}/git"
 inherit autotools
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
-PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind"
+PACKAGECONFIG[unwind] = "--with-libunwind --without-elfutils,--without-libunwind,libunwind"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
 COMPATIBLE_HOST:riscv64 = "null"
diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
deleted file mode 100644
index 807cc4417f..0000000000
--- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-clang pretends to be gcc 4.2.0 which is a big lie when it comes
-to features, its same as latest gcc
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-Index: LuaJIT-2.0.5/src/lj_arch.h
-===================================================================
--- LuaJIT-2.0.5.orig/src/lj_arch.h
-+++ LuaJIT-2.0.5/src/lj_arch.h
-@@ -436,7 +436,7 @@
- #endif
- #endif
- #elif !LJ_TARGET_PS3
-#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
-+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__)
- #error "Need at least GCC 4.3 or newer"
- #endif
- #endif
diff --git a/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
index 240271d410..f4a1345ab2 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_git.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Just-In-Time Compiler for Lua"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=076b97f5c7e61532f7f6f3865f04da57"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d421a5e2a24207f5e260537399a9a38b"
 HOMEPAGE = "http://luajit.org"
 SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
@@ -9,9 +9,8 @@ SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
           "
 PV = "2.1"
-SRCREV = "c525bcb9024510cad9e170e12b6209aedb330f83"
+SRCREV = "538a82133ad6fddfd0ca64de167c4aca3bc1a2da"
-S = "${WORKDIR}/git"
 inherit pkgconfig binconfig siteinfo
@@ -21,7 +20,7 @@ BBCLASSEXTEND = "native"
 # Host luajit needs to be compiled with the same pointer size
 # If you want to cross-compile to any 32 bit target on an x64 OS,
 # you need to install the multilib development package (e.g.
-# libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part
+# libc6-dev:i386 on Debian/Ubuntu) and build a 32 bit host part
 # (HOST_CC="gcc -m32").
 BUILD_CC_ARCH:append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}"
diff --git a/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb b/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb
index 1d27eb2588..59bc4dfcfe 100644
--- a/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb
+++ b/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb
@@ -8,7 +8,6 @@ DEPENDS += "lua-native lua virtual/crypt"
 SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release-v36.2;protocol=https \
 "
 SRCREV = "5a8d8c768fc3c51f42cb591e9523a60399efc6a1"
-S = "${WORKDIR}/git"
 LUA_VERSION = "5.4"
 B = "${S}"
@@ -16,7 +15,7 @@ B = "${S}"
 inherit pkgconfig
 do_compile() {
-    ${S}/build-aux/luke
+    ${S}/build-aux/luke LUA_INCDIR=${STAGING_INCDIR}
 }
 do_install() {
diff --git a/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb b/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb
index f94025dd05..57c8417f44 100644
--- a/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb
+++ b/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb
@@ -14,7 +14,6 @@ SRC_URI = "\
 SRCREV = "09488c50c6bdc40aec8e3a9b23a539c5054a634c"
-S = "${WORKDIR}/git"
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb b/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
index 028a8f9e46..4590b49955 100644
--- a/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
+++ b/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
@@ -11,6 +11,5 @@ DEPENDS = "libmodbus (>=3.1.4)"
 SRC_URI = "git://github.com/epsilonrt/mbpoll;protocol=https;branch=master"
 SRCREV = "a0bd6c08d3d15b086f2104477295c0705aed366a"
-S = "${WORKDIR}/git"
 inherit pkgconfig cmake
diff --git a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
index 9445856730..dfa77770a7 100644
--- a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
+++ b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
@@ -7,12 +7,21 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
           file://ice-mcpp.patch \
           file://0001-configure-Fix-checks-for-system-headers.patch \
           file://CVE-2019-14274.patch"
-SRC_URI[md5sum] = "512de48c87ab023a69250edc7a0c7b05"
 SRC_URI[sha256sum] = "3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcpp/files/mcpp/"
+UPSTREAM_CHECK_REGEX = "${BPN}/V\.(?P<pver>\d+(\.\d+)+)"
 inherit autotools
 EXTRA_OECONF = " --enable-mcpplib "
 BBCLASSEXTEND = "native nativesdk"
+# http://errors.yoctoproject.org/Errors/Details/766883/
+# mcpp-2.7.2/src/expand.c:713:21: error: assignment to 'char *' from incompatible pointer type 'LOCATION *' {aka 'struct location *'} [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
+# http://errors.yoctoproject.org/Errors/Details/850149/
+# ../../mcpp-2.7.2/src/system.c:3436:15: error: expected identifier or '*' before 'true'
+CFLAGS += "-std=gnu17"
diff --git a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
index 7e0ff54dc5..a65782d017 100644
--- a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
+++ b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
@@ -8,7 +8,7 @@ SECTION = "devtool"
 LICENSE = "GPL-2.0-only"
-S = "${WORKDIR}/memstattool"
+S = "${UNPACKDIR}/memstattool"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=87be186443b1ac2cfa466f475e1ee0cb"
@@ -16,7 +16,6 @@ SRC_URI = "http://sourceforge.net/projects/memstattool/files/memstat_${PV}.tar.g
           file://0001-Include-limits.h-for-PATH_MAX-definition.patch \
           "
-SRC_URI[md5sum] = "2c3acc0c62b2a18f6601b84e54aa7462"
 SRC_URI[sha256sum] = "245d5fc7fb87bcfd14486cd34917cae2856e799559ac568434af12c4852bce94"
 do_install:append(){
diff --git a/meta-oe/recipes-devtools/memtool/memtool/run-ptest b/meta-oe/recipes-devtools/memtool/memtool/run-ptest
new file mode 100644
index 0000000000..865da9f69e
--- /dev/null
+++ b/meta-oe/recipes-devtools/memtool/memtool/run-ptest
@@ -0,0 +1,27 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH
+#
+# SPDX-License-Identifier: MIT
+fail_count=0
+all_count=0
+for test_suite in tests/test_*
+do
+    if "./$test_suite"
+    then
+        echo "PASS: $test_suite"
+    else
+        echo "FAIL: $test_suite"
+        fail_count=$((fail_count + 1))
+    fi
+    all_count=$((all_count + 1))
+done
+if [ $fail_count -eq 0 ]
+then
+    echo "PASS: All $all_count tests passed"
+else
+    echo "FAIL: $fail_count of $all_count tests failed"
+fi
diff --git a/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh b/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh
new file mode 100644
index 0000000000..a74975d392
--- /dev/null
+++ b/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH
+#
+# SPDX-License-Identifier: MIT
+# This script verifies the behavior of memtool against plain files.
+readonly PLAIN_FILE=$(mktemp)
+FAIL_COUNT=0
+setup() {
+        echo "Hello World!" >"$PLAIN_FILE"
+}
+teardown() {
+        rm "$PLAIN_FILE"
+}
+verify() {
+        ACTUAL=$1
+        EXPECTED=$2
+        TEST_NAME=$3
+        if [ "$ACTUAL" = "$EXPECTED" ]; then
+                echo "pass: $TEST_NAME"
+        else
+                echo "FAIL: $TEST_NAME"
+                echo "  Expected: $EXPECTED"
+                echo "  Actual: $ACTUAL"
+                FAIL_COUNT=$((FAIL_COUNT + 1))
+        fi
+}
+# Test Case: Verifies that the expected string of bytes is read from a plain file starting from
+# the offset 6 and reading 6 bytes.
+test_memtool_read() {
+        EXPECTED="00000006: 57 6f 72 6c 64 21                                  World!"
+        ACTUAL=$(memtool md -s "$PLAIN_FILE" -b 0x6+6)
+        verify "$ACTUAL" "$EXPECTED" "memtool read from plain file"
+}
+# Test Case 2: Verifies that the expected string of bytes is written to a plain file starting from
+# and then read the result.
+test_memtool_write() {
+        # Usage of 'od' ensures correct endianess.
+        readonly replace_str_bytes=$(echo "Yocto!" | od -t d4 -A n)
+        # shellcheck disable=SC2086 # We want to pass the bytes as separate arguments.
+        memtool mw -d "$PLAIN_FILE" 0x6+6 $replace_str_bytes
+        EXPECTED="00000006: 59 6f 63 74 6f 21                                  Yocto!"
+        ACTUAL=$(memtool md -s "$PLAIN_FILE" -b 0x6+6)
+        verify "$ACTUAL" "$EXPECTED" "memtool write to plain file"
+}
+for test_case in $(declare -F | grep test_memtool_ | cut -f 3 -d ' '); do
+        setup
+        $test_case
+        teardown
+done
+if [ $FAIL_COUNT -eq 0 ]; then
+        echo "Test Passed: memtool plain file read/write functionality is correct."
+        exit 0
+else
+        echo "Test FAILED: memtool plain file read/write functionality is incorrect. Check the logs."
+        exit 1
+fi
diff --git a/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb b/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb
new file mode 100644
index 0000000000..1e2e93bcd5
--- /dev/null
+++ b/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb
@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH
+#
+# SPDX-License-Identifier: MIT
+SUMMARY = "A tool to manipulate and read memory mapped registers"
+DESCRIPTION = "memtool is a program that allows to access memory mapped registers. This is useful \
+to inspect and modify registers from the command line. memtool can also operate on plain files, \
+and access PHY registers."
+HOMEPAGE = "https://github.com/pengutronix/memtool"
+BUGTRACKER = "https://github.com/pengutronix/memtool/issues"
+SECTION = "devtool"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+SRC_URI = " \
+    http://www.pengutronix.de/software/memtool/downloads/memtool-${PV}.tar.xz \
+    file://run-ptest \
+    file://test_read_write_plainfiles.sh \
+"
+SRC_URI[sha256sum] = "87cb7175266ff3a00a9c1f541c4c6c93693ffbe8dcc0d97a60d13c45ff860900"
+inherit autotools ptest
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/tests
+    install -m 0755 ${UNPACKDIR}/test_* ${D}${PTEST_PATH}/tests
+}
+RDEPENDS:${PN}-ptest += "bash coreutils"
diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb
index 2451a36be2..a312be4aa7 100644
--- a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb
+++ b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb
@@ -10,13 +10,13 @@ RDEPENDS:${PN} = "python3 python3-modules"
 inherit python3native python3targetconfig
 SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz"
-SRC_URI[sha256sum] = "a5603d0d395ebf67fe5d27abbb3bd37fcc01871ecf394c793672d2c1e68be7e7"
+SRC_URI[sha256sum] = "f75d6a4a75823a1b7d713a4967eca2f596f466e58fc6bc06d72642932fd7e307"
-S = "${WORKDIR}/mercurial-${PV}"
+S = "${UNPACKDIR}/mercurial-${PV}"
 BBCLASSEXTEND = "native"
-export LDSHARED="${CCLD} -shared"
+export LDSHARED = "${CCLD} -shared"
 EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
    PREFIX=${prefix}"
@@ -34,3 +34,4 @@ PACKAGES =+ "${PN}-python"
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}"
 FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}"
+CVE_STATUS[CVE-2022-43410] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different mercurial package compared to the one which has the CVE issue."
diff --git a/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb b/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb
index 4bb3e62d9f..73d434cba5 100644
--- a/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb
+++ b/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb
@@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c9f7c009791eaa4b9ca90dc4c9538d24"
 SRC_URI = "https://github.com/pengutronix/microcom/releases/download/v${PV}/microcom-${PV}.tar.xz"
 SRC_URI[sha256sum] = "ef42184bb35c9762b3e9c70748696f7478efacad8412a88aaf2d9a6a500231a1"
+UPSTREAM_CHECK_URI = "${HOMEPAGE}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 DEPENDS = "readline"
 inherit autotools update-alternatives
diff --git a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb
index 6e29b2459d..2fbbf8f06a 100644
--- a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb
+++ b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/microsoft/GSL.git;protocol=https;branch=main \
 "
 SRCREV = "a3534567187d2edc428efd3f13466ff75fe5805c"
-S = "${WORKDIR}/git"
 inherit cmake pkgconfig ptest
@@ -43,3 +42,8 @@ FILES:${PN}-ptest = "${bindir}/gsl*_tests"
 CVE_PRODUCT = "microsoft:gsl"
 BBCLASSEXTEND = "native nativesdk"
+# This one is reproducible only on 32bit arm MACHINEs (didn't see it with qemux86 or qemux86-64 builds)
+# http://errors.yoctoproject.org/Errors/Details/766976/
+# lib32-microsoft-gsl/4.0.0/git/tests/span_tests.cpp:1275:34: error: value computed is not used [-Werror=unused-value]
+CXXFLAGS += "-Wno-error=unused-value"
diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.2.1.bb b/meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb
index 9fd8c3bb7b..6babba3de7 100644
--- a/meta-oe/recipes-devtools/mpich/mpich_4.2.1.bb
+++ b/meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb
@@ -3,10 +3,10 @@ HOMEPAGE = "http://www.mpich.org/"
 SECTION = "devel"
 LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7a88f0d96d0d7396a7c66bf353235b62"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a296dfb961b957b0e8adf67d8478d3d"
 SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz"
-SRC_URI[sha256sum] = "23331b2299f287c3419727edc2df8922d7e7abbb9fd0ac74e03b9966f9ad42d7"
+SRC_URI[sha256sum] = "5e04132984ad83cab9cc53f76072d2b5ef5a6d24b0a9ff9047a8ff96121bcc63"
 RDEPENDS:${PN} += "bash perl libxml2"
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb
index 40d997a52c..aa7629763c 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/msgpack/msgpack-c;branch=c_master;protocol=https \
           "
 SRCREV = "8160ede5e20fd3019a77eea46d9c72cf6163f802"
-S = "${WORKDIR}/git"
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.0.bb b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb
index 5f5507bc74..3457964609 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.0.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb
@@ -8,9 +8,12 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \
                   "
 SRC_URI = "https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/msgpack-cxx-${PV}.tar.gz"
-SRC_URI[sha256sum] = "23ede7e93c8efee343ad8c6514c28f3708207e5106af3b3e4969b3a9ed7039e7"
+SRC_URI[sha256sum] = "5fd555742e37bbd58d166199e669f01f743c7b3c6177191dd7b31fb0c37fa191"
-S = "${WORKDIR}/msgpack-cxx-${PV}"
+UPSTREAM_CHECK_URI = "https://github.com/msgpack/msgpack-c/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+S = "${UNPACKDIR}/msgpack-cxx-${PV}"
 DEPENDS += "boost"
diff --git a/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb b/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
index 05220c2492..2183170ba6 100644
--- a/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
+++ b/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
@@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=11;md5=678a3928c85604242
 SECTION = "devel"
 SRC_URI = "https://01.org/sites/default/files/downloads/msr-tools/msr-tools-${PV}.zip"
-SRC_URI[md5sum] = "67d18527f64fd707c9b7a79f13d19fd5"
 SRC_URI[sha256sum] = "f9457b5340f5f274da4239a461f0db6b514142b40461559d9c6150f05aab1d1e"
-S = "${WORKDIR}/msr-tools-master"
+S = "${UNPACKDIR}/msr-tools-master"
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
diff --git a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
index 82e5c3bc5e..ef2553760d 100644
--- a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
+++ b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
@@ -20,7 +20,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 inherit autotools-brokensep
-S = "${WORKDIR}/git"
 do_configure () {
    # no debug set -s flag
diff --git a/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb b/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb
index 36e46021bb..ec87535ec7 100644
--- a/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb
+++ b/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb
@@ -12,7 +12,6 @@ SRCREV = "d732aaf9a315415ae8fd7eb11e3a4c1f80e42a48"
 UPSTREAM_CHECK_COMMITS = "1"
-S = "${WORKDIR}/git"
 # nlohmann-fifo is a header only C++ library, so the main package will be empty.
diff --git a/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest b/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest
index 2f00267d50..d39ee6df8f 100755
--- a/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest
+++ b/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest
@@ -3,7 +3,11 @@
 cd tests
 for atest in test-* ; do
    rm -rf tests.log
-    ./${atest} > tests.log 2>&1
+    if [ ${atest} = "test-locale-cpp_cpp11" ]; then
+        ./${atest} --test-case-exclude="locale-dependent test (LC_NUMERIC=de_DE)" > tests.log 2>&1
+    else
+        ./${atest} > tests.log 2>&1
+    fi
    if [ $? = 0 ] ; then
        echo "PASS: ${atest}"
    else
diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
index 194e80546e..1dfcc6ad75 100644
--- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb
+++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
@@ -2,21 +2,20 @@ SUMMARY = "JSON for modern C++"
 HOMEPAGE = "https://nlohmann.github.io/json/"
 SECTION = "libs"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588"
+LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=3b489645de9825cca5beeb9a7e18b6eb"
 CVE_PRODUCT = "json-for-modern-cpp"
-SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \
+SRC_URI = "git://github.com/nlohmann/json.git;branch=master;protocol=https \
-           git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \
+           git://github.com/nlohmann/json_test_data.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/json_test_data;name=json-test-data;branch=master;protocol=https \
           file://run-ptest \
 "
-SRCREV = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+SRCREV = "55f93686c01528224f448c19128836e7df245f72"
 SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
 SRCREV_FORMAT .= "_json-test-data"
-S = "${WORKDIR}/git"
 inherit cmake ptest
@@ -25,7 +24,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DJSON_BuildTests=
 # nlohmann-json is a header only C++ library, so the main package will be empty.
 ALLOW_EMPTY:${PN} = "1"
 RDEPENDS:${PN}-dev = ""
-RDEPENDS:${PN}-ptest = "perl"
+RDEPENDS:${PN}-ptest = "perl locale-base-de-de"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.12/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.16/oe-npm-cache
index eb0f143eae..eb0f143eae 100755
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.12/oe-npm-cache
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.16/oe-npm-cache
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.16.bb
index a61dd5018f..1dcd1f7926 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.12.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.16.bb
@@ -8,10 +8,12 @@ SRC_URI = "\
 inherit native
+S = "${UNPACKDIR}"
 B = "${WORKDIR}/build"
 do_configure() {
-    sed -e 's!@@libdir@@!${libdir}!g' < '${WORKDIR}/oe-npm-cache' > '${B}/oe-npm-cache'
+    sed -e 's!@@libdir@@!${libdir}!g' < '${UNPACKDIR}/oe-npm-cache' > '${B}/oe-npm-cache'
 }
 do_install() {
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 12f6cd8b96..f692eedd41 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-Do-not-use-glob-in-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Do-not-use-glob-in-deps.patch
new file mode 100644
index 0000000000..551869523e
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Do-not-use-glob-in-deps.patch
@@ -0,0 +1,22 @@
+// Revert the patch found here https://github.com/nodejs/node/commit/fe1dd26398e1887b96b2dc51ab59371ad4d6bc20?diff=unified&w=0
+// so that the dependencies are still explicitly enumerated.  That way we
+// can pick and choose which pieces to build and which to use existing system
+// packages for.
+Upstream-Status: Inappropriate [embedded specific]
+--- a/Makefile  2025-01-11 14:37:29.059536707 -0500
+++ b/Makefile  2025-01-11 14:39:52.419867046 -0500
+@@ -171,7 +171,8 @@
+        $(warning '$@' target is a noop)
+ 
+ out/Makefile: config.gypi common.gypi common_node.gypi node.gyp \
+-       deps/*/*.gyp \
+       deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.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/inspector.gypi tools/v8_gypfiles/v8.gyp
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 39026d0742..0000000000
--- 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 0000000000..532d3c5f51
--- /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 0000000000..01ae50cdc4
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch
@@ -0,0 +1,60 @@
+From 79af9bd6ac1040f1fe3c6cab26b2d040ad907870 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>
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ deps/uv/src/unix/linux.c | 29 +----------------------------
+ 1 file changed, 1 insertion(+), 28 deletions(-)
+diff --git a/deps/uv/src/unix/linux.c b/deps/uv/src/unix/linux.c
+index 803a9a9d3f0..a4735f56cf0 100644
+--- a/deps/uv/src/unix/linux.c
+++ b/deps/uv/src/unix/linux.c
+@@ -465,34 +465,7 @@ static int uv__use_io_uring(void) {
+   /* See https://github.com/libuv/libuv/issues/4283. */
+   return 0; /* Random SIGSEGV in signal handler. */
+ #else
+-  /* Ternary: unknown=0, yes=1, no=-1 */
+-  static _Atomic int use_io_uring;
+-  char* val;
+-  int use;
+-
+-  use = atomic_load_explicit(&use_io_uring, memory_order_relaxed);
+-
+-  if (use == 0) {
+-    use = uv__kernel_version() >=
+-#if defined(__hppa__)
+-    /* io_uring first supported on parisc in 6.1, functional in .51 */
+-    /* https://lore.kernel.org/all/cb912694-b1fe-dbb0-4d8c-d608f3526905@gmx.de/ */
+-    /* 6.1.51 */ 0x060133
+-#else
+-    /* Older kernels have a bug where the sqpoll thread uses 100% CPU. */
+-    /* 5.10.186 */ 0x050ABA
+-#endif
+-    ? 1 : -1;
+-
+-    /* But users can still enable it if they so desire. */
+-    val = getenv("UV_USE_IO_URING");
+-    if (val != NULL)
+-      use = atoi(val) ? 1 : -1;
+-
+-    atomic_store_explicit(&use_io_uring, use, memory_order_relaxed);
+-  }
+-
+-  return use > 0;
+  return 0; /* pseudo doesn't support io_uring https://bugzilla.yoctoproject.org/show_bug.cgi?id=15244 */
+ #endif
+ }
+ 
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 9d878dfb8d..0000000000
--- 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 5af87d866e..5e617e6554 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 0000000000..5fd6aee351
--- /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 97ed972cee..cc920118a2 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/libatomic.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
index cb0237309e..d987ac50be 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
@@ -1,21 +1,77 @@
-Link mksnapshot with libatomic on x86
+From 15e751e4b79475fb34e4b32a3ca54119b20c564a Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Sat, 17 Aug 2024 21:33:18 +0800
+Subject: [PATCH] link libatomic for clang conditionally
-Clang-12 on x86 emits atomic builtins
+Clang emits atomic builtin, explicitly link libatomic conditionally:
+- For target build, always link -latomic for clang as usual
+- For host build, if host and target have same bit width, cross compiling
+  is enabled, and host toolchain is gcc which does not link -latomic;
+  if host and target have different bit width, no cross compiling,
+  host build is the same with target build that requires to link
+  -latomic;
-Fixes
+Fix:
-| module-compiler.cc:(.text._ZN2v88internal4wasm12_GLOBAL__N_123ExecuteCompilationUnitsERKSt10shared_ptrINS2_22BackgroundCompileTokenEEPNS0_8CountersEiNS2_19CompileBaselineOnlyE+0x558): un
+|tmp-glibc/work/core2-64-wrs-linux/nodejs/20.13.0/node-v20.13.0/out/Release/node_js2c: error while loading shared libraries: libatomic.so.1: cannot open shared object file: No such file or directory
-defined reference to `__atomic_load'
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ node.gyp                 | 13 ++++++++++++-
+ tools/v8_gypfiles/v8.gyp | 15 ++++++++++++---
+ 2 files changed, 24 insertions(+), 4 deletions(-)
+diff --git a/node.gyp b/node.gyp
+index b425f443..f296f35c 100644
+--- a/node.gyp
+++ b/node.gyp
+@@ -487,7 +487,18 @@
+         ],
+       }],
+       ['OS=="linux" and clang==1', {
+-        'libraries': ['-latomic'],
+        'target_conditions': [
+           ['_toolset=="host"', {
+             'conditions': [
+               ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', {
+                 'libraries': ['-latomic'],
+               }],
+             ],
+           }],
+           ['_toolset=="target"', {
+             'libraries': ['-latomic'],
+           }],
+        ],
+       }],
+     ],
+   },
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index b23263cf..dcabf4ca 100644
 --- a/tools/v8_gypfiles/v8.gyp
 +++ b/tools/v8_gypfiles/v8.gyp
-@@ -1436,6 +1436,7 @@
+@@ -1100,9 +1100,18 @@
-     {
+         # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
-       'target_name': 'mksnapshot',
+         # to implement atomic memory access
-       'type': 'executable',
+         ['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', {
-+      'libraries': [ '-latomic' ],
+-          'link_settings': {
-       'dependencies': [
+-            'libraries': ['-latomic', ],
-         'v8_base_without_compiler',
+-          },
-         'v8_compiler_for_mksnapshot',
+          'target_conditions': [
+             ['_toolset=="host"', {
+               'conditions': [
+                 ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', {
+                   'libraries': ['-latomic'],
+                 }],
+               ],
+             }],
+             ['_toolset=="target"', {
+               'libraries': ['-latomic', ],
+             }],
+           ],
+         }],
+       ],
+     },  # v8_base_without_compiler
+-- 
+2.35.5
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 141889ad23..6f08c71e18 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.12.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb
index d86c38f2fc..4bc829f140 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_20.12.2.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb
@@ -1,15 +1,15 @@
 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=9a7fcce64128730251dbc58aa41b4674"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b4f41dcacabc8f07b9ca7dee2f188a00"
 CVE_PRODUCT = "nodejs node.js"
-DEPENDS = "openssl file-replacement-native python3-packaging-native"
+DEPENDS = "openssl openssl-native file-replacement-native python3-packaging-native"
 DEPENDS:append:class-target = " qemu-native"
 DEPENDS:append:class-native = " c-ares-native"
-inherit pkgconfig python3native qemu ptest
+inherit pkgconfig python3native qemu ptest siteinfo
 COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*"
 COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*"
@@ -18,27 +18,29 @@ COMPATIBLE_MACHINE:mips64 = "(!.*mips64).*"
 COMPATIBLE_HOST:riscv64 = "null"
 COMPATIBLE_HOST:riscv32 = "null"
 COMPATIBLE_HOST:powerpc = "null"
+COMPATIBLE_HOST:powerpc64le = "null"
 SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
+           file://0001-Do-not-use-glob-in-deps.patch \
           file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
           file://0004-v8-don-t-override-ARM-CFLAGS.patch \
           file://system-c-ares.patch \
           file://0001-liftoff-Correct-function-signatures.patch \
+           file://libatomic.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 = " \
           file://0001-Using-native-binaries.patch \
           "
-SRC_URI:append:toolchain-clang:x86 = " \
-           file://libatomic.patch \
-           "
 SRC_URI:append:toolchain-clang:powerpc64le = " \
           file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
           "
-SRC_URI[sha256sum] = "d7cbcc5fbfb31e9001f3f0150bbeda59abe5dd7137aaa6273958cd59ce35ced7"
+SRC_URI[sha256sum] = "720894f323e5c1ac24968eb2676660c90730d715cb7f090be71a668662a17c37"
-S = "${WORKDIR}/node-v${PV}"
+S = "${UNPACKDIR}/node-v${PV}"
 CVE_PRODUCT += "node.js"
@@ -66,28 +68,14 @@ ARCHFLAGS ?= ""
 PACKAGECONFIG ??= "ares brotli icu zlib"
-PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
+PACKAGECONFIG[ares] = "--shared-cares,,c-ares c-ares-native"
-PACKAGECONFIG[brotli] = "--shared-brotli,,brotli"
+PACKAGECONFIG[brotli] = "--shared-brotli,,brotli brotli-native"
-PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
+PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu icu-native"
 PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
 PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
 PACKAGECONFIG[shared] = "--shared"
 PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
-# We don't want to cross-compile during target compile,
-# and we need to use the right flags during host compile,
-# too.
-EXTRA_OEMAKE = "\
-    CC.host='${CC} -pie -fPIE' \
-    CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \
-    CXX.host='${CXX} -pie -fPIE' \
-    CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \
-    LDFLAGS.host='${LDFLAGS}' \
-    AR.host='${AR}' \
-    \
-    builddir_name=./ \
-"
 EXTRANATIVEPATH += "file-native"
 python prune_sources() {
@@ -110,9 +98,11 @@ do_unpack[postfuncs] += "prune_sources"
 # V8's JIT infrastructure requires binaries such as mksnapshot and
 # mkpeephole to be run in the host during the build. However, these
 # binaries must have the same bit-width as the target (e.g. a x86_64
-# host targeting ARMv6 needs to produce a 32-bit binary). Instead of
+# host targeting ARMv6 needs to produce a 32-bit binary).
-# depending on a third Yocto toolchain, we just build those binaries
+# 1. If host and target have the different bit width, run those
-# for the target and run them on the host with QEMU.
+#    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 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."""
@@ -120,6 +110,10 @@ python do_create_v8_qemu_wrapper () {
                    d.expand('${STAGING_DIR_HOST}${base_libdir}')]
    qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'),
                                    qemu_libdirs)
+    if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1":
+        qemu_cmd = ""
    wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh')
    with open(wrapper_path, 'w') as wrapper_file:
        wrapper_file.write("""#!/bin/sh
@@ -138,6 +132,14 @@ addtask create_v8_qemu_wrapper after do_configure before do_compile
 LDFLAGS:append:x86 = " -latomic"
+export CC_host
+export CFLAGS_host
+export CXX_host
+export CXXFLAGS_host
+export LDFLAGS_host
+export AR_host
+export HOST_AND_TARGET_SAME_WIDTH
 CROSS_FLAGS = "--cross-compiling"
 CROSS_FLAGS:class-native = "--no-cross-compiling"
@@ -179,4 +181,36 @@ RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \
 PACKAGES =+ "${PN}-systemtap"
 FILES:${PN}-systemtap = "${datadir}/systemtap"
+do_configure[prefuncs] += "set_gyp_variables"
+do_compile[prefuncs] += "set_gyp_variables"
+do_install[prefuncs] += "set_gyp_variables"
+python set_gyp_variables () {
+    if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "0":
+        # We don't want to cross-compile during target compile,
+        # and we need to use the right flags during host compile,
+        # too.
+        d.setVar("CC_host", d.getVar("CC") + " -pie -fPIE")
+        d.setVar("CFLAGS_host", d.getVar("CFLAGS"))
+        d.setVar("CXX_host", d.getVar("CXX") + " -pie -fPIE")
+        d.setVar("CXXFLAGS_host", d.getVar("CXXFLAGS"))
+        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 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"))
+        d.setVar("CXXFLAGS_host", d.getVar("BUILD_CXXFLAGS"))
+        d.setVar("LDFLAGS_host", d.getVar("BUILD_LDFLAGS"))
+        d.setVar("AR_host", d.getVar("BUILD_AR"))
+}
+python __anonymous () {
+    # 32 bit target and 64 bit host (x86-64 or aarch64) have different bit width
+    if d.getVar("SITEINFO_BITS") == "32" and "64" in d.getVar("BUILD_ARCH"):
+        d.setVar("HOST_AND_TARGET_SAME_WIDTH", "0")
+    else:
+        d.setVar("HOST_AND_TARGET_SAME_WIDTH", "1")
+}
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch
new file mode 100644
index 0000000000..a7d7552d5a
--- /dev/null
+++ b/meta-oe/recipes-devtools/openocd/openocd/0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch
@@ -0,0 +1,38 @@
+From 65969a2b73ce93db4c80f1706677351b0e57fa72 Mon Sep 17 00:00:00 2001
+From: Sofiane HAMAM <sofiane.hamam@smile.fr>
+Date: Fri, 28 Mar 2025 12:31:17 +0100
+Subject: [PATCH] Makefile.am: Use SOURCE_DATE_EPOCH environment variable
+This package defines PKGBLDDATE as build timestamp which makes
+it non reproducible. Use SOURCE_DATE_EPOCH if it is found, otherwise
+use build timestamp. Following best practices, see :
+https://reproducible-builds.org/docs/source-date-epoch/
+The patch is BSD compatible too.
+Change-Id: I26c1a00f2e8059ae31fe72a794b5962af5a84f44
+Co-developed-by: Yoann Congal <yoann.congal@smile.fr>
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+Signed-off-by: Sofiane HAMAM <sofiane.hamam@smile.fr>
+Upstream-Status: Backport [https://repo.or.cz/openocd.git?a=commit;h=6834f022b96fb1c7f5829166578e01a0ac223cb0]
+---
+ src/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6d79cd631..9ca697407 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -30,7 +30,10 @@ if RELEASE
+ else
+ %C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
+ %C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
+-%C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\"
+%C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`DATE_FMT=+%F-%R; \
+       SOURCE_DATE_EPOCH="$${SOURCE_DATE_EPOCH:-$$(date +%s)}"; \
+       date -u -d "@$$SOURCE_DATE_EPOCH" "$$DATE_FMT" 2>/dev/null || \
+       date -u -r "$$SOURCE_DATE_EPOCH" "$$DATE_FMT" 2>/dev/null || date -u "$$DATE_FMT"`\"
+ endif
+ 
+ # add default CPPFLAGS
diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb
index 559fe29ff8..3bbe33ca1d 100644
--- a/meta-oe/recipes-devtools/openocd/openocd_git.bb
+++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb
@@ -7,8 +7,9 @@ RDEPENDS:${PN} = "libusb1"
 SRC_URI = " \
    git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \
    git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \
-    git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=git/jimtcl;name=jimtcl;branch=master \
+    git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/jimtcl;name=jimtcl;branch=master \
-    git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \
+    git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \
+    file://0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch \
 "
 SRCREV_FORMAT = "openocd"
@@ -18,7 +19,6 @@ SRCREV_jimtcl = "fcbb4499a6b46ef69e7a95da53e30796e20817f0"
 SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4"
 PV = "0.12+git"
-S = "${WORKDIR}/git"
 inherit pkgconfig autotools-brokensep gettext
diff --git a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
index 4a0383e0a1..ee7674a0c7 100644
--- a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
+++ b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
@@ -21,5 +21,5 @@ RDEPENDS:${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
                  libtool libtool-dev \
                  pkgconfig"
-# usefull, but not in oe-core/meta-oe yet: patchutils
+# useful, but not in oe-core/meta-oe yet: patchutils
-RRECOMMENDS:${PN} = " g77-symlinks gfortran-symlinks"
+RRECOMMENDS:${PN} = "${@bb.utils.contains('FORTRAN', ',fortran', 'gfortran gfortran-symlinks', '', d)}"
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 4f7dfd4cca..7dc18d7aa2 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.29.bb
index 1334c850e6..aca915bf32 100644
--- a/meta-oe/recipes-devtools/pahole/pahole_1.25.bb
+++ b/meta-oe/recipes-devtools/pahole/pahole_1.29.bb
@@ -7,17 +7,16 @@ DEPENDS = "elfutils zlib libbpf"
 # Depends on MACHINE_ARCH libbpf
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux"
+COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"
-SRCREV = "81558a5a996005df0d607dd33f74ec5b7bdb619d"
+SRCREV = "b9cc7963051b2099795129450f9b70c81950d02f"
 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"
 inherit cmake pkgconfig
-PACKAGECONFIG[python3] = ",,python3-core,python3-core"
+PACKAGECONFIG[python3] = ",,python3,python3-core"
 EXTRA_OECMAKE = "-D__LIB=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=OFF"
diff --git a/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb b/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb
index d512c85704..4e80ca87ee 100644
--- a/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb
+++ b/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb
@@ -30,6 +30,6 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
 PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp"
-PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, pyelftools"
+PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, python3-pyelftools"
 EXTRA_OECONF += "--enable-largefile"
diff --git a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb
index 85c4fa95ae..130980b0cd 100644
--- a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb
+++ b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb
@@ -10,7 +10,9 @@ COMPATIBLE_HOST = "(x86_64|aarch64|arm|riscv64)"
 SRCREV = "09724edb1783a98da2b7ae53c5aaa87493aabc9b"
 SRC_URI = "git://github.com/billfarrow/pcimem.git;branch=master;protocol=https"
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
 do_install() {
    install -D -m 0755 ${B}/pcimem ${D}${bindir}/pcimem
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 d08721ae65..0000000000
--- 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 0000000000..3b7ca951ae
--- /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 c8f56fd527..8383db3cc0 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 ae644747c1..719663a802 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 7e9408b0b2..e284ec8d1e 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto.bb
+++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb
@@ -1,46 +1,51 @@
 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=${BB_GIT_DEFAULT_DESTSUFFIX}/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/libcxx.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/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/libcxxabi.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/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 \
+           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/libunwind;branch=main;name=libunwind \
-           git://android.googlesource.com/platform/system/libbase.git;branch=master;protocol=https;destsuffix=git/buildtools/android-libbase;name=libbase \
+           git://android.googlesource.com/platform/system/libbase.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-libbase;name=libbase \
-           git://android.googlesource.com/platform/system/unwinding.git;branch=master;protocol=https;destsuffix=git/buildtools/android-unwinding;name=unwinding \
+           git://android.googlesource.com/platform/system/unwinding.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-unwinding;name=unwinding \
-           git://android.googlesource.com/platform/system/logging.git;branch=master;protocol=https;destsuffix=git/buildtools/android-logging;name=logging \
+           git://android.googlesource.com/platform/system/logging.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-logging;name=logging \
-           git://android.googlesource.com/platform/system/libprocinfo.git;branch=master;protocol=https;destsuffix=git/buildtools/android-libprocinfo;name=libprocinfo \
+           git://android.googlesource.com/platform/system/libprocinfo.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-libprocinfo;name=libprocinfo \
-           git://android.googlesource.com/platform/system/core.git;branch=master;protocol=https;destsuffix=git/buildtools/android-core;name=core \
+           git://android.googlesource.com/platform/system/core.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-core;name=core \
-           git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=git/buildtools/bionic;name=bionic \
+           git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/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/zlib.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/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/lzma.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/lzma;name=lzma \
-           https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=git/buildtools/;name=gn \
+           git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zstd;name=zstd \
+           https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/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 \
+           file://0001-add-missing-includes-for-the-build-with-use_libcxx_m.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"
@@ -96,8 +101,8 @@ do_configure () {
    ARGS=$ARGS" target_os=\"linux\""
    ARGS=$ARGS" target_cpu=\"$arch\""
-    ARGS=$ARGS" target_cc=\"$CC_BIN ${TUNE_CCARGS}\""
+    ARGS=$ARGS" target_cc=\"$CC_BIN ${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}\""
-    ARGS=$ARGS" target_cxx=\"$CXX_BIN -std=c++11 ${TUNE_CCARGS}\""
+    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 4b06c5bf04..1c7e9144cc 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto.inc
+++ b/meta-oe/recipes-devtools/perfetto/perfetto.inc
@@ -1,10 +1,12 @@
 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 c10400aef4..118c3aed4a 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/0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch
new file mode 100644
index 0000000000..225810e511
--- /dev/null
+++ b/meta-oe/recipes-devtools/perfetto/perfetto/0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch
@@ -0,0 +1,105 @@
+From 3953f56f98420e2ecb0e1c4542e20bfbb81da965 Mon Sep 17 00:00:00 2001
+From: Takuto Ikuta <tikuta@google.com>
+Date: Mon, 9 Dec 2024 18:45:36 +0900
+Subject: [PATCH] add missing includes for the build with use_libcxx_modules
+This is to fix build error when we set use_libcxx_modules=true in
+chromium build.
+Bug: 40440396
+Change-Id: I0cca5190c2c3551cc62bafafd12da9283e4afdd4
+Upstream-Status: Backport [3953f56 add missing includes for the build with use_libcxx_modules]
+- Removed some patches for files that do not exist in the current version v47.0
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+diff --git a/include/perfetto/base/flat_set.h b/include/perfetto/base/flat_set.h
+index 9390537b39..5be590ea6b 100644
+--- a/include/perfetto/base/flat_set.h
+++ b/include/perfetto/base/flat_set.h
+@@ -17,7 +17,10 @@
+ #ifndef INCLUDE_PERFETTO_BASE_FLAT_SET_H_
+ #define INCLUDE_PERFETTO_BASE_FLAT_SET_H_
+ 
+#include <stddef.h>
+
+ #include <algorithm>
+#include <utility>
+ #include <vector>
+ 
+ // A vector-based set::set-like container.
+diff --git a/include/perfetto/base/time.h b/include/perfetto/base/time.h
+index 6436503d20..8de7648267 100644
+--- a/include/perfetto/base/time.h
+++ b/include/perfetto/base/time.h
+@@ -17,6 +17,7 @@
+ #ifndef INCLUDE_PERFETTO_BASE_TIME_H_
+ #define INCLUDE_PERFETTO_BASE_TIME_H_
+ 
+#include <stdint.h>
+ #include <time.h>
+ 
+ #include <chrono>
+diff --git a/include/perfetto/ext/base/string_utils.h b/include/perfetto/ext/base/string_utils.h
+index c8264a2fb7..3b15e55771 100644
+--- a/include/perfetto/ext/base/string_utils.h
+++ b/include/perfetto/ext/base/string_utils.h
+@@ -24,6 +24,7 @@
+ #include <cinttypes>
+ #include <optional>
+ #include <string>
+#include <system_error>
+ #include <vector>
+ 
+ #include "perfetto/ext/base/string_view.h"
+diff --git a/include/perfetto/ext/base/subprocess.h b/include/perfetto/ext/base/subprocess.h
+index 12121e0284..4075169df1 100644
+--- a/include/perfetto/ext/base/subprocess.h
+++ b/include/perfetto/ext/base/subprocess.h
+@@ -20,6 +20,7 @@
+ #include <condition_variable>
+ #include <functional>
+ #include <initializer_list>
+#include <memory>
+ #include <mutex>
+ #include <optional>
+ #include <string>
+diff --git a/include/perfetto/ext/base/waitable_event.h b/include/perfetto/ext/base/waitable_event.h
+index 0e786196f8..a4b268a2f3 100644
+--- a/include/perfetto/ext/base/waitable_event.h
+++ b/include/perfetto/ext/base/waitable_event.h
+@@ -17,6 +17,8 @@
+ #ifndef INCLUDE_PERFETTO_EXT_BASE_WAITABLE_EVENT_H_
+ #define INCLUDE_PERFETTO_EXT_BASE_WAITABLE_EVENT_H_
+ 
+#include <stdint.h>
+
+ #include <condition_variable>
+ #include <mutex>
+ 
+diff --git a/include/perfetto/ext/tracing/core/slice.h b/include/perfetto/ext/tracing/core/slice.h
+index 063043bdc6..cdabc39465 100644
+--- a/include/perfetto/ext/tracing/core/slice.h
+++ b/include/perfetto/ext/tracing/core/slice.h
+@@ -18,6 +18,7 @@
+ #define INCLUDE_PERFETTO_EXT_TRACING_CORE_SLICE_H_
+ 
+ #include <stddef.h>
+#include <stdint.h>
+ #include <string.h>
+ 
+ #include <memory>
+diff --git a/src/trace_processor/util/trace_blob_view_reader.h b/src/trace_processor/util/trace_blob_view_reader.h
+index c39ffaba7c..6ffa7ff050 100644
+--- a/src/trace_processor/util/trace_blob_view_reader.h
+++ b/src/trace_processor/util/trace_blob_view_reader.h
+@@ -19,6 +19,7 @@
+ 
+ #include <cstddef>
+ #include <optional>
+#include <vector>
+ 
+ #include "perfetto/ext/base/circular_queue.h"
+ #include "perfetto/trace_processor/trace_blob_view.h"
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 0000000000..49b7989359
--- /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/perl/dbd-mariadb_1.24.bb b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.24.bb
new file mode 100644
index 0000000000..65f2ec232a
--- /dev/null
+++ b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.24.bb
@@ -0,0 +1,20 @@
+DESPCRIPTION = "DBD::MariaDB is the Perl5 Database Interface driver for MariaDB and MySQL databases."
+HOMEPAGE = "https://metacpan.org/dist/DBD-MariaDB"
+LICENSE = "GPL-1.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c"
+DEPENDS = "libdbi-perl-native libdev-checklib-perl-native libmysqlclient"
+SRC_URI = "${CPAN_MIRROR}/authors/id/P/PA/PALI/DBD-MariaDB-${PV}.tar.gz"
+SRC_URI[sha256sum] = "f977a25b4116a0a95a7c8a894fd37097abe19af9a6a9ed4d800604ec17873fe4"
+RDEPENDS:${PN} = "libdbi-perl"
+S = "${UNPACKDIR}/DBD-MariaDB-${PV}"
+inherit cpan
+RDEPENDS:${PN}-ptest += " \
+        libtest-warnings-perl \
+        perl-module-test-more \
+"
diff --git a/meta-oe/recipes-devtools/perl/exiftool_12.72.bb b/meta-oe/recipes-devtools/perl/exiftool_12.89.bb
index ba3e3fdf7e..69a4f79815 100644
--- a/meta-oe/recipes-devtools/perl/exiftool_12.72.bb
+++ b/meta-oe/recipes-devtools/perl/exiftool_12.89.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff
 inherit cpan
-SRCREV = "fc4f6614ff0c19bb5f332a9c464dcef7267931df"
+SRCREV = "e04534a40925354187e8432d44248229d774f34a"
 SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master"
-S = "${WORKDIR}/git"
 RDEPENDS:${PN} = " \
    perl \
diff --git a/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb b/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb
index e28b6ea018..9cdb0a52cc 100644
--- a/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb
+++ b/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb
@@ -12,7 +12,6 @@ DEPENDS = "perl"
 SRC_URI = "git://github.com/toddr/IPC-Run.git;branch=master;protocol=https"
 SRCREV = "ad56c3b5f5a211d32bbb8ac29f180d707ee58c1b"
-S = "${WORKDIR}/git"
 inherit cpan
diff --git a/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb b/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.67.bb
index b2266394d6..4886333f3a 100644
--- a/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb
+++ b/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.67.bb
@@ -8,9 +8,9 @@ SRCNAME = "Config-General"
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/${SRCNAME}-${PV}.tar.gz"
-SRC_URI[sha256sum] = "4d6d5754be3a9f30906836f0cc10e554c8832e14e7a1341efb15b05d706fc58f"
+SRC_URI[sha256sum] = "473d65127b23dac0e8039c01e28bc4072cb9a6e93e81a1ea4893cea08c698db0"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb
deleted file mode 100644
index fc505fe1e8..0000000000
--- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "A Perl DBI driver for MySQL"
-DESCRIPTION = "DBD::mysql is the Perl5 Database Interface driver for \
-the MySQL database. In other words: DBD::mysql is an interface between \
-the Perl programming language and the MySQL programming API that comes \
-with the MySQL relational database management system. Most functions \
-provided by this programming API are supported. Some rarely used \
-functions are missing, mainly because no-one ever requested them. \
-"
-HOMEPAGE = "https://github.com/perl5-dbi/DBD-mysql"
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-DEPENDS += "libdev-checklib-perl-native libdbi-perl-native libmysqlclient"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c"
-SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6"
-SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
-inherit cpan
diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch b/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch
deleted file mode 100644
index b41bbe0a50..0000000000
--- a/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Backport patch to fix CVE-2014-10402.
-CVE: CVE-2014-10402
-Upstream-Status: Backport [https://github.com/rehsack/dbi/commit/19d0fb1]
-Ref:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=972180#12
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-From 19d0fb169eed475e1c053e99036b8668625cfa94 Mon Sep 17 00:00:00 2001
-From: Jens Rehsack <sno@netbsd.org>
-Date: Tue, 6 Oct 2020 10:22:17 +0200
-Subject: [PATCH] lib/DBD/File.pm: fix CVE-2014-10401
-Dig into the root cause of RT#99508 - which resulted in CVE-2014-10401 - and
-figure out that DBI->parse_dsn is the wrong helper to parse our attributes in
-DSN, since in DBD::dr::connect only the "dbname" remains from DSN which causes
-parse_dsn to bailout.
-Parsing on our own similar to parse_dsn shows the way out.
-Signed-off-by: Jens Rehsack <sno@netbsd.org>
---
- lib/DBD/File.pm | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-diff --git a/lib/DBD/File.pm b/lib/DBD/File.pm
-index fb14e9a..f55076f 100644
--- a/lib/DBD/File.pm
-+++ b/lib/DBD/File.pm
-@@ -109,7 +109,11 @@ sub connect
-     # We do not (yet) care about conflicting attributes here
-     # my $dbh = DBI->connect ("dbi:CSV:f_dir=test", undef, undef, { f_dir => "text" });
-     # will test here that both test and text should exist
-    if (my $attr_hash = (DBI->parse_dsn ($dbname))[3]) {
-+    #
-+    # Parsing on our own similar to parse_dsn to find attributes in 'dbname' parameter.
-+    if ($dbname) {
-+       my @attrs = split /;/ => $dbname;
-+       my $attr_hash = { map { split /\s*=>?\s*|\s*,\s*/, $_} @attrs };
-        if (defined $attr_hash->{f_dir} && ! -d $attr_hash->{f_dir}) {
-            my $msg = "No such directory '$attr_hash->{f_dir}";
-            $drh->set_err (2, $msg);
-@@ -120,7 +124,6 @@ sub connect
-     if ($attr and defined $attr->{f_dir} && ! -d $attr->{f_dir}) {
-        my $msg = "No such directory '$attr->{f_dir}";
-        $drh->set_err (2, $msg);
-       $attr->{RaiseError} and croak $msg;
-        return;
-        }
- 
-- 
-2.17.1
diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.647.bb
index 1fee83a8fd..c128cb7154 100644
--- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb
+++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.647.bb
@@ -4,18 +4,15 @@ DESCRIPTION = "DBI is a database access Application Programming Interface \
 of functions, variables and conventions that provide a consistent \
 database interface independent of the actual database being used. \
 "
-HOMEPAGE = "http://search.cpan.org/dist/DBI/"
+HOMEPAGE = "https://metacpan.org/dist/DBI"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=65f65488c774efe1da488e36ad6c4a36"
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz \
+SRC_URI = "${CPAN_MIRROR}/authors/id/H/HM/HMBRAND/DBI-${PV}.tgz"
-           file://CVE-2014-10402.patch \
+SRC_URI[sha256sum] = "0df16af8e5b3225a68b7b592ab531004ddb35a9682b50300ce50174ad867d9aa"
-           "
-SRC_URI[md5sum] = "352f80b1e23769c116082a90905d7398"
-SRC_URI[sha256sum] = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa"
-S = "${WORKDIR}/DBI-${PV}"
+S = "${UNPACKDIR}/DBI-${PV}"
 inherit cpan ptest-perl
diff --git a/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb
index 74a09e7bf8..43614d55ac 100644
--- a/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb
+++ b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb
@@ -13,7 +13,7 @@ SRC_URI = "https://cpan.metacpan.org/modules/by-module/Devel/Devel-CheckLib-${PV
 "
 SRC_URI[sha256sum] = "869d38c258e646dcef676609f0dd7ca90f085f56cf6fd7001b019a5d5b831fca"
-S = "${WORKDIR}/Devel-CheckLib-${PV}"
+S = "${UNPACKDIR}/Devel-CheckLib-${PV}"
 inherit cpan
@@ -25,4 +25,4 @@ do_install:append() {
           -e "/use strict;/ause warnings;" ${D}${bindir}/use-devel-checklib
 }
-BBCLASSEXTEND="native"
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb
index 6029b7aae9..1464a84d34 100644
--- a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb
+++ b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz"
 SRC_URI[sha256sum] = "b15309fc85623893289cb9b2b88dfa9ed1e69156b75f29938553a45be6d730af"
-S = "${WORKDIR}/IO-Tty-${PV}"
+S = "${UNPACKDIR}/IO-Tty-${PV}"
 inherit cpan ptest-perl
diff --git a/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb b/meta-oe/recipes-devtools/perl/libjson-perl_4.05000.bb
index 88d0d26d03..ded0dea0d1 100644
--- a/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb
+++ b/meta-oe/recipes-devtools/perl/libjson-perl_4.05000.bb
@@ -11,9 +11,8 @@ DEPENDS += "perl"
 SRC_URI = "git://github.com/makamaka/JSON.git;protocol=https;branch=master"
-SRCREV = "ebbae181c5e311fa80ee4c6379b598c7a6400570"
+SRCREV = "39bc0e567c202762a575fed2844ebdb941c3ca09"
-S = "${WORKDIR}/git"
 inherit cpan
diff --git a/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb b/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb
index be9704a313..a7e05922d6 100644
--- a/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb
+++ b/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://lib/Parse/Yapp.pm;beginline=508;endline=521;md5=41a45
 SRC_URI = "https://www.cpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-${PV}.tar.gz"
-SRC_URI[md5sum] = "69584d5b0f0304bb2a23cffcd982c5de"
 SRC_URI[sha256sum] = "3810e998308fba2e0f4f26043035032b027ce51ce5c8a52a8b8e340ca65f13e5"
-S = "${WORKDIR}/Parse-Yapp-${PV}"
+S = "${UNPACKDIR}/Parse-Yapp-${PV}"
 inherit cpan
diff --git a/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb b/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb
index ff4e1f0563..3e4137a68c 100644
--- a/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb
+++ b/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb
@@ -8,10 +8,12 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "https://cpan.metacpan.org/authors/id/W/WH/WHOM/pcsc-perl-${PV}.tar.bz2"
-SRC_URI[md5sum] = "45601505dbb7b27329811ac9bad35fab"
+SRC_URI[sha256sum] = "5cc834438739bd6e4e837fb7e10bd8befb809cd185ae6cf4b33e5fa9161f59fe"
-SRC_URI[sha256sum] = "2722b7e5543e4faf3ba1ec6b29a7dfec6d92be1edec09d0a3191992d4d88c69d"
-S = "${WORKDIR}/pcsc-perl-${PV}"
+UPSTREAM_CHECK_URI = "https://cpan.metacpan.org/authors/id/W/WH/WHOM/"
+UPSTREAM_CHECK_REGEX = "pcsc-perl-(?P<pver>\d+(\.\d+)+)"
+S = "${UNPACKDIR}/pcsc-perl-${PV}"
 inherit cpan pkgconfig
@@ -19,4 +21,4 @@ DEPENDS += "pcsc-lite"
 RDEPENDS:${PN} += "perl-module-carp"
-BBCLASSEXTEND="native"
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb b/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb
index 11f6a1ad19..981c946483 100644
--- a/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb
+++ b/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb
@@ -11,10 +11,9 @@ DEPENDS += "perl"
 SRC_URI = "https://cpan.metacpan.org/authors/id/N/NW/NWCLARK/PerlIO-gzip-${PV}.tar.gz"
-SRC_URI[md5sum] = "0393eae5d0b23df6cf40ed44af7d711c"
 SRC_URI[sha256sum] = "4848679a3f201e3f3b0c5f6f9526e602af52923ffa471a2a3657db786bd3bdc5"
-S = "${WORKDIR}/PerlIO-gzip-${PV}"
+S = "${UNPACKDIR}/PerlIO-gzip-${PV}"
 EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
diff --git a/meta-oe/recipes-devtools/php/php/0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch b/meta-oe/recipes-devtools/php/php/0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch
deleted file mode 100644
index 5b8c76209a..0000000000
--- a/meta-oe/recipes-devtools/php/php/0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 1eeb59366d6140a799f6051fb9f57d988b81fd5b Mon Sep 17 00:00:00 2001
-From: easyaspi314 <easyaspi314@users.noreply.github.com>
-Date: Wed, 12 Apr 2023 13:33:07 +0800
-Subject: [PATCH] Change whether to inline XXH3_hashLong_withSecret to a config
- option
-Change whether to inline XXH3_hashLong_withSecret to a config option to fix
-GCC 12 -Og.
-Upstream-Status: Submitted [https://github.com/php/php-src/pull/11062]
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
- ext/hash/xxhash/xxhash.h | 35 +++++++++++++++++++++++++++++++++--
- 1 file changed, 33 insertions(+), 2 deletions(-)
-diff --git a/ext/hash/xxhash/xxhash.h b/ext/hash/xxhash/xxhash.h
-index b5bd2864..8e816c05 100644
--- a/ext/hash/xxhash/xxhash.h
-+++ b/ext/hash/xxhash/xxhash.h
-@@ -1375,6 +1375,23 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr,
-  */
- #  define XXH_NO_INLINE_HINTS 0
- 
-+/*!
-+ * @def XXH3_INLINE_SECRET
-+ * @brief Determines whether to inline the XXH3 withSecret code.
-+ *
-+ * When the secret size is known, the compiler can improve the performance
-+ * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret().
-+ *
-+ * However, if the secret size is not known, it doesn't have any benefit. This
-+ * happens when xxHash is compiled into a global symbol. Therefore, if
-+ * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0.
-+ *
-+ * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers
-+ * that are *sometimes* force inline on -Og, and it is impossible to automatically
-+ * detect this optimization level.
-+ */
-+#  define XXH3_INLINE_SECRET 0
-+
- /*!
-  * @def XXH32_ENDJMP
-  * @brief Whether to use a jump for `XXH32_finalize`.
-@@ -1439,6 +1456,15 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr,
- #  endif
- #endif
- 
-+#ifndef XXH3_INLINE_SECRET
-+#  if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \
-+     || !defined(XXH_INLINE_ALL)
-+#    define XXH3_INLINE_SECRET 0
-+#  else
-+#    define XXH3_INLINE_SECRET 1
-+#  endif
-+#endif
-+
- #ifndef XXH32_ENDJMP
- /* generally preferable for performance */
- #  define XXH32_ENDJMP 0
-@@ -1515,6 +1541,11 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size)
- #  define XXH_NO_INLINE static
- #endif
- 
-+#if XXH3_INLINE_SECRET
-+#  define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE
-+#else
-+#  define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE
-+#endif
- 
- 
- /* *************************************
-@@ -4465,7 +4496,7 @@ XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len,
-  * so that the compiler can properly optimize the vectorized loop.
-  * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set.
-  */
-XXH_FORCE_INLINE XXH64_hash_t
-+XXH3_WITH_SECRET_INLINE XXH64_hash_t
- XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len,
-                              XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen)
- {
-@@ -5263,7 +5294,7 @@ XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len,
-  * It's important for performance to pass @secretLen (when it's static)
-  * to the compiler, so that it can properly optimize the vectorized loop.
-  */
-XXH_FORCE_INLINE XXH128_hash_t
-+XXH3_WITH_SECRET_INLINE XXH128_hash_t
- XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len,
-                               XXH64_hash_t seed64,
-                               const void* XXH_RESTRICT secret, size_t secretLen)
-- 
-2.25.1
diff --git a/meta-oe/recipes-devtools/php/php/0004-configure.ac-don-t-include-build-libtool.m4.patch b/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
index 19a8bf8e4f..fae8697fd4 100644
--- a/meta-oe/recipes-devtools/php/php/0004-configure.ac-don-t-include-build-libtool.m4.patch
+++ b/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
@@ -1,7 +1,7 @@
-From 41ef1121682c245b10df7de4b78c45baf9114c04 Mon Sep 17 00:00:00 2001
+From 6da78888b934dc10720a6e0e520536077cc2aac2 Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:03:46 -0500
-Subject: [PATCH 04/11] configure.ac: don't include build/libtool.m4
+Subject: [PATCH 1/5] configure.ac: don't include build/libtool.m4
 we delete build/libtool.m4 before do_configure,
 we will use libtool.m4 under ACLOCALDIR
@@ -17,7 +17,7 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com>
 1 file changed, 1 deletion(-)
 diff --git a/configure.ac b/configure.ac
-index 90c94323aa..161e7c3f53 100644
+index 9d79720a2..9353e2f6e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -6,7 +6,6 @@ dnl ----------------------------------------------------------------------------
diff --git a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch
deleted file mode 100644
index a967d64120..0000000000
--- a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From ca9b419f2c146061f73ee045cb0a069c18b40cd0 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Wed, 15 Dec 2021 14:00:08 +0800
-Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache
-We can't use AC_TRY_RUN to run programs in a cross compile
-environment. Set the variables directly instead since we know
-that we'd be running on latest enough linux kernel.
-Upstream-Status: Inappropriate [Configuration]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-update patch to version 7.4.4
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-update patch to version 8.0.12
-fix issue linking with librt
-Signed-off-by: Claude Bing <cbing@cybernetics.com>
-update patch to version 8.1.0
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
- ext/opcache/config.m4 | 204 ++----------------------------------------
- 1 file changed, 8 insertions(+), 196 deletions(-)
-diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
-index 2a83fa2..9471b5d 100644
--- a/ext/opcache/config.m4
-+++ b/ext/opcache/config.m4
-@@ -108,209 +108,21 @@ if test "$PHP_OPCACHE" != "no"; then
-   AC_CHECK_FUNCS([mprotect])
- 
-   AC_MSG_CHECKING(for sysvipc shared memory support)
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <unistd.h>
-#include <string.h>
-
-int main() {
-  pid_t pid;
-  int status;
-  int ipc_id;
-  char *shm;
-  struct shmid_ds shmbuf;
-
-  ipc_id = shmget(IPC_PRIVATE, 4096, (IPC_CREAT | SHM_R | SHM_W));
-  if (ipc_id == -1) {
-    return 1;
-  }
-
-  shm = shmat(ipc_id, NULL, 0);
-  if (shm == (void *)-1) {
-    shmctl(ipc_id, IPC_RMID, NULL);
-    return 2;
-  }
-
-  if (shmctl(ipc_id, IPC_STAT, &shmbuf) != 0) {
-    shmdt(shm);
-    shmctl(ipc_id, IPC_RMID, NULL);
-    return 3;
-  }
-
-  shmbuf.shm_perm.uid = getuid();
-  shmbuf.shm_perm.gid = getgid();
-  shmbuf.shm_perm.mode = 0600;
-
-  if (shmctl(ipc_id, IPC_SET, &shmbuf) != 0) {
-    shmdt(shm);
-    shmctl(ipc_id, IPC_RMID, NULL);
-    return 4;
-  }
-
-  shmctl(ipc_id, IPC_RMID, NULL);
-
-  strcpy(shm, "hello");
-
-  pid = fork();
-  if (pid < 0) {
-    return 5;
-  } else if (pid == 0) {
-    strcpy(shm, "bye");
-    return 6;
-  }
-  if (wait(&status) != pid) {
-    return 7;
-  }
-  if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
-    return 8;
-  }
-  if (strcmp(shm, "bye") != 0) {
-    return 9;
-  }
-  return 0;
-}
-]])],[have_shm_ipc=yes],[have_shm_ipc=no],[have_shm_ipc=no])
-  if test "$have_shm_ipc" = "yes"; then
-    AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
-  fi
-+  AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
-+  have_shm_ipc=yes
-   AC_MSG_RESULT([$have_shm_ipc])
- 
-   AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support)
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <string.h>
-
-#ifndef MAP_ANON
-# ifdef MAP_ANONYMOUS
-#  define MAP_ANON MAP_ANONYMOUS
-# endif
-#endif
-#ifndef MAP_FAILED
-# define MAP_FAILED ((void*)-1)
-#endif
-
-int main() {
-  pid_t pid;
-  int status;
-  char *shm;
-
-  shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-  if (shm == MAP_FAILED) {
-    return 1;
-  }
-
-  strcpy(shm, "hello");
-
-  pid = fork();
-  if (pid < 0) {
-    return 5;
-  } else if (pid == 0) {
-    strcpy(shm, "bye");
-    return 6;
-  }
-  if (wait(&status) != pid) {
-    return 7;
-  }
-  if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
-    return 8;
-  }
-  if (strcmp(shm, "bye") != 0) {
-    return 9;
-  }
-  return 0;
-}
-]])],[have_shm_mmap_anon=yes],[have_shm_mmap_anon=no],[
-  case $host_alias in
-    *linux*)
-      have_shm_mmap_anon=yes
-      ;;
-    *)
-      have_shm_mmap_anon=no
-      ;;
-  esac
-])
-  if test "$have_shm_mmap_anon" = "yes"; then
-    AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
-  fi
-+  AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
-+  have_shm_mmap_anon=yes
-   AC_MSG_RESULT([$have_shm_mmap_anon])
- 
-   PHP_CHECK_FUNC_LIB(shm_open, rt, root)
-   AC_MSG_CHECKING(for mmap() using shm_open() shared memory support)
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#ifndef MAP_FAILED
-# define MAP_FAILED ((void*)-1)
-#endif
-
-int main() {
-  pid_t pid;
-  int status;
-  int fd;
-  char *shm;
-  char tmpname[4096];
-
-  sprintf(tmpname,"/opcache.test.shm.%dXXXXXX", getpid());
-  if (mktemp(tmpname) == NULL) {
-    return 1;
-  }
-  fd = shm_open(tmpname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
-  if (fd == -1) {
-    return 2;
-  }
-  if (ftruncate(fd, 4096) < 0) {
-    close(fd);
-    shm_unlink(tmpname);
-    return 3;
-  }
-
-  shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-  if (shm == MAP_FAILED) {
-    return 4;
-  }
-  shm_unlink(tmpname);
-  close(fd);
-
-  strcpy(shm, "hello");
-
-  pid = fork();
-  if (pid < 0) {
-    return 5;
-  } else if (pid == 0) {
-    strcpy(shm, "bye");
-    return 6;
-  }
-  if (wait(&status) != pid) {
-    return 7;
-  }
-  if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
-    return 8;
-  }
-  if (strcmp(shm, "bye") != 0) {
-    return 9;
-  }
-  return 0;
-}
-]])],[have_shm_mmap_posix=yes],[have_shm_mmap_posix=no],[have_shm_mmap_posix=no])
-  if test "$have_shm_mmap_posix" = "yes"; then
-    AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
-    PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
-  fi
-  AC_MSG_RESULT([$have_shm_mmap_posix])
-+  AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
-+  AC_MSG_RESULT([yes])
-+  have_shm_mmap_posix=yes
-+  PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
- 
-   PHP_NEW_EXTENSION(opcache,
-        ZendAccelerator.c \
-- 
-2.17.1
diff --git a/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch b/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch
deleted file mode 100644
index 6183f49c28..0000000000
--- a/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1af203e8e385d46ad3e33b1c253b1c564aa99034 Mon Sep 17 00:00:00 2001
-From: Claude Bing <cbing@cybernetics.com>
-Date: Tue, 9 Nov 2021 13:01:55 -0500
-Subject: [PATCH 02/11] build/php.m4: don't unset cache variables
-Unsetting prevents cache variable from being passed to configure.
-Upstream-Status: Inappropriate [OE-specific]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-update this patch to 7.4.4, acinclude.m4 move to build/php.m4
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-update patch to 8.0.12
-Signed-off-by: Claude Bing <cbing@cybernetics.com>
---
- build/php.m4 | 4 ----
- 1 file changed, 4 deletions(-)
-diff --git a/build/php.m4 b/build/php.m4
-index 9746ba28f3..93551d9ca7 100644
--- a/build/php.m4
-+++ b/build/php.m4
-@@ -1568,8 +1568,6 @@ dnl PHP_CHECK_FUNC_LIB
- dnl
- AC_DEFUN([PHP_CHECK_FUNC_LIB],[
-   ifelse($2,,:,[
-  unset ac_cv_lib_$2[]_$1
-  unset ac_cv_lib_$2[]___$1
-   unset found
-   AC_CHECK_LIB($2, $1, [found=yes], [
-     AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
-@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and
- dnl HAVE_library if found and adds the library to LIBS.
- dnl
- AC_DEFUN([PHP_CHECK_FUNC],[
-  unset ac_cv_func_$1
-  unset ac_cv_func___$1
-   unset found
- 
-   AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
-- 
-2.25.1
diff --git a/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch b/meta-oe/recipes-devtools/php/php/0002-ext-phar-Makefile.frag-Fix-phar-packaging.patch
index acf2940839..b2c4f8840f 100644
--- a/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch
+++ b/meta-oe/recipes-devtools/php/php/0002-ext-phar-Makefile.frag-Fix-phar-packaging.patch
@@ -1,7 +1,7 @@
-From eab5babdadea487bbbef025068c553f5ba741774 Mon Sep 17 00:00:00 2001
+From f7724d7ccd157058630e6a887798ab6d3e34c6b7 Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:07:25 -0500
-Subject: [PATCH 06/11] ext/phar/Makefile.frag: Fix phar packaging
+Subject: [PATCH 2/5] ext/phar/Makefile.frag: Fix phar packaging
 Inherited from OE-Classic, with some additions to fix host paths leaking
 into the target package.
@@ -18,9 +18,11 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com>
 ext/phar/Makefile.frag | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
+diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
+index cedde76df..09d577d73 100644
 --- a/ext/phar/Makefile.frag
 +++ b/ext/phar/Makefile.frag
-@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir
+@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
 
 PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
 PHP_PHARCMD_EXECUTABLE = ` \
@@ -44,3 +46,6 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com>
 
 $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
        -@test -d $(builddir)/phar || mkdir $(builddir)/phar
+-- 
+2.25.1
diff --git a/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch b/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch
index e3b8cd4707..745bc2140d 100644
--- a/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch
+++ b/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch
@@ -1,7 +1,7 @@
-From a04aabc5b80371e579fbaffdd417627390d22722 Mon Sep 17 00:00:00 2001
+From d9fc6b314cefe010a0deb6e591719cfb0ff226a5 Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:10:33 -0500
-Subject: [PATCH 10/11] iconv: fix detection
+Subject: [PATCH] iconv: fix detection
 Upstream-Status: Pending
@@ -12,24 +12,24 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 update patch to version 8.0.12
 Signed-off-by: Claude Bing <cbing@cybernetics.com>
+update patch to version 8.4.4
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
 ---
 build/php.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/build/php.m4 b/build/php.m4
-index 93551d9ca7..dba50825fb 100644
+index d8a5cbf0..aee21924 100644
 --- a/build/php.m4
 +++ b/build/php.m4
-@@ -1919,7 +1919,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
+@@ -1829,7 +1829,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
-   unset ICONV_DIR
+     [Define to 1 if you have the 'libiconv' function.])
 
   dnl Check libc first if no path is provided in --with-iconv.
-  if test "$PHP_ICONV" = "yes"; then
+-  AS_VAR_IF([PHP_ICONV], [yes], [
 +  dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes
-+  if test "$PHP_ICONV" != "no"; then
+  AS_VAR_IF([PHP_ICONV], [no], [], [
     dnl Reset LIBS temporarily as it may have already been included -liconv in.
-     LIBS_save="$LIBS"
+     LIBS_save=$LIBS
     LIBS=
-- 
-2.25.1
diff --git a/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch b/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch
deleted file mode 100644
index 9637ed9516..0000000000
--- a/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c81d0bd3491a6c6371d9df2f43956d109f984310 Mon Sep 17 00:00:00 2001
-From: Claude Bing <cbing@cybernetics.com>
-Date: Tue, 9 Nov 2021 13:02:29 -0500
-Subject: [PATCH 03/11] php: remove host specific info from header file
-Based on:
-https://sources.debian.org/data/main/p/php7.3/7.3.6-1/debian/patches/
-        0036-php-5.4.9-fixheader.patch
-Upstream-Status: Inappropriate [not author]
-Signed-off-by: Joe Slater <joe.slater@windriver.com>
-Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
-update patch to 8.0.12
-Signed-off-by: Claude Bing <cbing@cybernetics.com>
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index 1eafd62a44..90c94323aa 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -1289,7 +1289,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS)
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
- EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
- 
-UNAME=`uname -a | xargs`
-+UNAME=`uname | xargs`
- PHP_UNAME=${PHP_UNAME:-$UNAME}
- AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
- PHP_OS=`uname | xargs`
-- 
-2.25.1
diff --git a/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch b/meta-oe/recipes-devtools/php/php/0004-pear-fix-Makefile.frag-for-Yocto.patch
index 37752ef949..23641be2c6 100644
--- a/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch
+++ b/meta-oe/recipes-devtools/php/php/0004-pear-fix-Makefile.frag-for-Yocto.patch
@@ -1,20 +1,20 @@
-From f22958b4c1348eec3bb4c0f2cbe2d22676e0ad23 Mon Sep 17 00:00:00 2001
+From 35d7d40ac49c96b7a9a19b2f6593abb9f18ade2b Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:04:29 -0500
-Subject: [PATCH 05/11] pear: fix Makefile.frag for Yocto
+Subject: [PATCH 4/5] pear: fix Makefile.frag for Yocto
+Upstream-Status: Pending
 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 update patch to 8.0.12
 Signed-off-by: Claude Bing <cbing@cybernetics.com>
 ---
-Upstream-Status: Pending
 pear/Makefile.frag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/pear/Makefile.frag b/pear/Makefile.frag
-index 9408757a3a..69072f39e0 100644
+index 9408757a3..69072f39e 100644
 --- a/pear/Makefile.frag
 +++ b/pear/Makefile.frag
 @@ -10,7 +10,7 @@ PEAR_SUFFIX = -ds a$(program_suffix)
diff --git a/meta-oe/recipes-devtools/php/php/0007-sapi-cli-config.m4-fix-build-directory.patch b/meta-oe/recipes-devtools/php/php/0005-sapi-cli-config.m4-fix-build-directory.patch
index 9776e7f6db..e551f19a48 100644
--- a/meta-oe/recipes-devtools/php/php/0007-sapi-cli-config.m4-fix-build-directory.patch
+++ b/meta-oe/recipes-devtools/php/php/0005-sapi-cli-config.m4-fix-build-directory.patch
@@ -1,7 +1,7 @@
-From 03aa51625e0d1aa156c2f7cd71503b1f435d35a4 Mon Sep 17 00:00:00 2001
+From 581751f8b612c381a4a7914a33bfc4130853d305 Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:08:06 -0500
-Subject: [PATCH 07/11] sapi/cli/config.m4: fix build directory
+Subject: [PATCH 5/5] sapi/cli/config.m4: fix build directory
 Upstream-Status: Inappropriate
@@ -10,23 +10,26 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 update patch to version 8.0.12
 Signed-off-by: Claude Bing <cbing@cybernetics.com>
+update patch for version 8.4.4
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
 ---
 sapi/cli/config.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
-index d17d531683..f2f87f9164 100644
+index 76c2d64e8..0c7436fd9 100644
 --- a/sapi/cli/config.m4
 +++ b/sapi/cli/config.m4
-@@ -47,7 +47,7 @@ if test "$PHP_CLI" != "no"; then
+@@ -50,7 +50,7 @@ if test "$PHP_CLI" != "no"; then
-   esac
+     ])
 
   dnl Set executable for tests.
 -  PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
 +  PHP_EXECUTABLE="${PHP_NATIVE_DIR}/php"
-   PHP_SUBST(PHP_EXECUTABLE)
 
-   dnl Expose to Makefile.
+   PHP_SUBST([PHP_EXECUTABLE])
+   PHP_SUBST([SAPI_CLI_PATH])
 -- 
 2.25.1
diff --git a/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch b/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch
deleted file mode 100644
index 78bae58e00..0000000000
--- a/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From c3c20db4415e0f6c4a601d6f9da1f3746a96b301 Mon Sep 17 00:00:00 2001
-From: Claude Bing <cbing@cybernetics.com>
-Date: Tue, 9 Nov 2021 13:08:58 -0500
-Subject: [PATCH 08/11] ext/imap/config.m4: fix include paths
-Upstream-Status: Pending
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-update patch to version 8.0.12
-Signed-off-by: Claude Bing <cbing@cybernetics.com>
---
- ext/imap/config.m4 | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
-index 5086a312d0..0e938bd544 100644
--- a/ext/imap/config.m4
-+++ b/ext/imap/config.m4
-@@ -110,7 +110,7 @@ if test "$PHP_IMAP" != "no"; then
-     PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-     AC_DEFINE(HAVE_IMAP,1,[ ])
- 
-    for i in $PHP_IMAP /usr/local /usr; do
-+    for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do
-       IMAP_INC_CHK()
-       el[]IMAP_INC_CHK(/include/c-client)
-       el[]IMAP_INC_CHK(/include/imap)
-@@ -199,13 +199,7 @@ if test "$PHP_IMAP" != "no"; then
-       AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
-     fi
- 
-    if test ! -r "$IMAP_DIR/c-client/libc-client.a" && test -r "$IMAP_DIR/c-client/c-client.a" ; then
-      ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
-    elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
-      ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
-    fi
-
-    for lib in c-client4 c-client imap; do
-+    for lib in /usr/lib c-client4 c-client imap; do
-       IMAP_LIB=$lib
-       IMAP_LIB_CHK($PHP_LIBDIR)
-       IMAP_LIB_CHK(c-client)
-- 
-2.25.1
diff --git a/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch b/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch
deleted file mode 100644
index b5a33cca7f..0000000000
--- a/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8707720c0aea405f0e06d67354f239232cc823cc Mon Sep 17 00:00:00 2001
-From: Claude Bing <cbing@cybernetics.com>
-Date: Tue, 9 Nov 2021 13:10:02 -0500
-Subject: [PATCH 09/11] php: don't use broken wrapper for mkdir
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-update patch to version 7.4.4
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-update patch to version 8.0.12
-Signed-off-by: Claude Bing <cbing@cybernetics.com>
---
-Upstream-Status: Pending
- build/Makefile.global | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/build/Makefile.global b/build/Makefile.global
-index 6566d052de..eb39421f2a 100644
--- a/build/Makefile.global
-+++ b/build/Makefile.global
-@@ -1,4 +1,4 @@
-mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
-+mkinstalldirs = mkdir -p
- INSTALL = $(top_srcdir)/build/shtool install -c
- INSTALL_DATA = $(INSTALL) -m 644
- 
-- 
-2.25.1
diff --git a/meta-oe/recipes-devtools/php/php_8.2.16.bb b/meta-oe/recipes-devtools/php/php_8.4.10.bb
index 1cb378fb94..4d598949a1 100644
--- a/meta-oe/recipes-devtools/php/php_8.2.16.bb
+++ b/meta-oe/recipes-devtools/php/php_8.4.10.bb
@@ -1,5 +1,5 @@
 SUMMARY = "A server-side, HTML-embedded scripting language"
-HOMEPAGE = "http://www.php.net"
+HOMEPAGE = "https://www.php.net"
 SECTION = "console/network"
 LICENSE = "PHP-3.0"
@@ -13,28 +13,23 @@ DEPENDS:class-native = "zlib-native libxml2-native"
 PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}"
 SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
-           file://0002-build-php.m4-don-t-unset-cache-variables.patch \
+           file://0001-configure.ac-don-t-include-build-libtool.m4.patch \
-           file://0003-php-remove-host-specific-info-from-header-file.patch \
+           file://0002-ext-phar-Makefile.frag-Fix-phar-packaging.patch \
-           file://0004-configure.ac-don-t-include-build-libtool.m4.patch \
-           file://0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch \
-           file://0009-php-don-t-use-broken-wrapper-for-mkdir.patch \
-           file://0010-iconv-fix-detection.patch \
-           file://0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch \
          "
 SRC_URI:append:class-target = " \
-            file://0001-ext-opcache-config.m4-enable-opcache.patch \
+            file://0003-iconv-fix-detection.patch \
-            file://0005-pear-fix-Makefile.frag-for-Yocto.patch \
+            file://0004-pear-fix-Makefile.frag-for-Yocto.patch \
-            file://0007-sapi-cli-config.m4-fix-build-directory.patch \
+            file://0005-sapi-cli-config.m4-fix-build-directory.patch \
-            file://0008-ext-imap-config.m4-fix-include-paths.patch \
            file://php-fpm.conf \
            file://php-fpm-apache.conf \
            file://70_mod_php${PHP_MAJOR_VERSION}.conf \
            file://php-fpm.service \
          "
-S = "${WORKDIR}/php-${PV}"
+S = "${UNPACKDIR}/php-${PV}"
-SRC_URI[sha256sum] = "2658c1b8935ab6b53a7f209354602761ab07066e66920bc472b8815fd1b43f71"
+SRC_URI[sha256sum] = "8815d10659cde5f03be4d169205d62b7b29ed0edc7cdd84b6384cda0310c3108"
 CVE_STATUS_GROUPS += "CVE_STATUS_PHP"
 CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored."
@@ -43,6 +38,7 @@ CVE_STATUS_PHP = " \
    CVE-2007-3205 \
    CVE-2007-4596 \
 "
+CVE_STATUS[CVE-2022-4900] = "cpe-incorrect: The current version (8.2.20) is not affected."
 inherit autotools pkgconfig python3native gettext multilib_header multilib_script systemd
@@ -51,6 +47,8 @@ inherit autotools pkgconfig python3native gettext multilib_header multilib_scrip
 SSTATE_SCAN_FILES += "phpize"
 SSTATE_SCAN_FILES += "build-defs.h"
+export PHP_UNAME = "Linux"
 PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}"
 # Common EXTRA_OECONF
@@ -70,10 +68,12 @@ EXTRA_OECONF = "--enable-mbstring \
                --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
                --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
                ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
-                ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \
                ${COMMON_EXTRA_OECONF} \
 "
+# Set these values directly to avoid AC_RUN_IFELSE which does not work in cross compilation environment
+CACHED_CONFIGUREVARS += "ac_cv_php_cv_shm_ipc=yes ac_cv_php_cv_shm_mmap_anon=yes ac_cv_php_cv_shm_mmap_posix=yes"
 EXTRA_OECONF:append:riscv64 = " --with-pcre-jit=no"
 EXTRA_OECONF:append:riscv32 = " --with-pcre-jit=no"
 # Needs fibers assembly implemented for rv32
@@ -81,44 +81,36 @@ EXTRA_OECONF:append:riscv32 = " --with-pcre-jit=no"
 # see https://github.com/php/php-src/commit/70b02d75f2abe3a292d49c4a4e9e4f850c2fee68
 EXTRA_OECONF:append:riscv32:libc-musl = " --disable-fiber-asm"
-CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=yes"
 EXTRA_OECONF:class-native = " \
                --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \
                --without-iconv \
                ${COMMON_EXTRA_OECONF} \
 "
-PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \
+PACKAGECONFIG ??= "mysql sqlite3 opcache openssl \
                   ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \
 "
 PACKAGECONFIG:class-native = ""
-PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip"
+PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma"
+PACKAGECONFIG[mbstring] = "--enable-mbstring,,"
 PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \
                        --with-pdo-mysql=mysqlnd \
                        ,--without-mysqli --without-pdo-mysql \
                        ,mysql5"
+PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache"
+PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
+PACKAGECONFIG[pam] = ",,libpam"
+PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql"
+PACKAGECONFIG[soap] = "--enable-soap, --disable-soap, libxml2"
 PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
                          --with-pdo-sqlite=${STAGING_LIBDIR}/.. \
                          ,--without-sqlite3 --without-pdo-sqlite \
                          ,sqlite3"
-PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql"
-PACKAGECONFIG[soap] = "--enable-soap, --disable-soap, libxml2"
-PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2"
-PACKAGECONFIG[pam] = ",,libpam"
-PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \
-                       --with-imap-ssl=${STAGING_DIR_HOST} \
-                       ,--without-imap --without-imap-ssl \
-                       ,uw-imap"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache"
-PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
 PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind"
-PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma"
+PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip"
-PACKAGECONFIG[mbstring] = "--enable-mbstring,,"
 export HOSTCC = "${BUILD_CC}"
 export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
@@ -135,8 +127,6 @@ LDFLAGS:append:riscv64 = " -latomic"
 EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
-acpaths = ""
 do_configure:prepend () {
    rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4
    find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!'
@@ -162,8 +152,11 @@ do_install:append:class-native() {
 }
 do_install:prepend() {
-    cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \
+    cat ${STAGING_DATADIR}/aclocal/libtool.m4 \
-        ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4
+    ${STAGING_DATADIR}/aclocal/lt~obsolete.m4 \
+    ${STAGING_DATADIR}/aclocal/ltoptions.m4 \
+    ${STAGING_DATADIR}/aclocal/ltsugar.m4 \
+    ${STAGING_DATADIR}/aclocal/ltversion.m4 > ${S}/build/libtool.m4
 }
 do_install:prepend:class-target() {
@@ -182,19 +175,19 @@ do_install:append:class-target() {
    rm -rf ${D}/.[a-z]*
    rm -rf ${D}/var
    rm -f  ${D}/${sysconfdir}/php-fpm.conf.default
-    install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf
+    install -m 0644 ${UNPACKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf
    install -d ${D}/${sysconfdir}/apache2/conf.d
-    install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf
+    install -m 0644 ${UNPACKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf
    install -d ${D}${sysconfdir}/init.d
    sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm
    sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm
    sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm
    install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm
-    install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf
+    install -m 0644 ${UNPACKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf
    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
        install -d ${D}${systemd_system_unitdir}
-        install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_system_unitdir}/php-fpm.service
+        install -m 0644 ${UNPACKDIR}/php-fpm.service ${D}${systemd_system_unitdir}/php-fpm.service
        sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_system_unitdir}/php-fpm.service
        sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/php-fpm.service
        sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/php-fpm.service
@@ -203,7 +196,7 @@ do_install:append:class-target() {
    if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then
        install -d ${D}${sysconfdir}/apache2/modules.d
        install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}
-        install -m 644  ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d
+        install -m 644  ${UNPACKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d
        sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf
        cat ${S}/php.ini-production | \
            sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \
diff --git a/meta-oe/recipes-devtools/pistache/pistache_0.4.26.bb b/meta-oe/recipes-devtools/pistache/pistache_0.4.26.bb
new file mode 100644
index 0000000000..b0a20e3ece
--- /dev/null
+++ b/meta-oe/recipes-devtools/pistache/pistache_0.4.26.bb
@@ -0,0 +1,40 @@
+SUMMARY = "A high-performance REST toolkit written in C++"
+HOMEPAGE = "https://pistacheio.github.io/pistache"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+SRC_URI = "git://github.com/pistacheio/pistache.git;branch=master;protocol=https"
+# SRCREV tagged 0.4.26
+SRCREV = "ddffda861aa49012dcda28f1362d0339e718cd52"
+DEPENDS = "rapidjson"
+inherit pkgconfig meson
+PACKAGECONFIG ?= "openssl brotli deflate zstd examples"
+PACKAGECONFIG[openssl]  = "-DPISTACHE_USE_SSL=true, -DPISTACHE_USE_SSL=false, openssl"
+PACKAGECONFIG[brotli]   = "-DPISTACHE_USE_CONTENT_ENCODING_BROTLI=true, -DPISTACHE_USE_CONTENT_ENCODING_BROTLI=false, brotli"
+PACKAGECONFIG[deflate]  = "-DPISTACHE_USE_CONTENT_ENCODING_DEFLATE=true, -DPISTACHE_USE_CONTENT_ENCODING_DEFLATE=false, zlib"
+PACKAGECONFIG[zstd]     = "-DPISTACHE_USE_CONTENT_ENCODING_ZSTD=true, -DPISTACHE_USE_CONTENT_ENCODING_ZSTD=false, zstd"
+PACKAGECONFIG[examples] = "-DPISTACHE_BUILD_EXAMPLES=true, -DPISTACHE_BUILD_EXAMPLES=false"
+PACKAGECONFIG[test]     = "-DPISTACHE_BUILD_TESTS=true, -DPISTACHE_BUILD_TESTS=false, gtest curl"
+do_install:append () {
+    if ${@bb.utils.contains("PACKAGECONFIG", "examples", "true", "false", d)}; then
+        install -d ${D}${bindir}
+        rm -rf ${B}/examples/*.p/
+        install -m 0755 ${B}/examples/run*   ${D}${bindir}/
+    fi
+}
+PACKAGES += "${PN}-examples"
+FILES:${PN}:remove  = " ${bindir}/*"
+RDEPENDS:${PN}-examples += "${PN}"
+FILES:${PN}-examples = "${bindir}"
+RDEPENDS:${PN} += "rapidjson"
+COMPATIBLE_HOST:libc-musl = "null"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/ply/ply_git.bb b/meta-oe/recipes-devtools/ply/ply_git.bb
index 7793971083..916ff29118 100644
--- a/meta-oe/recipes-devtools/ply/ply_git.bb
+++ b/meta-oe/recipes-devtools/ply/ply_git.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS += "bison-native"
-PV = "2.3.0"
+PV = "2.4.0"
 SRC_URI = "git://github.com/iovisor/ply;branch=master;protocol=https"
-SRCREV = "864fac79116870df1ab7aa21e639578807e41e75"
+SRCREV = "282558cfa1c0f0e095354e3a6ec4486b524179dc"
-S = "${WORKDIR}/git"
 CACHED_CONFIGUREVARS = 'LD="${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}"'
diff --git a/meta-oe/recipes-devtools/pmtools/pmtools/pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch b/meta-oe/recipes-devtools/pmtools/pmtools/pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch
deleted file mode 100644
index 3be18986fc..0000000000
--- a/meta-oe/recipes-devtools/pmtools/pmtools/pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 03a886252f6555d6b0af76b654e76459642b89da Mon Sep 17 00:00:00 2001
-From: Yunguo Wei <yunguo.wei@windriver.com>
-Date: Tue, 3 Dec 2013 18:12:50 +0800
-Subject: [PATCH] pmtools: switch to dynamic buffer for huge ACPI tables
-For servers like Canoe Pass or Thunder Ridge, there are much more
-entries in ACPI table, so original 1K buffer is insufficient.
-We switch to dynamic buffer on this situation.
-Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
-Upstream-Status: Pending
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
- madt/madt.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
--- a/madt/madt.c
-+++ b/madt/madt.c
-@@ -34,14 +34,16 @@ typedef unsigned long long u64;
- //#include <sys/mman.h>
- #include <stdio.h> // fread
- #include <stdlib.h> // malloc
-+#include <string.h> // memset/memcpy
- 
- #include "./tables.c"
- 
- int verbose = 0;
- /*
-/* read standard input
-+ * read standard input
-  * write decoded madt to standard output
-  */
-+size_t
- get_next_entry(acpi_table_entry_header * entry_header)
- {
-        size_t retval;
-@@ -51,9 +53,11 @@ get_next_entry(acpi_table_entry_header *
-        return retval;
- }
- 
-u8     buffer[1024];
- 
-main()
-+u8     buf[1024];
-+u8     *buffer = buf;
-+int
-+main(int argc, char *argv[])
- {
-        size_t retval;
-        struct acpi_table_madt *madt_header;
-@@ -75,6 +79,17 @@ main()
- 
-        if (verbose) printf("header.length %d\n", madt_header->header.length);
- 
-+       /* if 1K buffer is insufficient for acpi table, switch to a larger memory buffer */
-+       if(expected_length > sizeof(buf)) {
-+               buffer = malloc(expected_length);
-+               if (!buffer) {
-+                       perror("malloc");
-+                       exit(1);
-+               }
-+               memset(buffer, 0, expected_length);
-+               memcpy(buffer, buf, sizeof(struct acpi_table_madt));
-+       }
-+
-        acpi_table_print((void*)&(buffer[bytes_read]), 0);
- 
-        bytes_read = sizeof(struct acpi_table_madt);
-@@ -118,6 +133,9 @@ done:
-                printf("Checksum 0x%x != 0; 0x%x in header ERROR\n", csum,
-                         madt_header->header.checksum);
- 
-+       if(buffer != buf)
-+               free(buffer);
-+
-        return 0;
- }
- 
diff --git a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
deleted file mode 100644
index ad149de12c..0000000000
--- a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "This is a small collection of power management \
-    test and investigation tools"
-HOMEPAGE = "http://lesswatts.org/projects/acpi"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-PV = "20130209+git"
-SRC_URI = "git://github.com/anyc/pmtools.git;branch=master;protocol=https \
-    file://pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch \
-"
-SRCREV = "3ebe0e54c54061b4c627236cbe35d820de2e1168"
-COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
-S = "${WORKDIR}/git"
-inherit update-alternatives
-ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE:${PN} = "acpixtract acpidump"
-do_configure[noexec] = "1"
-do_compile() {
-    oe_runmake
-}
-do_install() {
-    install -d ${D}${bindir} ${D}${docdir}
-    install -m 755 ${S}/acpidump/acpidump ${D}${bindir}
-    install -m 755 ${S}/acpixtract/acpixtract ${D}${bindir}
-    install -m 755 ${S}/madt/madt ${D}${bindir}
-    install -m 644 ${S}/README ${D}${docdir}
-}
diff --git a/meta-oe/recipes-devtools/pocketpy/pocketpy_2.0.6.bb b/meta-oe/recipes-devtools/pocketpy/pocketpy_2.0.6.bb
new file mode 100644
index 0000000000..f3ffccf626
--- /dev/null
+++ b/meta-oe/recipes-devtools/pocketpy/pocketpy_2.0.6.bb
@@ -0,0 +1,33 @@
+SUMMARY = "A Portable Python 3.x Interpreter in Modern C."
+DESCRIPTION = "pkpy is a lightweight(~15K LOC) Python 3.x \
+              interpreter for game scripting, written in C11. \
+              It aims to be an alternative to lua for game \
+              scripting, with elegant syntax, powerful features \
+              and competitive performance.  pkpy is extremely \
+              easy to embed via a single header file pocketpy.h, \
+              without external dependencies. \
+              "
+HOMEPAGE = "https://pocketpy.dev/"
+BUGTRACKER = "https://github.com/pocketpy/pocketpy/issues"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8cdfa87bc5e09bc07f8cf64135026d91"
+SRC_URI = "git://github.com/pocketpy/pocketpy.git;protocol=https;branch=main"
+SRCREV = "8a3bdd7e0a43b44e3b32548543128d95e68a3802"
+inherit cmake
+CFLAGS += "-fPIC"
+do_install() {
+    install -d ${D}${libdir}
+    install -m 0644 ${B}/libpocketpy.so ${D}${libdir}/
+    install -d ${D}${includedir}/pocketpy
+    cp -r ${S}/include/* ${D}${includedir}/pocketpy/
+}
+FILES:${PN} = "${libdir}/libpocketpy.so"
+FILES:${PN}-dev = "${includedir}/pocketpy"
+FILES:${PN}-dbg += "${libdir}/.debug/libpocketpy.so"
diff --git a/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch b/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch
deleted file mode 100644
index a41f985eb8..0000000000
--- a/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From cef3fc90f02ef4fc49515745194bac3d81a2265b Mon Sep 17 00:00:00 2001
-From: "Jose E. Marchesi" <jose.marchesi@oracle.com>
-Date: Fri, 30 Apr 2021 13:17:05 +0200
-Subject: [PATCH] build: do not check for Tcl/Tk if --disable-gui is specified
-2021-04-30  Jose E. Marchesi  <jemarch@gnu.org>
-        * configure.ac: Do not check for tcl/tk if --disable-gui is
-        specified at configure time.
-(cherry picked from commit 280a5e154287e43c0a40d9530a9cc658a7367a9c)
-[Romain: remove Changelog entry]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
-Upstream-Status: Pending
- configure.ac | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index c7205513..c2f0760a 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -214,12 +214,15 @@ fi
- dnl The GUI is optional, and depends on the availability of Tcl and
- dnl Tk.
- 
-POKE_TCLTK
-
- AC_ARG_ENABLE([gui],
-               AS_HELP_STRING([--enable-gui],
-                              [Enable the GUI (default is YES)]),
-              [gui_enabled=$enableval], [gui_enabled=$has_tcltk])
-+              [gui_enabled=$enableval], [gui_enabled=yes])
-+
-+if test "x$gui_enabled" = "xyes"; then
-+ POKE_TCLTK
-+ gui_enabled=$has_tcltk
-+fi
- 
- AM_CONDITIONAL([GUI], [test "x$gui_enabled" = "xyes"])
- 
-- 
-2.30.2
diff --git a/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch b/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch
deleted file mode 100644
index 660b19f514..0000000000
--- a/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c37419e459bd5863534719fa50755174d0912e6d Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 30 Apr 2021 14:32:21 +0200
-Subject: [PATCH] jitter: jitter-config.in: avoit host poisoning while
- cross-compiling
-When jitter is bundled into another project (poke), jitter-config --cppflags
-return an unsafe path "-I /usr/include".
-In the context of Buildroot, such configuration script woulf be "fixed"
-after installation. But jitter-config is not installed by poke since it's
-build as static library and liked to poke.
-For now, patch jitter-config.in instead of jitter-config.in.m4sh since
-there is an issue while converting the M4sh m4sh script ( .in.m4sh )
-into a portable shell script ( .in ) ready to be processed by aclocal
-for @-substitutions.
-[1] https://git.buildroot.net/buildroot/tree/package/pkg-generic.mk?h=2021.02.1#n291
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
-Upstream-Status: Pending
- jitter/bin/jitter-config.in | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-diff --git a/jitter/bin/jitter-config.in b/jitter/bin/jitter-config.in
-index 5e124f0..af0ac9d 100644
--- a/jitter/bin/jitter-config.in
-+++ b/jitter/bin/jitter-config.in
-@@ -998,11 +998,7 @@ while test "$#" != "0"; do
-             append_to_output cflags;;
-         --cppflags)
-             no_option_argument
-            append_to_output cppflags
-            # Append a -I argument.  This is defined separately from the rest,
-            # as the installation prefix can be decided very late, at Jitter
-            # installation time.
-            output="$output -I $includedir";;
-+            append_to_output cppflags;;
-         --ldadd)
-             no_option_argument
-             append_to_output ldadd;;
-- 
-2.30.2
diff --git a/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch
index ad2bf764d3..67384b73d4 100644
--- a/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch
+++ b/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch
@@ -11,18 +11,16 @@ Avoid:
      ./../poke/poke -o ./poke.1
 ../run: line 51: exec: :: not found
+Upstream-Status: Pending
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
 ---
-Upstream-Status: Pending
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index c2f0760a..93769ef9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5])
+@@ -148,7 +148,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5])
 if test $cross_compiling = no; then
   AM_MISSING_PROG(HELP2MAN, help2man)
 else
@@ -30,7 +28,4 @@ index c2f0760a..93769ef9 100644
 +  HELP2MAN=true
 fi
 
- dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to
+ dnl The following Automake conditional is used in some Makefile.am files
-- 
-2.30.2
diff --git a/meta-oe/recipes-devtools/poke/poke_1.2.bb b/meta-oe/recipes-devtools/poke/poke_4.2.bb
index af85d21705..0ae392947e 100644
--- a/meta-oe/recipes-devtools/poke/poke_1.2.bb
+++ b/meta-oe/recipes-devtools/poke/poke_4.2.bb
@@ -6,21 +6,14 @@ LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \
-          file://0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch \
-          file://0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch \
          file://0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch \
          "
 DEPENDS = "flex-native bison-native bdwgc readline"
-SRC_URI[sha256sum] = "f61cf8da5b64c01a1359373725aad1ca257f35c1c9269e4d50dd0664183ddf62"
+SRC_URI[sha256sum] = "8aaf36e61e367a53140ea40e2559e9ec512e779c42bee34e7ac24b34ba119bde"
-# poke does not support using out-of-tree builds
+inherit autotools gettext pkgconfig
-inherit autotools-brokensep gettext pkgconfig
-# The automatic m4 path detection gets confused, so force the right value from
-# the poke bootstrap script.
-acpaths = "-I ./m4"
 EXTRA_OECONF = "--disable-gui \
                --disable-libnbd \
@@ -29,4 +22,10 @@ EXTRA_OECONF = "--disable-gui \
 PACKAGECONFIG[mi] = "--enable-mi,--disable-mi,json-c"
-FILES:${PN} += "${datadir}/emacs/site-lisp"
+PACKAGES =+ "${PN}-emacs ${PN}-vim"
+# Disable parallel install as it is not supported upstream
+PARALLEL_MAKEINST = "-j1"
+FILES:${PN}-emacs += "${datadir}/emacs/site-lisp"
+FILES:${PN}-vim += "${datadir}/vim/vimfiles"
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch
index 896a568e19..cae68e948b 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch
@@ -1,6 +1,6 @@
-From 62b2fd0a150133b6439f6537cb1762d35f5790ee Mon Sep 17 00:00:00 2001
+From ad4d22cd6b0b1237a4d50699736d38cd3c902ace Mon Sep 17 00:00:00 2001
 From: Xiangyu Chen <xiangyu.chen@windriver.com>
-Date: Fri, 31 Mar 2023 16:02:50 +0800
+Date: Wed, 12 Mar 2025 00:16:24 -0700
 Subject: [PATCH] Makefile.am: do not compile the code which was generated from
 test-full.proto in protobuf-c-native
@@ -11,15 +11,18 @@ the test-full.proto with latest version protobuf.
 Upstream-Status: Inappropriate [oe specific]
 Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
+Rebase to 1.5.1
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
 Makefile.am | 75 -----------------------------------------------------
 1 file changed, 75 deletions(-)
 diff --git a/Makefile.am b/Makefile.am
-index ff12664..7412aef 100644
+index 77aa9d9..5cdd81a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -136,81 +136,6 @@ else
+@@ -138,81 +138,6 @@ else
 
 LOG_COMPILER = $(VALGRIND)
 
@@ -72,20 +75,20 @@ index ff12664..7412aef 100644
 -t_generated_code2_cxx_generate_packed_data_LDADD = \
 -       $(protobuf_LIBS)
 -
-t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto
+-t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto
-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto
+-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto
 -
-t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto
+-t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto
-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto
+-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto
 -
-t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto
+-t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto
-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
+-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
 -
 -t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto
 -       $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
 -
-t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto
+-t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto
-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto
+-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto
 -
 -t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT)
 -       $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc
@@ -102,5 +105,5 @@ index ff12664..7412aef 100644
        t/version/version.c
 t_version_version_LDADD = \
 -- 
-2.34.1
+2.25.1
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch
new file mode 100644
index 0000000000..1aae1f17b0
--- /dev/null
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch
@@ -0,0 +1,1446 @@
+From b28683f8027bf1e886b748b5603eb16d203b5a92 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 18:18:33 -0500
+Subject: [PATCH 01/11] protoc-gen-c/c_helpers.h: Move compat defines into new
+ header file compat.h
+Upstream-Status: Backport [https://gitlab.archlinux.org/archlinux/packaging/packages/protobuf-c/-/blob/main/protobuf-30.patch]
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ protoc-gen-c/c_field.cc           |  1 +
+ protoc-gen-c/c_helpers.cc         |  1 +
+ protoc-gen-c/c_helpers.h          | 10 -------
+ protoc-gen-c/c_message.cc         |  1 +
+ protoc-gen-c/c_primitive_field.cc |  1 +
+ protoc-gen-c/compat.h             | 46 +++++++++++++++++++++++++++++++
+ protoc-gen-c/main.cc              |  1 +
+ 7 files changed, 51 insertions(+), 10 deletions(-)
+ create mode 100644 protoc-gen-c/compat.h
+diff --git a/protoc-gen-c/c_field.cc b/protoc-gen-c/c_field.cc
+index 5e79967b..d6d8597e 100644
+--- a/protoc-gen-c/c_field.cc
+++ b/protoc-gen-c/c_field.cc
+@@ -74,6 +74,7 @@
+ #include "c_message_field.h"
+ #include "c_primitive_field.h"
+ #include "c_string_field.h"
+#include "compat.h"
+ 
+ namespace protobuf_c {
+ 
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index 5edcf904..c38843f8 100644
+--- a/protoc-gen-c/c_helpers.cc
+++ b/protoc-gen-c/c_helpers.cc
+@@ -73,6 +73,7 @@
+ #include <google/protobuf/stubs/common.h>
+ 
+ #include "c_helpers.h"
+#include "compat.h"
+ 
+ namespace protobuf_c {
+ 
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index 943676e9..e69504bb 100644
+--- a/protoc-gen-c/c_helpers.h
+++ b/protoc-gen-c/c_helpers.h
+@@ -186,16 +186,6 @@ inline int FieldSyntax(const google::protobuf::FieldDescriptor* field) {
+   return 2;
+ }
+ 
+-// Work around changes in protobuf >= 22.x without breaking compilation against
+-// older protobuf versions.
+-#if GOOGLE_PROTOBUF_VERSION >= 4022000
+-# define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
+-# define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
+-# define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
+-# define GOOGLE_DCHECK_GE      ABSL_DCHECK_GE
+-# define GOOGLE_LOG            ABSL_LOG
+-#endif
+-
+ }  // namespace protobuf_c
+ 
+ #endif  // PROTOBUF_C_PROTOC_GEN_C_C_HELPERS_H__
+diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
+index d4a9a01e..46413873 100644
+--- a/protoc-gen-c/c_message.cc
+++ b/protoc-gen-c/c_message.cc
+@@ -78,6 +78,7 @@
+ #include "c_extension.h"
+ #include "c_helpers.h"
+ #include "c_message.h"
+#include "compat.h"
+ 
+ namespace protobuf_c {
+ 
+diff --git a/protoc-gen-c/c_primitive_field.cc b/protoc-gen-c/c_primitive_field.cc
+index 253b00bd..588f60e6 100644
+--- a/protoc-gen-c/c_primitive_field.cc
+++ b/protoc-gen-c/c_primitive_field.cc
+@@ -67,6 +67,7 @@
+ 
+ #include "c_helpers.h"
+ #include "c_primitive_field.h"
+#include "compat.h"
+ 
+ namespace protobuf_c {
+ 
+diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
+new file mode 100644
+index 00000000..2ee78281
+--- /dev/null
+++ b/protoc-gen-c/compat.h
+@@ -0,0 +1,46 @@
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+#define PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+
+#if GOOGLE_PROTOBUF_VERSION >= 4022000
+# define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
+# define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
+# define GOOGLE_DCHECK_GE      ABSL_DCHECK_GE
+# define GOOGLE_LOG            ABSL_LOG
+#endif
+
+namespace protobuf_c {
+
+namespace compat {
+
+}  // namespace compat
+
+}  // namespace protobuf_c
+
+#endif  // PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+diff --git a/protoc-gen-c/main.cc b/protoc-gen-c/main.cc
+index 0656c113..5ab929d3 100644
+--- a/protoc-gen-c/main.cc
+++ b/protoc-gen-c/main.cc
+@@ -32,6 +32,7 @@
+ 
+ #include "c_generator.h"
+ #include "c_helpers.h"
+#include "compat.h"
+ 
+ int main(int argc, char* argv[]) {
+   protobuf_c::CGenerator c_generator;
+From 1678f1fba6f2d3e5c1db2817495ddcd72bd4e87b Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:09:03 -0500
+Subject: [PATCH 02/11] protoc-gen-c/compat.h: Add `compat::StringView` type
+protobuf >= 30.x replaces `const std::string&` in various APIs with
+its own string view type that may actually be a `absl::string_view`.
+Introduce our own `compat::StringView` type that we can use instead
+of `const std::string&` in order to support compiling across multiple
+protobuf versions.
+---
+ protoc-gen-c/compat.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
+index 2ee78281..fe8041b5 100644
+--- a/protoc-gen-c/compat.h
+++ b/protoc-gen-c/compat.h
+@@ -28,6 +28,8 @@
+ #ifndef PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+ #define PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+ 
+#include <string>
+
+ #if GOOGLE_PROTOBUF_VERSION >= 4022000
+ # define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
+ # define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
+@@ -39,6 +41,12 @@ namespace protobuf_c {
+ 
+ namespace compat {
+ 
+#if GOOGLE_PROTOBUF_VERSION >= 6030000
+typedef google::protobuf::internal::DescriptorStringView StringView;
+#else
+typedef const std::string& StringView;
+#endif
+
+ }  // namespace compat
+ 
+ }  // namespace protobuf_c
+From db5252c131c82fb48ee599179b6989a577b7fbc8 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:13:44 -0500
+Subject: [PATCH 03/11] Remove some unused functions
+---
+ protoc-gen-c/c_helpers.cc | 64 ---------------------------------------
+ protoc-gen-c/c_helpers.h  |  3 --
+ 2 files changed, 67 deletions(-)
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index c38843f8..bbb4a615 100644
+--- a/protoc-gen-c/c_helpers.cc
+++ b/protoc-gen-c/c_helpers.cc
+@@ -90,14 +90,6 @@ namespace protobuf_c {
+ #pragma warning(disable:4996)
+ #endif
+ 
+-std::string DotsToUnderscores(const std::string& name) {
+-  return StringReplace(name, ".", "_", true);
+-}
+-
+-std::string DotsToColons(const std::string& name) {
+-  return StringReplace(name, ".", "::", true);
+-}
+-
+ std::string SimpleFtoa(float f) {
+   char buf[100];
+   snprintf(buf,sizeof(buf),"%.*g", FLT_DIG, f);
+@@ -333,11 +325,6 @@ std::string FilenameIdentifier(const std::string& filename) {
+   return result;
+ }
+ 
+-// Return the name of the BuildDescriptors() function for a given file.
+-std::string GlobalBuildDescriptorsName(const std::string& filename) {
+-  return "proto_BuildDescriptors_" + FilenameIdentifier(filename);
+-}
+-
+ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label) {
+   switch (label) {
+     case google::protobuf::FieldDescriptor::LABEL_OPTIONAL: return "optional";
+@@ -392,57 +379,6 @@ WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *
+   }
+ }
+     
+-
+-
+-// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx
+-// XXXXXXXXX  this stuff is copied from strutils.cc !!!!   XXXXXXXXXXXXXXXXXXXXXXXXXXXXx
+-// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx
+-// ----------------------------------------------------------------------
+-// StringReplace()
+-//    Replace the "old" pattern with the "new" pattern in a string,
+-//    and append the result to "res".  If replace_all is false,
+-//    it only replaces the first instance of "old."
+-// ----------------------------------------------------------------------
+-
+-void StringReplace(const std::string& s, const std::string& oldsub,
+-                   const std::string& newsub, bool replace_all,
+-                   std::string* res) {
+-  if (oldsub.empty()) {
+-    res->append(s);  // if empty, append the given string.
+-    return;
+-  }
+-
+-  std::string::size_type start_pos = 0;
+-  std::string::size_type pos;
+-  do {
+-    pos = s.find(oldsub, start_pos);
+-    if (pos == std::string::npos) {
+-      break;
+-    }
+-    res->append(s, start_pos, pos - start_pos);
+-    res->append(newsub);
+-    start_pos = pos + oldsub.size();  // start searching again after the "old"
+-  } while (replace_all);
+-  res->append(s, start_pos, s.length() - start_pos);
+-}
+-
+-
+-// ----------------------------------------------------------------------
+-// StringReplace()
+-//    Give me a string and two patterns "old" and "new", and I replace
+-//    the first instance of "old" in the string with "new", if it
+-//    exists.  If "global" is true; call this repeatedly until it
+-//    fails.  RETURN a new string, regardless of whether the replacement
+-//    happened or not.
+-// ----------------------------------------------------------------------
+-
+-std::string StringReplace(const std::string& s, const std::string& oldsub,
+-                          const std::string& newsub, bool replace_all) {
+-  std::string ret;
+-  StringReplace(s, oldsub, newsub, replace_all, &ret);
+-  return ret;
+-}
+-
+ // ----------------------------------------------------------------------
+ // SplitStringUsing()
+ //    Split a string using a character delimiter. Append the components
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index e69504bb..377d4272 100644
+--- a/protoc-gen-c/c_helpers.h
+++ b/protoc-gen-c/c_helpers.h
+@@ -150,9 +150,6 @@ const char* DeclaredTypeMethodName(google::protobuf::FieldDescriptor::Type type)
+ // Convert a file name into a valid identifier.
+ std::string FilenameIdentifier(const std::string& filename);
+ 
+-// Return the name of the BuildDescriptors() function for a given file.
+-std::string GlobalBuildDescriptorsName(const std::string& filename);
+-
+ // return 'required', 'optional', or 'repeated'
+ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label);
+ 
+From bc2cb66d908f016dd3f7082c8a6ad7c58bc03412 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:18:05 -0500
+Subject: [PATCH 04/11] Use `compat::StringView` type across various function
+ signatures
+---
+ protoc-gen-c/c_helpers.cc | 44 +++++++++++++++++++++------------------
+ protoc-gen-c/c_helpers.h  | 36 ++++++++++++++++----------------
+ 2 files changed, 42 insertions(+), 38 deletions(-)
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index bbb4a615..c759c8c2 100644
+--- a/protoc-gen-c/c_helpers.cc
+++ b/protoc-gen-c/c_helpers.cc
+@@ -96,6 +96,7 @@ std::string SimpleFtoa(float f) {
+   buf[sizeof(buf)-1] = 0;              /* should NOT be necessary */
+   return buf;
+ }
+
+ std::string SimpleDtoa(double d) {
+   char buf[100];
+   snprintf(buf,sizeof(buf),"%.*g", DBL_DIG, d);
+@@ -103,7 +104,7 @@ std::string SimpleDtoa(double d) {
+   return buf;
+ }
+ 
+-std::string CamelToUpper(const std::string &name) {
+std::string CamelToUpper(compat::StringView name) {
+   bool was_upper = true;               // suppress initial _
+   std::string rv = "";
+   int len = name.length();
+@@ -120,7 +121,8 @@ std::string CamelToUpper(const std::string &name) {
+   }
+   return rv;
+ }
+-std::string CamelToLower(const std::string &name) {
+
+std::string CamelToLower(compat::StringView name) {
+   bool was_upper = true;               // suppress initial _
+   std::string rv = "";
+   int len = name.length();
+@@ -138,8 +140,7 @@ std::string CamelToLower(const std::string &name) {
+   return rv;
+ }
+ 
+-
+-std::string ToUpper(const std::string &name) {
+std::string ToUpper(compat::StringView name) {
+   std::string rv = "";
+   int len = name.length();
+   for (int i = 0; i < len; i++) {
+@@ -147,7 +148,8 @@ std::string ToUpper(const std::string &name) {
+   }
+   return rv;
+ }
+-std::string ToLower(const std::string &name) {
+
+std::string ToLower(compat::StringView name) {
+   std::string rv = "";
+   int len = name.length();
+   for (int i = 0; i < len; i++) {
+@@ -155,7 +157,8 @@ std::string ToLower(const std::string &name) {
+   }
+   return rv;
+ }
+-std::string ToCamel(const std::string &name) {
+
+std::string ToCamel(compat::StringView name) {
+   std::string rv = "";
+   int len = name.length();
+   bool next_is_upper = true;
+@@ -172,7 +175,7 @@ std::string ToCamel(const std::string &name) {
+   return rv;
+ }
+ 
+-std::string OverrideFullName(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
+std::string OverrideFullName(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+   const ProtobufCFileOptions opt = file->options().GetExtension(pb_c_file);
+   if (!opt.has_c_package())
+     return full_name;
+@@ -184,7 +187,7 @@ std::string OverrideFullName(const std::string &full_name, const google::protobu
+   return new_name + full_name.substr(file->package().length());
+ }
+ 
+-std::string FullNameToLower(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
+std::string FullNameToLower(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+   std::vector<std::string> pieces;
+   SplitStringUsing(OverrideFullName(full_name, file), ".", &pieces);
+   std::string rv = "";
+@@ -195,7 +198,8 @@ std::string FullNameToLower(const std::string &full_name, const google::protobuf
+   }
+   return rv;
+ }
+-std::string FullNameToUpper(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
+
+std::string FullNameToUpper(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+   std::vector<std::string> pieces;
+   SplitStringUsing(OverrideFullName(full_name, file), ".", &pieces);
+   std::string rv = "";
+@@ -206,7 +210,8 @@ std::string FullNameToUpper(const std::string &full_name, const google::protobuf
+   }
+   return rv;
+ }
+-std::string FullNameToC(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
+
+std::string FullNameToC(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+   std::vector<std::string> pieces;
+   SplitStringUsing(OverrideFullName(full_name, file), ".", &pieces);
+   std::string rv = "";
+@@ -248,7 +253,7 @@ void PrintComment(google::protobuf::io::Printer* printer, std::string comment)
+    }
+ }
+ 
+-std::string ConvertToSpaces(const std::string &input) {
+std::string ConvertToSpaces(compat::StringView input) {
+   return std::string(input.size(), ' ');
+ }
+ 
+@@ -259,8 +264,7 @@ int compare_name_indices_by_name(const void *a, const void *b)
+   return strcmp (ni_a->name, ni_b->name);
+ }
+ 
+-
+-std::string CEscape(const std::string& src);
+std::string CEscape(compat::StringView src);
+ 
+ const char* const kKeywordList[] = {
+   "and", "and_eq", "asm", "auto", "bitand", "bitor", "bool", "break", "case",
+@@ -300,7 +304,7 @@ std::string FieldDeprecated(const google::protobuf::FieldDescriptor* field) {
+   return "";
+ }
+ 
+-std::string StripProto(const std::string& filename) {
+std::string StripProto(compat::StringView filename) {
+   if (HasSuffixString(filename, ".protodevel")) {
+     return StripSuffixString(filename, ".protodevel");
+   } else {
+@@ -309,7 +313,7 @@ std::string StripProto(const std::string& filename) {
+ }
+ 
+ // Convert a file name into a valid identifier.
+-std::string FilenameIdentifier(const std::string& filename) {
+std::string FilenameIdentifier(compat::StringView filename) {
+   std::string result;
+   for (unsigned i = 0; i < filename.size(); i++) {
+     if (isalnum(filename[i])) {
+@@ -335,7 +339,7 @@ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label) {
+ }
+ 
+ unsigned
+-WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, const std::string &name)
+WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, compat::StringView name)
+ {
+   std::map<std::string, std::string> vars;
+   vars["name"] = name;
+@@ -389,7 +393,7 @@ WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *
+ // ----------------------------------------------------------------------
+ template <typename ITR>
+ static inline
+-void SplitStringToIteratorUsing(const std::string& full,
+void SplitStringToIteratorUsing(compat::StringView full,
+                                 const char* delim,
+                                 ITR& result) {
+   // Optimize the common case where delim is a single character.
+@@ -422,7 +426,7 @@ void SplitStringToIteratorUsing(const std::string& full,
+   }
+ }
+ 
+-void SplitStringUsing(const std::string& full,
+void SplitStringUsing(compat::StringView full,
+                       const char* delim,
+                       std::vector<std::string>* result) {
+   std::back_insert_iterator< std::vector<std::string> > it(*result);
+@@ -435,7 +439,6 @@ char* FastHexToBuffer(int i, char* buffer)
+   return buffer;
+ }
+ 
+-
+ static int CEscapeInternal(const char* src, int src_len, char* dest,
+                            int dest_len, bool use_hex) {
+   const char* src_end = src + src_len;
+@@ -478,7 +481,8 @@ static int CEscapeInternal(const char* src, int src_len, char* dest,
+   dest[used] = '\0';   // doesn't count towards return value though
+   return used;
+ }
+-std::string CEscape(const std::string& src) {
+
+std::string CEscape(compat::StringView src) {
+   const int dest_length = src.size() * 4 + 1; // Maximum possible expansion
+   std::unique_ptr<char[]> dest(new char[dest_length]);
+   const int len = CEscapeInternal(src.data(), src.size(),
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index 377d4272..ccd39ca2 100644
+--- a/protoc-gen-c/c_helpers.h
+++ b/protoc-gen-c/c_helpers.h
+@@ -73,6 +73,8 @@
+ 
+ #include <protobuf-c/protobuf-c.pb.h>
+ 
+#include "compat.h"
+
+ namespace protobuf_c {
+ 
+ // --- Borrowed from stubs. ---
+@@ -84,11 +86,10 @@ template <typename T> std::string SimpleItoa(T n) {
+ 
+ std::string SimpleFtoa(float f);
+ std::string SimpleDtoa(double f);
+-void SplitStringUsing(const std::string &str, const char *delim, std::vector<std::string> *out);
+-std::string CEscape(const std::string& src);
+-std::string StringReplace(const std::string& s, const std::string& oldsub, const std::string& newsub, bool replace_all);
+-inline bool HasSuffixString(const std::string& str, const std::string& suffix) { return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; }
+-inline std::string StripSuffixString(const std::string& str, const std::string& suffix) { if (HasSuffixString(str, suffix)) { return str.substr(0, str.size() - suffix.size()); } else { return str; } }
+void SplitStringUsing(compat::StringView str, const char *delim, std::vector<std::string> *out);
+std::string CEscape(compat::StringView src);
+inline bool HasSuffixString(compat::StringView str, compat::StringView suffix) { return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; }
+inline std::string StripSuffixString(compat::StringView str, compat::StringView suffix) { if (HasSuffixString(str, suffix)) { return str.substr(0, str.size() - suffix.size()); } else { return str; } }
+ char* FastHexToBuffer(int i, char* buffer);
+ 
+ 
+@@ -110,31 +111,31 @@ inline const google::protobuf::Descriptor* FieldScope(const google::protobuf::Fi
+ 
+ // convert a CamelCase class name into an all uppercase affair
+ // with underscores separating words, e.g. MyClass becomes MY_CLASS.
+-std::string CamelToUpper(const std::string &class_name);
+-std::string CamelToLower(const std::string &class_name);
+std::string CamelToUpper(compat::StringView class_name);
+std::string CamelToLower(compat::StringView class_name);
+ 
+ // lowercased, underscored name to camel case
+-std::string ToCamel(const std::string &name);
+std::string ToCamel(compat::StringView name);
+ 
+ // lowercase the string
+-std::string ToLower(const std::string &class_name);
+-std::string ToUpper(const std::string &class_name);
+std::string ToLower(compat::StringView class_name);
+std::string ToUpper(compat::StringView class_name);
+ 
+ // full_name() to lowercase with underscores
+-std::string FullNameToLower(const std::string &full_name, const google::protobuf::FileDescriptor *file);
+-std::string FullNameToUpper(const std::string &full_name, const google::protobuf::FileDescriptor *file);
+std::string FullNameToLower(compat::StringView full_name, const google::protobuf::FileDescriptor *file);
+std::string FullNameToUpper(compat::StringView full_name, const google::protobuf::FileDescriptor *file);
+ 
+ // full_name() to c-typename (with underscores for packages, otherwise camel case)
+-std::string FullNameToC(const std::string &class_name, const google::protobuf::FileDescriptor *file);
+std::string FullNameToC(compat::StringView class_name, const google::protobuf::FileDescriptor *file);
+ 
+ // Splits, indents, formats, and prints comment lines
+ void PrintComment(google::protobuf::io::Printer* printer, std::string comment);
+ 
+ // make a string of spaces as long as input
+-std::string ConvertToSpaces(const std::string &input);
+std::string ConvertToSpaces(compat::StringView input);
+ 
+ // Strips ".proto" or ".protodevel" from the end of a filename.
+-std::string StripProto(const std::string& filename);
+std::string StripProto(compat::StringView filename);
+ 
+ // Get the C++ type name for a primitive type (e.g. "double", "::google::protobuf::int32", etc.).
+ // Note:  non-built-in type names will be qualified, meaning they will start
+@@ -148,15 +149,14 @@ const char* PrimitiveTypeName(google::protobuf::FieldDescriptor::CppType type);
+ const char* DeclaredTypeMethodName(google::protobuf::FieldDescriptor::Type type);
+ 
+ // Convert a file name into a valid identifier.
+-std::string FilenameIdentifier(const std::string& filename);
+std::string FilenameIdentifier(compat::StringView filename);
+ 
+ // return 'required', 'optional', or 'repeated'
+ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label);
+ 
+-
+ // write IntRanges entries for a bunch of sorted values.
+ // returns the number of ranges there are to bsearch.
+-unsigned WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, const std::string &name);
+unsigned WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, compat::StringView name);
+ 
+ struct NameIndex
+ {
+From 75f1c32cc429233a3726358c999009f9ea373b45 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:25:43 -0500
+Subject: [PATCH 05/11] Convert string views to owned strings where necessary
+---
+ protoc-gen-c/c_enum.cc       | 2 +-
+ protoc-gen-c/c_enum_field.cc | 2 +-
+ protoc-gen-c/c_helpers.cc    | 8 ++++----
+ protoc-gen-c/c_helpers.h     | 3 +--
+ 4 files changed, 7 insertions(+), 8 deletions(-)
+diff --git a/protoc-gen-c/c_enum.cc b/protoc-gen-c/c_enum.cc
+index 9212ab82..311e4c86 100644
+--- a/protoc-gen-c/c_enum.cc
+++ b/protoc-gen-c/c_enum.cc
+@@ -152,7 +152,7 @@ void EnumGenerator::GenerateValueInitializer(google::protobuf::io::Printer *prin
+     descriptor_->file()->options().optimize_for() ==
+     google::protobuf::FileOptions_OptimizeMode_CODE_SIZE;
+   vars["enum_value_name"] = vd->name();
+-  vars["c_enum_value_name"] = FullNameToUpper(descriptor_->full_name(), descriptor_->file()) + "__" + vd->name();
+  vars["c_enum_value_name"] = FullNameToUpper(descriptor_->full_name(), descriptor_->file()) + "__" + std::string(vd->name());
+   vars["value"] = SimpleItoa(vd->number());
+   if (optimize_code_size)
+     printer->Print(vars, "  { NULL, NULL, $value$ }, /* CODE_SIZE */\n");
+diff --git a/protoc-gen-c/c_enum_field.cc b/protoc-gen-c/c_enum_field.cc
+index 0926ae59..c3111f50 100644
+--- a/protoc-gen-c/c_enum_field.cc
+++ b/protoc-gen-c/c_enum_field.cc
+@@ -78,7 +78,7 @@ void SetEnumVariables(const google::protobuf::FieldDescriptor* descriptor,
+   (*variables)["type"] = FullNameToC(descriptor->enum_type()->full_name(), descriptor->enum_type()->file());
+   const google::protobuf::EnumValueDescriptor* default_value = descriptor->default_value_enum();
+   (*variables)["default"] = FullNameToUpper(default_value->type()->full_name(), default_value->type()->file())
+-                          + "__" + default_value->name();
+                          + "__" + std::string(default_value->name());
+   (*variables)["deprecated"] = FieldDeprecated(descriptor);
+ }
+ 
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index c759c8c2..1aecef93 100644
+--- a/protoc-gen-c/c_helpers.cc
+++ b/protoc-gen-c/c_helpers.cc
+@@ -178,13 +178,13 @@ std::string ToCamel(compat::StringView name) {
+ std::string OverrideFullName(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+   const ProtobufCFileOptions opt = file->options().GetExtension(pb_c_file);
+   if (!opt.has_c_package())
+-    return full_name;
+    return std::string(full_name);
+ 
+   std::string new_name = opt.c_package();
+   if (file->package().empty())
+     new_name += ".";
+ 
+-  return new_name + full_name.substr(file->package().length());
+  return new_name + std::string(full_name.substr(file->package().length()));
+ }
+ 
+ std::string FullNameToLower(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+@@ -418,10 +418,10 @@ void SplitStringToIteratorUsing(compat::StringView full,
+   while (begin_index != std::string::npos) {
+     end_index = full.find_first_of(delim, begin_index);
+     if (end_index == std::string::npos) {
+-      *result++ = full.substr(begin_index);
+      *result++ = std::string(full.substr(begin_index));
+       return;
+     }
+-    *result++ = full.substr(begin_index, (end_index - begin_index));
+    *result++ = std::string(full.substr(begin_index, (end_index - begin_index)));
+     begin_index = full.find_first_not_of(delim, end_index);
+   }
+ }
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index ccd39ca2..985e4db6 100644
+--- a/protoc-gen-c/c_helpers.h
+++ b/protoc-gen-c/c_helpers.h
+@@ -89,10 +89,9 @@ std::string SimpleDtoa(double f);
+ void SplitStringUsing(compat::StringView str, const char *delim, std::vector<std::string> *out);
+ std::string CEscape(compat::StringView src);
+ inline bool HasSuffixString(compat::StringView str, compat::StringView suffix) { return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; }
+-inline std::string StripSuffixString(compat::StringView str, compat::StringView suffix) { if (HasSuffixString(str, suffix)) { return str.substr(0, str.size() - suffix.size()); } else { return str; } }
+inline std::string StripSuffixString(compat::StringView str, compat::StringView suffix) { if (HasSuffixString(str, suffix)) { return std::string(str.substr(0, str.size() - suffix.size())); } else { return std::string(str); } }
+ char* FastHexToBuffer(int i, char* buffer);
+ 
+-
+ // Get the (unqualified) name that should be used for this field in C code.
+ // The name is coerced to lower-case to emulate proto1 behavior.  People
+ // should be using lowercase-with-underscores style for proto field names
+From 0edca93db369fb84f01cc0d4e3ee4cd6c2ad7f4f Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:39:11 -0500
+Subject: [PATCH 06/11] Convert various uses of `const char *` to
+ `compat::StringView`
+Also replace some uses of arrays manually allocated with new/delete with
+uses of `std::vector`.
+---
+ protoc-gen-c/c_enum.cc    | 35 ++++++++++++++++++-----------------
+ protoc-gen-c/c_helpers.cc |  2 +-
+ protoc-gen-c/c_helpers.h  |  2 +-
+ protoc-gen-c/c_message.cc | 28 ++++++++++++----------------
+ protoc-gen-c/c_service.cc | 19 +++++++++----------
+ 5 files changed, 41 insertions(+), 45 deletions(-)
+diff --git a/protoc-gen-c/c_enum.cc b/protoc-gen-c/c_enum.cc
+index 311e4c86..c7839edd 100644
+--- a/protoc-gen-c/c_enum.cc
+++ b/protoc-gen-c/c_enum.cc
+@@ -142,7 +142,7 @@ struct ValueIndex
+   int value;
+   unsigned index;
+   unsigned final_index;                /* index in uniqified array of values */
+-  const char *name;
+  compat::StringView name;
+ };
+ void EnumGenerator::GenerateValueInitializer(google::protobuf::io::Printer *printer, int index)
+ {
+@@ -176,7 +176,7 @@ static int compare_value_indices_by_name(const void *a, const void *b)
+ {
+   const ValueIndex *vi_a = (const ValueIndex *) a;
+   const ValueIndex *vi_b = (const ValueIndex *) b;
+-  return strcmp (vi_a->name, vi_b->name);
+  return vi_a->name.compare(vi_b->name);
+ }
+ 
+ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printer) {
+@@ -194,18 +194,20 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
+ 
+   // Sort by name and value, dropping duplicate values if they appear later.
+   // TODO: use a c++ paradigm for this!
+-  NameIndex *name_index = new NameIndex[descriptor_->value_count()];
+-  ValueIndex *value_index = new ValueIndex[descriptor_->value_count()];
+-  for (int j = 0; j < descriptor_->value_count(); j++) {
+  std::vector<ValueIndex> value_index;
+  for (unsigned j = 0; j < descriptor_->value_count(); j++) {
+     const google::protobuf::EnumValueDescriptor *vd = descriptor_->value(j);
+-    name_index[j].index = j;
+-    name_index[j].name = vd->name().c_str();
+-    value_index[j].index = j;
+-    value_index[j].value = vd->number();
+-    value_index[j].name = vd->name().c_str();
+    value_index.push_back({
+      .value = vd->number(),
+      .index = j,
+      .final_index = 0,
+      .name = vd->name(),
+    });
+   }
+-  qsort(value_index, descriptor_->value_count(),
+-       sizeof(ValueIndex), compare_value_indices_by_value_then_index);
+  qsort(&value_index[0],
+        value_index.size(),
+        sizeof(ValueIndex),
+        compare_value_indices_by_value_then_index);
+ 
+   // only record unique values
+   int n_unique_values;
+@@ -275,8 +277,10 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
+   vars["n_ranges"] = SimpleItoa(n_ranges);
+ 
+   if (!optimize_code_size) {
+-    qsort(value_index, descriptor_->value_count(),
+-        sizeof(ValueIndex), compare_value_indices_by_name);
+    qsort(&value_index[0],
+          value_index.size(),
+          sizeof(ValueIndex),
+          compare_value_indices_by_name);
+     printer->Print(vars,
+         "static const ProtobufCEnumValueIndex $lcclassname$__enum_values_by_name[$value_count$] =\n"
+         "{\n");
+@@ -319,9 +323,6 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
+         "  NULL,NULL,NULL,NULL   /* reserved[1234] */\n"
+         "};\n");
+   }
+-
+-  delete[] value_index;
+-  delete[] name_index;
+ }
+ 
+ }  // namespace protobuf_c
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index 1aecef93..dec9ce28 100644
+--- a/protoc-gen-c/c_helpers.cc
+++ b/protoc-gen-c/c_helpers.cc
+@@ -261,7 +261,7 @@ int compare_name_indices_by_name(const void *a, const void *b)
+ {
+   const NameIndex *ni_a = (const NameIndex *) a;
+   const NameIndex *ni_b = (const NameIndex *) b;
+-  return strcmp (ni_a->name, ni_b->name);
+  return ni_a->name.compare(ni_b->name);
+ }
+ 
+ std::string CEscape(compat::StringView src);
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index 985e4db6..69369997 100644
+--- a/protoc-gen-c/c_helpers.h
+++ b/protoc-gen-c/c_helpers.h
+@@ -160,7 +160,7 @@ unsigned WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, co
+ struct NameIndex
+ {
+   unsigned index;
+-  const char *name;
+  compat::StringView name;
+ };
+ int compare_name_indices_by_name(const void*, const void*);
+ 
+diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
+index 46413873..7252923c 100644
+--- a/protoc-gen-c/c_message.cc
+++ b/protoc-gen-c/c_message.cc
+@@ -567,27 +567,26 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
+        "static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =\n"
+        "{\n");
+   printer->Indent();
+-  const google::protobuf::FieldDescriptor **sorted_fields = new const google::protobuf::FieldDescriptor *[descriptor_->field_count()];
+
+  std::vector<const google::protobuf::FieldDescriptor*> sorted_fields;
+   for (int i = 0; i < descriptor_->field_count(); i++) {
+-    sorted_fields[i] = descriptor_->field(i);
+    sorted_fields.push_back(descriptor_->field(i));
+   }
+-  qsort (sorted_fields, descriptor_->field_count(),
+  qsort(&sorted_fields[0], sorted_fields.size(),
+        sizeof(const google::protobuf::FieldDescriptor*), 
+        compare_pfields_by_number);
+-  for (int i = 0; i < descriptor_->field_count(); i++) {
+-    const google::protobuf::FieldDescriptor* field = sorted_fields[i];
+  for (auto field : sorted_fields) {
+     field_generators_.get(field).GenerateDescriptorInitializer(printer);
+   }
+   printer->Outdent();
+   printer->Print(vars, "};\n");
+ 
+   if (!optimize_code_size) {
+-    NameIndex *field_indices = new NameIndex [descriptor_->field_count()];
+-    for (int i = 0; i < descriptor_->field_count(); i++) {
+-      field_indices[i].name = sorted_fields[i]->name().c_str();
+-      field_indices[i].index = i;
+    std::vector<NameIndex> field_indices;
+    for (unsigned i = 0; i < descriptor_->field_count(); i++) {
+      field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
+     }
+-    qsort (field_indices, descriptor_->field_count(), sizeof (NameIndex),
+    qsort(&field_indices[0], field_indices.size(), sizeof(NameIndex),
+         compare_name_indices_by_name);
+     printer->Print(vars, "static const unsigned $lcclassname$__field_indices_by_name[] = {\n");
+     for (int i = 0; i < descriptor_->field_count(); i++) {
+@@ -596,19 +595,16 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
+       printer->Print(vars, "  $index$,   /* field[$index$] = $name$ */\n");
+     }
+     printer->Print("};\n");
+-    delete[] field_indices;
+   }
+ 
+   // create range initializers
+-  int *values = new int[descriptor_->field_count()];
+  std::vector<int> values;
+   for (int i = 0; i < descriptor_->field_count(); i++) {
+-    values[i] = sorted_fields[i]->number();
+    values.push_back(sorted_fields[i]->number());
+   }
+   int n_ranges = WriteIntRanges(printer,
+-                               descriptor_->field_count(), values,
+                               descriptor_->field_count(), &values[0],
+                                vars["lcclassname"] + "__number_ranges");
+-  delete [] values;
+-  delete [] sorted_fields;
+ 
+   vars["n_ranges"] = SimpleItoa(n_ranges);
+     } else {
+diff --git a/protoc-gen-c/c_service.cc b/protoc-gen-c/c_service.cc
+index ee4d4a95..2c3ddcf3 100644
+--- a/protoc-gen-c/c_service.cc
+++ b/protoc-gen-c/c_service.cc
+@@ -184,19 +184,19 @@ void ServiceGenerator::GenerateInit(google::protobuf::io::Printer* printer)
+                 "}\n");
+ }
+ 
+-struct MethodIndexAndName { unsigned i; const char *name; };
+struct MethodIndexAndName { unsigned i; compat::StringView name; };
+ static int
+ compare_method_index_and_name_by_name (const void *a, const void *b)
+ {
+   const MethodIndexAndName *ma = (const MethodIndexAndName *) a;
+   const MethodIndexAndName *mb = (const MethodIndexAndName *) b;
+-  return strcmp (ma->name, mb->name);
+  return ma->name.compare(mb->name);
+ }
+ 
+ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer* printer)
+ {
+   int n_methods = descriptor_->method_count();
+-  MethodIndexAndName *mi_array = new MethodIndexAndName[n_methods];
+  std::vector<MethodIndexAndName> mi_array;
+ 
+   bool optimize_code_size = descriptor_->file()->options().has_optimize_for() &&
+     descriptor_->file()->options().optimize_for() ==
+@@ -205,7 +205,7 @@ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer*
+   vars_["n_methods"] = SimpleItoa(n_methods);
+   printer->Print(vars_, "static const ProtobufCMethodDescriptor $lcfullname$__method_descriptors[$n_methods$] =\n"
+                        "{\n");
+-  for (int i = 0; i < n_methods; i++) {
+  for (unsigned i = 0; i < n_methods; i++) {
+     const google::protobuf::MethodDescriptor* method = descriptor_->method(i);
+     vars_["method"] = method->name();
+     vars_["input_descriptor"] = "&" + FullNameToLower(method->input_type()->full_name(), method->input_type()->file()) + "__descriptor";
+@@ -217,14 +217,15 @@ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer*
+       printer->Print(vars_,
+           "  { \"$method$\", $input_descriptor$, $output_descriptor$ },\n");
+     }
+-    mi_array[i].i = i;
+-    mi_array[i].name = method->name().c_str();
+    mi_array.push_back({i, method->name()});
+   }
+   printer->Print(vars_, "};\n");
+ 
+   if (!optimize_code_size) {
+-    qsort ((void*)mi_array, n_methods, sizeof (MethodIndexAndName),
+-        compare_method_index_and_name_by_name);
+    qsort(&mi_array[0],
+          mi_array.size(),
+          sizeof(MethodIndexAndName),
+          compare_method_index_and_name_by_name);
+     printer->Print(vars_, "const unsigned $lcfullname$__method_indices_by_name[] = {\n");
+     for (int i = 0; i < n_methods; i++) {
+       vars_["i"] = SimpleItoa(mi_array[i].i);
+@@ -258,8 +259,6 @@ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer*
+         "  $lcfullname$__method_indices_by_name\n"
+         "};\n");
+   }
+-
+-  delete[] mi_array;
+ }
+ 
+ void ServiceGenerator::GenerateCallersImplementations(google::protobuf::io::Printer* printer)
+From ebeddac1a746393a16d9ba4cf80e3d12c3ab7d7f Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:56:48 -0500
+Subject: [PATCH 07/11] Fix indentation of
+ MessageGenerator::GenerateMessageDescriptor()
+---
+ protoc-gen-c/c_message.cc | 321 +++++++++++++++++++-------------------
+ 1 file changed, 159 insertions(+), 162 deletions(-)
+diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
+index 7252923c..2a3b2a2f 100644
+--- a/protoc-gen-c/c_message.cc
+++ b/protoc-gen-c/c_message.cc
+@@ -461,199 +461,196 @@ GenerateHelperFunctionDefinitions(google::protobuf::io::Printer* printer,
+ 
+ void MessageGenerator::
+ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init) {
+-    std::map<std::string, std::string> vars;
+-    vars["fullname"] = descriptor_->full_name();
+-    vars["classname"] = FullNameToC(descriptor_->full_name(), descriptor_->file());
+-    vars["lcclassname"] = FullNameToLower(descriptor_->full_name(), descriptor_->file());
+-    vars["shortname"] = ToCamel(descriptor_->name());
+-    vars["n_fields"] = SimpleItoa(descriptor_->field_count());
+-    vars["packagename"] = descriptor_->file()->package();
+-
+-    bool optimize_code_size = descriptor_->file()->options().has_optimize_for() &&
+-        descriptor_->file()->options().optimize_for() ==
+-        google::protobuf::FileOptions_OptimizeMode_CODE_SIZE;
+-
+-    const ProtobufCMessageOptions opt =
+-           descriptor_->options().GetExtension(pb_c_msg);
+-    // Override parent settings, if needed
+-    if (opt.has_gen_init_helpers())
+-      gen_init = opt.gen_init_helpers();
+-
+-    for (int i = 0; i < descriptor_->nested_type_count(); i++) {
+-      nested_generators_[i]->GenerateMessageDescriptor(printer, gen_init);
+-    }
+  std::map<std::string, std::string> vars;
+  vars["fullname"] = descriptor_->full_name();
+  vars["classname"] = FullNameToC(descriptor_->full_name(), descriptor_->file());
+  vars["lcclassname"] = FullNameToLower(descriptor_->full_name(), descriptor_->file());
+  vars["shortname"] = ToCamel(descriptor_->name());
+  vars["n_fields"] = SimpleItoa(descriptor_->field_count());
+  vars["packagename"] = descriptor_->file()->package();
+ 
+-    for (int i = 0; i < descriptor_->enum_type_count(); i++) {
+-      enum_generators_[i]->GenerateEnumDescriptor(printer);
+-    }
+  bool optimize_code_size = descriptor_->file()->options().has_optimize_for() &&
+    descriptor_->file()->options().optimize_for() ==
+      google::protobuf::FileOptions_OptimizeMode_CODE_SIZE;
+ 
+-    for (int i = 0; i < descriptor_->field_count(); i++) {
+-      const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
+-      if (fd->has_default_value()) {
+-       field_generators_.get(fd).GenerateDefaultValueImplementations(printer);
+-      }
+-    }
+  const ProtobufCMessageOptions opt = descriptor_->options().GetExtension(pb_c_msg);
+  // Override parent settings, if needed
+  if (opt.has_gen_init_helpers()) {
+    gen_init = opt.gen_init_helpers();
+  }
+ 
+-    for (int i = 0; i < descriptor_->field_count(); i++) {
+-      const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
+-      const ProtobufCFieldOptions opt = fd->options().GetExtension(pb_c_field);
+-      if (fd->has_default_value()) {
+-
+-       bool already_defined = false;
+-       vars["name"] = fd->name();
+-       vars["lcname"] = CamelToLower(fd->name());
+-       vars["maybe_static"] = "static ";
+-       vars["field_dv_ctype_suffix"] = "";
+-       vars["default_value"] = field_generators_.get(fd).GetDefaultValue();
+-       switch (fd->cpp_type()) {
+-       case google::protobuf::FieldDescriptor::CPPTYPE_INT32:
+-         vars["field_dv_ctype"] = "int32_t";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_INT64:
+-         vars["field_dv_ctype"] = "int64_t";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_UINT32:
+-         vars["field_dv_ctype"] = "uint32_t";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_UINT64:
+-         vars["field_dv_ctype"] = "uint64_t";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT:
+-         vars["field_dv_ctype"] = "float";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE:
+-         vars["field_dv_ctype"] = "double";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_BOOL:
+-         vars["field_dv_ctype"] = "protobuf_c_boolean";
+-         break;
+-         
+-       case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
+-         // NOTE: not supported by protobuf
+-         vars["maybe_static"] = "";
+-         vars["field_dv_ctype"] = "{ ... }";
+-         GOOGLE_LOG(FATAL) << "Messages can't have default values!";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_STRING:
+-         if (fd->type() == google::protobuf::FieldDescriptor::TYPE_BYTES || opt.string_as_bytes())
+-         {
+-           vars["field_dv_ctype"] = "ProtobufCBinaryData";
+-         }
+-         else   /* STRING type */
+-         {
+-           already_defined = true;
+-           vars["maybe_static"] = "";
+-           vars["field_dv_ctype"] = "char";
+-           vars["field_dv_ctype_suffix"] = "[]";
+-         }
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_ENUM:
+-         {
+-           const google::protobuf::EnumValueDescriptor* vd = fd->default_value_enum();
+-           vars["field_dv_ctype"] = FullNameToC(vd->type()->full_name(), vd->type()->file());
+-           break;
+-         }
+-       default:
+-         GOOGLE_LOG(FATAL) << "Unknown CPPTYPE";
+-         break;
+-       }
+-       if (!already_defined)
+-         printer->Print(vars, "$maybe_static$const $field_dv_ctype$ $lcclassname$__$lcname$__default_value$field_dv_ctype_suffix$ = $default_value$;\n");
+-      }
+-    }
+  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
+    nested_generators_[i]->GenerateMessageDescriptor(printer, gen_init);
+  }
+ 
+-    if ( descriptor_->field_count() ) {
+-  printer->Print(vars,
+-       "static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =\n"
+-       "{\n");
+-  printer->Indent();
+  for (int i = 0; i < descriptor_->enum_type_count(); i++) {
+    enum_generators_[i]->GenerateEnumDescriptor(printer);
+  }
+ 
+-  std::vector<const google::protobuf::FieldDescriptor*> sorted_fields;
+   for (int i = 0; i < descriptor_->field_count(); i++) {
+-    sorted_fields.push_back(descriptor_->field(i));
+-  }
+-  qsort(&sorted_fields[0], sorted_fields.size(),
+-       sizeof(const google::protobuf::FieldDescriptor*), 
+-       compare_pfields_by_number);
+-  for (auto field : sorted_fields) {
+-    field_generators_.get(field).GenerateDescriptorInitializer(printer);
+    const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
+    if (fd->has_default_value()) {
+      field_generators_.get(fd).GenerateDefaultValueImplementations(printer);
+    }
+   }
+-  printer->Outdent();
+-  printer->Print(vars, "};\n");
+ 
+-  if (!optimize_code_size) {
+-    std::vector<NameIndex> field_indices;
+-    for (unsigned i = 0; i < descriptor_->field_count(); i++) {
+-      field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
+    const ProtobufCFieldOptions opt = fd->options().GetExtension(pb_c_field);
+    if (fd->has_default_value()) {
+      bool already_defined = false;
+      vars["name"] = fd->name();
+      vars["lcname"] = CamelToLower(fd->name());
+      vars["maybe_static"] = "static ";
+      vars["field_dv_ctype_suffix"] = "";
+      vars["default_value"] = field_generators_.get(fd).GetDefaultValue();
+      switch (fd->cpp_type()) {
+      case google::protobuf::FieldDescriptor::CPPTYPE_INT32:
+        vars["field_dv_ctype"] = "int32_t";
+        break;
+      case google::protobuf::FieldDescriptor::CPPTYPE_INT64:
+        vars["field_dv_ctype"] = "int64_t";
+        break;
+      case google::protobuf::FieldDescriptor::CPPTYPE_UINT32:
+        vars["field_dv_ctype"] = "uint32_t";
+        break;
+      case google::protobuf::FieldDescriptor::CPPTYPE_UINT64:
+        vars["field_dv_ctype"] = "uint64_t";
+        break;
+      case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT:
+        vars["field_dv_ctype"] = "float";
+        break;
+      case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE:
+        vars["field_dv_ctype"] = "double";
+        break;
+      case google::protobuf::FieldDescriptor::CPPTYPE_BOOL:
+        vars["field_dv_ctype"] = "protobuf_c_boolean";
+        break;
+      case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
+        // NOTE: not supported by protobuf
+        vars["maybe_static"] = "";
+        vars["field_dv_ctype"] = "{ ... }";
+        GOOGLE_LOG(FATAL) << "Messages can't have default values!";
+        break;
+      case google::protobuf::FieldDescriptor::CPPTYPE_STRING:
+        if (fd->type() == google::protobuf::FieldDescriptor::TYPE_BYTES || opt.string_as_bytes()) {
+          vars["field_dv_ctype"] = "ProtobufCBinaryData";
+        } else {
+          /* STRING type */
+          already_defined = true;
+          vars["maybe_static"] = "";
+          vars["field_dv_ctype"] = "char";
+          vars["field_dv_ctype_suffix"] = "[]";
+        }
+        break;
+      case google::protobuf::FieldDescriptor::CPPTYPE_ENUM: {
+        const google::protobuf::EnumValueDescriptor* vd = fd->default_value_enum();
+        vars["field_dv_ctype"] = FullNameToC(vd->type()->full_name(), vd->type()->file());
+        break;
+      }
+      default:
+        GOOGLE_LOG(FATAL) << "Unknown CPPTYPE";
+        break;
+      }
+      if (!already_defined) {
+        printer->Print(vars, "$maybe_static$const $field_dv_ctype$ $lcclassname$__$lcname$__default_value$field_dv_ctype_suffix$ = $default_value$;\n");
+      }
+     }
+-    qsort(&field_indices[0], field_indices.size(), sizeof(NameIndex),
+-        compare_name_indices_by_name);
+-    printer->Print(vars, "static const unsigned $lcclassname$__field_indices_by_name[] = {\n");
+  }
+
+  if (descriptor_->field_count()) {
+    printer->Print(vars,
+      "static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =\n"
+      "{\n");
+    printer->Indent();
+
+    std::vector<const google::protobuf::FieldDescriptor*> sorted_fields;
+     for (int i = 0; i < descriptor_->field_count(); i++) {
+-      vars["index"] = SimpleItoa(field_indices[i].index);
+-      vars["name"] = field_indices[i].name;
+-      printer->Print(vars, "  $index$,   /* field[$index$] = $name$ */\n");
+      sorted_fields.push_back(descriptor_->field(i));
+     }
+-    printer->Print("};\n");
+-  }
+    qsort(&sorted_fields[0],
+          sorted_fields.size(),
+          sizeof(const google::protobuf::FieldDescriptor*),
+          compare_pfields_by_number);
+    for (auto field : sorted_fields) {
+      field_generators_.get(field).GenerateDescriptorInitializer(printer);
+    }
+    printer->Outdent();
+    printer->Print(vars, "};\n");
+ 
+-  // create range initializers
+-  std::vector<int> values;
+-  for (int i = 0; i < descriptor_->field_count(); i++) {
+-    values.push_back(sorted_fields[i]->number());
+-  }
+-  int n_ranges = WriteIntRanges(printer,
+-                               descriptor_->field_count(), &values[0],
+-                               vars["lcclassname"] + "__number_ranges");
+    if (!optimize_code_size) {
+      std::vector<NameIndex> field_indices;
+      for (unsigned i = 0; i < descriptor_->field_count(); i++) {
+        field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
+      }
+      qsort(&field_indices[0],
+            field_indices.size(),
+            sizeof(NameIndex),
+            compare_name_indices_by_name);
+      printer->Print(vars, "static const unsigned $lcclassname$__field_indices_by_name[] = {\n");
+      for (int i = 0; i < descriptor_->field_count(); i++) {
+        vars["index"] = SimpleItoa(field_indices[i].index);
+        vars["name"] = field_indices[i].name;
+        printer->Print(vars, "  $index$,   /* field[$index$] = $name$ */\n");
+      }
+      printer->Print("};\n");
+    }
+ 
+-  vars["n_ranges"] = SimpleItoa(n_ranges);
+-    } else {
+-      /* MS compiler can't handle arrays with zero size and empty
+-       * initialization list. Furthermore it is an extension of GCC only but
+-       * not a standard. */
+-      vars["n_ranges"] = "0";
+-  printer->Print(vars,
+-        "#define $lcclassname$__field_descriptors NULL\n"
+-        "#define $lcclassname$__field_indices_by_name NULL\n"
+-        "#define $lcclassname$__number_ranges NULL\n");
+    // create range initializers
+    std::vector<int> values;
+    for (int i = 0; i < descriptor_->field_count(); i++) {
+      values.push_back(sorted_fields[i]->number());
+     }
+    int n_ranges = WriteIntRanges(printer,
+                                  descriptor_->field_count(),
+                                  &values[0],
+                                  vars["lcclassname"] + "__number_ranges");
+
+    vars["n_ranges"] = SimpleItoa(n_ranges);
+  } else {
+    /* MS compiler can't handle arrays with zero size and empty
+     * initialization list. Furthermore it is an extension of GCC only but
+     * not a standard. */
+    vars["n_ranges"] = "0";
+    printer->Print(vars,
+      "#define $lcclassname$__field_descriptors NULL\n"
+      "#define $lcclassname$__field_indices_by_name NULL\n"
+      "#define $lcclassname$__number_ranges NULL\n");
+  }
+ 
+   printer->Print(vars,
+-      "const ProtobufCMessageDescriptor $lcclassname$__descriptor =\n"
+-      "{\n"
+-      "  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,\n");
+    "const ProtobufCMessageDescriptor $lcclassname$__descriptor =\n"
+    "{\n"
+    "  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,\n");
+   if (optimize_code_size) {
+     printer->Print("  NULL,NULL,NULL,NULL, /* CODE_SIZE */\n");
+   } else {
+     printer->Print(vars,
+-        "  \"$fullname$\",\n"
+-        "  \"$shortname$\",\n"
+-        "  \"$classname$\",\n"
+-        "  \"$packagename$\",\n");
+      "  \"$fullname$\",\n"
+      "  \"$shortname$\",\n"
+      "  \"$classname$\",\n"
+      "  \"$packagename$\",\n");
+   }
+   printer->Print(vars,
+-      "  sizeof($classname$),\n"
+-      "  $n_fields$,\n"
+-      "  $lcclassname$__field_descriptors,\n");
+    "  sizeof($classname$),\n"
+    "  $n_fields$,\n"
+    "  $lcclassname$__field_descriptors,\n");
+   if (optimize_code_size) {
+     printer->Print("  NULL, /* CODE_SIZE */\n");
+   } else {
+-    printer->Print(vars,
+-        "  $lcclassname$__field_indices_by_name,\n");
+    printer->Print(vars, "  $lcclassname$__field_indices_by_name,\n");
+   }
+   printer->Print(vars,
+-      "  $n_ranges$,"
+-      "  $lcclassname$__number_ranges,\n");
+    "  $n_ranges$,"
+    "  $lcclassname$__number_ranges,\n");
+   if (gen_init) {
+-    printer->Print(vars,
+-      "  (ProtobufCMessageInit) $lcclassname$__init,\n");
+    printer->Print(vars, "  (ProtobufCMessageInit) $lcclassname$__init,\n");
+   } else {
+-    printer->Print(vars,
+-      "  NULL, /* gen_init_helpers = false */\n");
+    printer->Print(vars, "  NULL, /* gen_init_helpers = false */\n");
+   }
+   printer->Print(vars,
+-      "  NULL,NULL,NULL    /* reserved[123] */\n"
+-      "};\n");
+    "  NULL,NULL,NULL    /* reserved[123] */\n"
+    "};\n");
+ }
+ 
+ int MessageGenerator::GetOneofUnionOrder(const google::protobuf::FieldDescriptor* fd)
+From c59b146aee2d97091ca2adeecd3f2741cb7f0082 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 21:10:37 -0500
+Subject: [PATCH 08/11] compat: Use absl::string_view instead of
+ google::protobuf::internal::DescriptorStringView
+Even though google::protobuf::internal::DescriptorStringView is exposed
+in public protobuf headers, it's probably not a good idea to rely on an
+"internal" typedef.
+According to https://protobuf.dev/news/2024-10-02/#descriptor-apis:
+    v30 will update return types in descriptor (such as full_name) to be
+    absl::string_view.
+So `absl::string_view` is probably the right type to use here.
+---
+ protoc-gen-c/compat.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
+index fe8041b5..a70cef34 100644
+--- a/protoc-gen-c/compat.h
+++ b/protoc-gen-c/compat.h
+@@ -37,12 +37,16 @@
+ # define GOOGLE_LOG            ABSL_LOG
+ #endif
+ 
+#if GOOGLE_PROTOBUF_VERSION >= 6030000
+# include <absl/strings/string_view.h>
+#endif
+
+ namespace protobuf_c {
+ 
+ namespace compat {
+ 
+ #if GOOGLE_PROTOBUF_VERSION >= 6030000
+-typedef google::protobuf::internal::DescriptorStringView StringView;
+typedef absl::string_view StringView;
+ #else
+ typedef const std::string& StringView;
+ #endif
+From 9c56038fd9d3cc2552c297457d7a66efe5cbd2c7 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 21:37:30 -0500
+Subject: [PATCH 09/11] Makefile.am: Add compat.h to
+ protoc_gen_c_protoc_gen_c_SOURCES
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/Makefile.am b/Makefile.am
+index 77aa9d99..26d19f16 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -102,6 +102,7 @@ protoc_gen_c_protoc_gen_c_SOURCES = \
+        protoc-gen-c/c_service.h \
+        protoc-gen-c/c_string_field.cc \
+        protoc-gen-c/c_string_field.h \
+       protoc-gen-c/compat.h \
+        protobuf-c/protobuf-c.pb.cc \
+        protobuf-c/protobuf-c.pb.h \
+        protoc-gen-c/main.cc
+From 4ebd5cd8238d1f2ac6291b8c8925f34e16ce2123 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 21:38:07 -0500
+Subject: [PATCH 10/11] compat: Conditionalize the include of <string>
+It is only needed on older protobuf versions where absl::string_view is
+not being used.
+---
+ protoc-gen-c/compat.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
+index a70cef34..f6ace7cb 100644
+--- a/protoc-gen-c/compat.h
+++ b/protoc-gen-c/compat.h
+@@ -28,8 +28,6 @@
+ #ifndef PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+ #define PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+ 
+-#include <string>
+-
+ #if GOOGLE_PROTOBUF_VERSION >= 4022000
+ # define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
+ # define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
+@@ -39,6 +37,8 @@
+ 
+ #if GOOGLE_PROTOBUF_VERSION >= 6030000
+ # include <absl/strings/string_view.h>
+#else
+# include <string>
+ #endif
+ 
+ namespace protobuf_c {
+From 9a6b35e1e6956fb5cb044910448049b7a5339244 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 21:44:42 -0500
+Subject: [PATCH 11/11] Cater to Microsoft Visual C++
+Apparently MSVC doesn't support designated initializers for some reason.
+---
+ protoc-gen-c/c_enum.cc    | 9 ++-------
+ protoc-gen-c/c_message.cc | 2 +-
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+diff --git a/protoc-gen-c/c_enum.cc b/protoc-gen-c/c_enum.cc
+index c7839edd..1940ba9d 100644
+--- a/protoc-gen-c/c_enum.cc
+++ b/protoc-gen-c/c_enum.cc
+@@ -195,14 +195,9 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
+   // Sort by name and value, dropping duplicate values if they appear later.
+   // TODO: use a c++ paradigm for this!
+   std::vector<ValueIndex> value_index;
+-  for (unsigned j = 0; j < descriptor_->value_count(); j++) {
+  for (int j = 0; j < descriptor_->value_count(); j++) {
+     const google::protobuf::EnumValueDescriptor *vd = descriptor_->value(j);
+-    value_index.push_back({
+-      .value = vd->number(),
+-      .index = j,
+-      .final_index = 0,
+-      .name = vd->name(),
+-    });
+    value_index.push_back({ vd->number(), (unsigned)j, 0, vd->name() });
+   }
+   qsort(&value_index[0],
+         value_index.size(),
+diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
+index 2a3b2a2f..94889179 100644
+--- a/protoc-gen-c/c_message.cc
+++ b/protoc-gen-c/c_message.cc
+@@ -581,7 +581,7 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
+     if (!optimize_code_size) {
+       std::vector<NameIndex> field_indices;
+       for (unsigned i = 0; i < descriptor_->field_count(); i++) {
+-        field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
+        field_indices.push_back({ i, sorted_fields[i]->name() });
+       }
+       qsort(&field_indices[0],
+             field_indices.size(),
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb
index 24de6b8119..30c9e19b16 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb
@@ -8,16 +8,17 @@ has been split out into the protobuf-c-rpc project."
 HOMEPAGE = "https://github.com/protobuf-c/protobuf-c"
 SECTION = "console/tools"
 LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d11077c6a2b5d2e64b9f32b61a9b78ba"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bd8de4f63e06b1ccc06e9f8dc5b1aa97"
 DEPENDS = "protobuf-native protobuf"
-SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https \
+           file://protobuf-30.patch \
+"
 SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch"
-SRCREV = "8c201f6e47a53feaab773922a743091eb6c8972a"
+SRCREV = "185beed28e65494be7505b30c1afeaf199e19b23"
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig
@@ -36,3 +37,6 @@ RDEPENDS:${PN}-compiler = "protobuf-compiler"
 RDEPENDS:${PN}-dev += "${PN}-compiler"
 BBCLASSEXTEND = "native nativesdk"
+# No 64bit atomics
+LDFLAGS:append:riscv32 = " -latomic"
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
index 9f6116c4c4..1f5c9127de 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
+++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
@@ -1,26 +1,34 @@
-From 08e46feb6553af670754e65d94c3bb6fcd4e0cf9 Mon Sep 17 00:00:00 2001
+From cd6c5f36c0dc38e4734b74b03923489b7bfb9aba Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 31 Oct 2021 23:39:44 -0700
+Date: Mon, 10 Mar 2025 19:59:19 -0700
 Subject: [PATCH] Fix build on mips/clang
-clang13 crashes on mips, until its fixed upstream disable tailcall on
+clang20 crashes on mips, until its fixed upstream disable tailcall on
 mips
-https://bugs.llvm.org/show_bug.cgi?id=52367
+https://github.com/llvm/llvm-project/issues/51709
 Upstream-Status: Inappropriate [Clang workaround]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Rebase to v5.29.4
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- src/google/protobuf/port_def.inc | 2 +-
+ src/google/protobuf/port_def.inc | 1 +
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+)
+diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
+index 56f995e45..428d096b3 100644
 --- a/src/google/protobuf/port_def.inc
 +++ b/src/google/protobuf/port_def.inc
-@@ -255,6 +255,7 @@
+@@ -227,6 +227,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #error PROTOBUF_TAILCALL was previously defined
 #endif
- #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \
+ #if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) &&  \
 +    !defined(__mips__) && \
-     !defined(_ARCH_PPC) && !defined(__wasm__) &&                 \
+     !defined(_ARCH_PPC) && !defined(__wasm__) &&                      \
-     !(defined(_MSC_VER) && defined(_M_IX86)) &&                  \
+     !(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__)
-     !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24)
+ // Compilation fails on ARM32: b/195943306
+-- 
+2.25.1
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
index 7c4bf260eb..53fdf7dece 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
+++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
@@ -1,13 +1,12 @@
-From e3fa241637ab5a7fa78c0d474802134cff75f91e Mon Sep 17 00:00:00 2001
+From f6a3554e37fb39f93e4b47a75318bbda53cfdb46 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 28 Jun 2019 13:50:52 +0000
+Date: Thu, 20 Mar 2025 20:33:02 -0700
-Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build
+Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables
- with gold
 * move pkg-config call to separate variable, so that the final version
  of the whole command so it's shown in log.do_compile_ptest_base
 * add ../src/google/protobuf/.libs/timestamp.pb.o when linking
-  add_person_cpp otherwise it fails to link with gold:
+  add_person_cpp otherwise it fails:
  i686-oe-linux-g++  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=core2-32-oe-linux/protobuf/3.8.0-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
  /tmp/cccjSJQs.o:addressbook.pb.cc:scc_info_Person_addressbook_2eproto: error: undefined reference to 'scc_info_Timestamp_google_2fprotobuf_2ftimestamp_2eproto'
  /tmp/cccjSJQs.o:addressbook.pb.cc:descriptor_table_addressbook_2eproto_deps: error: undefined reference to 'descriptor_table_google_2fprotobuf_2ftimestamp_2eproto'
@@ -25,37 +24,39 @@ Upstream-Status: Pending
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+Rebase to 5.29.4
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
 examples/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 diff --git a/examples/Makefile b/examples/Makefile
-index ef7a4ef58..7206e14e1 100644
+index f7ee9b116..8cd1359e2 100644
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -2,6 +2,8 @@
+@@ -4,6 +4,8 @@
 
- .PHONY: all cpp java python clean
+ all: cpp java python
 
 +PROTOBUF := $(shell pkg-config --cflags --libs protobuf)
 +
- all: cpp java python
- 
 cpp:    add_person_cpp    list_people_cpp
-@@ -41,11 +43,11 @@ protoc_middleman_dart: addressbook.proto
+ dart:   add_person_dart   list_people_dart
+ go:     add_person_go     list_people_go
+@@ -46,11 +48,11 @@ protoc_middleman_ruby: addressbook.proto
 
 add_person_cpp: add_person.cc protoc_middleman
        pkg-config --cflags protobuf  # fails if protobuf is not installed
-       c++ -std=c++14 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
+-       c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
-+       $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp #$(CXX) -std=c++17 $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
 
 list_people_cpp: list_people.cc protoc_middleman
        pkg-config --cflags protobuf  # fails if protobuf is not installed
-       c++ -std=c++14 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
+-       c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
-+       $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp #$(CXX) -std=c++17 $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
 
 add_person_dart: add_person.dart protoc_middleman_dart
 
--
+-- 
-2.34.1
+2.25.1
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-protobuf-native-build-failure-with-gcc-10.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-protobuf-native-build-failure-with-gcc-10.patch
new file mode 100644
index 0000000000..2edba6b7eb
--- /dev/null
+++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-protobuf-native-build-failure-with-gcc-10.patch
@@ -0,0 +1,46 @@
+From 213f29fb63473304db098b3d12a0393fd50e4914 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 17 Mar 2025 13:28:13 +0800
+Subject: [PATCH] fix protobuf-native build failure with gcc 10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Build protobuf-native failed on ubuntu 20.04 which has gcc 10
+protobuf-native/4.30.0/git/src/google/protobuf/port_def.inc:105:48:
+error: static assertion failed: Protobuf only supports C+
+   ↪ +17 and newer.
+   |   105 | #define PROTOBUF_CPLUSPLUS_MIN(x) (__cplusplus >= x)
+   |       |                                   ~~~~~~~~~~~~~^~~~~
+   | /home/kraj01/yoe/build/tmp/work/x86_64-linux/protobuf-native/4.30.0/git/src/google/protobuf/port_def.inc:119:15:
+note: in expansion of macro ‘PROTOBUF_CPLUSPLUS_MIN’
+   |   119 | static_assert(PROTOBUF_CPLUSPLUS_MIN(201703L),
+   |       |               ^~~~~~~~~~~~~~~~~~~~~~
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e90cb8aa2..3ffac1307 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -14,6 +14,10 @@ endif()
+ # Project
+ project(protobuf C CXX)
+ 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+ if(protobuf_DEPRECATED_CMAKE_SUBDIRECTORY_USAGE)
+   if(CMAKE_PROJECT_NAME STREQUAL "protobuf")
+     get_filename_component(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
+-- 
+2.25.1
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch
new file mode 100644
index 0000000000..e58fdc1d19
--- /dev/null
+++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch
@@ -0,0 +1,43 @@
+From fd020ef700dbf2d324aecd087b8fcb6ff329feb6 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Thu, 21 Nov 2024 11:30:17 -0800
+Subject: [PATCH] utf8_range: add version marker to library (#19009)
+Unversioned libraries / libraries without due ABI indicators are not allowed in certain Linux distributions because it precludes the concurrent presence of multiple versions.
+If you have both /usr/lib/libprotobuf-lite.so.28.3.0 and /usr/lib/libprotobuf-lite.so.29.0.0, both of them want libutf8_validity.so, but if the ABI is different between utf8_range 28 and utf8_range 29, that's a problem.
+Closes #19009
+COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/19009 from jengelh:master 1a5f8682be2f2b84da07fcdd32474baae8088959
+PiperOrigin-RevId: 698855702
+Upstream-Status: Backport [https://github.com/protocolbuffers/protobuf/commit/ced605d0e6a7ad20985375b596b2ca6720e07737]
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ third_party/utf8_range/CMakeLists.txt | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+diff --git a/third_party/utf8_range/CMakeLists.txt b/third_party/utf8_range/CMakeLists.txt
+index 4276b97290..e054893c63 100644
+--- a/third_party/utf8_range/CMakeLists.txt
+++ b/third_party/utf8_range/CMakeLists.txt
+@@ -19,6 +19,15 @@ add_library (utf8_range
+ # A heavier-weight C++ wrapper that supports Abseil.
+ add_library (utf8_validity utf8_validity.cc utf8_range.c)
+ 
+set_target_properties(utf8_range PROPERTIES
+  VERSION ${protobuf_VERSION}
+  OUTPUT_NAME ${LIB_PREFIX}utf8_range
+)
+set_target_properties(utf8_validity PROPERTIES
+  VERSION ${protobuf_VERSION}
+  OUTPUT_NAME ${LIB_PREFIX}utf8_validity
+)
+
+ # Load Abseil dependency.
+ if (NOT TARGET absl::strings)
+   if (NOT ABSL_ROOT_DIR)
+-- 
+2.34.1
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf_6.31.1.bb
index 3241345963..90be1179aa 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_6.31.1.bb
@@ -4,22 +4,28 @@ efficient yet extensible format. Google uses Protocol Buffers for almost \
 all of its internal RPC protocols and file formats."
 HOMEPAGE = "https://github.com/google/protobuf"
 SECTION = "console/tools"
-LICENSE = "BSD-3-Clause"
+LICENSE = "BSD-3-Clause & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
+    file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \
+"
-DEPENDS = "zlib abseil-cpp"
+DEPENDS = "zlib abseil-cpp jsoncpp"
 DEPENDS:append:class-target = " protobuf-native"
-SRCREV = "4a2aef570deb2bfb8927426558701e8bfc26f2a4"
+SRCREV = "74211c0dfc2777318ab53c2cd2c317a2ef9012de"
-SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol=https \
+SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=31.x;protocol=https \
           file://run-ptest \
           file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \
+           file://0001-fix-protobuf-native-build-failure-with-gcc-10.patch \
           "
-SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch "
+SRC_URI:append:mipsarcho32:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch "
-SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch "
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.(25\.(\d+)))"
-S = "${WORKDIR}/git"
+CVE_PRODUCT = "google:protobuf protobuf:protobuf google-protobuf protobuf-cpp"
 inherit cmake pkgconfig ptest
@@ -35,11 +41,15 @@ EXTRA_OECMAKE += "\
    -Dprotobuf_BUILD_TESTS=OFF \
    -Dprotobuf_BUILD_EXAMPLES=OFF \
    -Dprotobuf_ABSL_PROVIDER="package" \
+    -Dprotobuf_JSONCPP_PROVIDER="package" \
 "
 TEST_SRC_DIR = "examples"
 LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}"
+CXXFLAGS:append:mipsarcho32 = " -latomic"
+CXXFLAGS:append:riscv32 = " -latomic"
 do_compile_ptest() {
        mkdir -p "${B}/${TEST_SRC_DIR}"
@@ -105,14 +115,9 @@ FILES:${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}"
 SYSROOT_DIRS += "${bindir}"
 RDEPENDS:${PN}-compiler = "${PN}"
-RDEPENDS:${PN}-dev += "${PN}-compiler"
+RDEPENDS:${PN}-dev += "${@bb.utils.contains('PACKAGECONFIG', 'compiler', '${PN}-compiler', '', d)}"
 RDEPENDS:${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-protobuf', '', d)}"
 MIPS_INSTRUCTION_SET = "mips"
 BBCLASSEXTEND = "native nativesdk"
-LDFLAGS:append:arm = " -latomic"
-LDFLAGS:append:mips = " -latomic"
-LDFLAGS:append:powerpc = " -latomic"
-LDFLAGS:append:mipsel = " -latomic"
diff --git a/meta-oe/recipes-devtools/pstack/files/0001-tests-fix-the-issue-of-cross-compilation-failure.patch b/meta-oe/recipes-devtools/pstack/files/0001-tests-fix-the-issue-of-cross-compilation-failure.patch
new file mode 100644
index 0000000000..2b54750e7a
--- /dev/null
+++ b/meta-oe/recipes-devtools/pstack/files/0001-tests-fix-the-issue-of-cross-compilation-failure.patch
@@ -0,0 +1,28 @@
+From a8c3996d3f8d9b8f3a2888b7062c1139263c5aba Mon Sep 17 00:00:00 2001
+From: Wen Yang <yellowriver2010@hotmail.com>
+Date: Mon, 23 Jun 2025 02:06:53 +0800
+Subject: [PATCH] tests: fix the issue of cross compilation failure
+By replacing objcopy with MAKE_OBJCOPY, pstack could support both
+native and cross compilation.
+Upstream-Status: Backport [https://github.com/peadar/pstack/pull/38]
+---
+ tests/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 71a62a7..bf11a04 100644
+--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
+@@ -38,7 +38,7 @@ SET_TARGET_PROPERTIES(noreturn PROPERTIES COMPILE_FLAGS "-O2 -g")
+ add_custom_command(
+    OUTPUT basic-no-unwind-gen
+-   COMMAND objcopy --strip-debug --remove-section .eh_frame basic basic-no-unwind
+   COMMAND ${CMAKE_OBJCOPY} --strip-debug --remove-section .eh_frame basic basic-no-unwind
+    VERBATIM )
+ add_custom_target(basic-no-unwind ALL DEPENDS basic basic-no-unwind-gen)
+--
+2.25.1
diff --git a/meta-oe/recipes-devtools/pstack/pstack.inc b/meta-oe/recipes-devtools/pstack/pstack.inc
new file mode 100644
index 0000000000..ee0518c9cc
--- /dev/null
+++ b/meta-oe/recipes-devtools/pstack/pstack.inc
@@ -0,0 +1,43 @@
+SUMMARY = "A utility to print stack traces of running processes"
+DESCRIPTION = "A from-scratch implementation of pstack using DWARF debugging and unwind information. \
+Works for C/C++, Go, Rust, and Python. A traditional pstack command can generally print a backtrace \
+of each thread in a running program, and sometimes from a core file. This version of pstack uses its \
+own self contained ELF and DWARF parsing library, libdwelf to parse the DWARF debug and unwind \
+information, to get a stack trace."
+HOMEPAGE = "https://github.com/peadar/pstack"
+SECTION = "devel"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=671019a96ba80415b696240ed2ca5e80"
+inherit cmake
+DEPENDS += "zlib xz libunwind elfutils"
+RDEPENDS:${PN} += "elfutils"
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${B}/pstack ${D}${bindir}/pstack
+    install -d ${D}${libdir}
+    install -m 0755 ${B}/libprocman.so.${PV} ${D}${libdir}/libprocman.so.${PV}
+    ln -sf libprocman.so.${PV} ${D}${libdir}/libprocman.so
+    install -m 0755 ${B}/libdwelf.so.${PV}  ${D}${libdir}/libdwelf.so.${PV}
+    ln -sf libdwelf.so.${PV}  ${D}${libdir}/libdwelf.so
+}
+PACKAGES = "${PN}"
+FILES:${PN} = "${bindir}/pstack"
+FILES:${PN} += "${libdir}/libprocman.so.${PV}"
+FILES:${PN} += "${libdir}/libdwelf.so.${PV}"
+PACKAGES += "${PN}-dbg"
+FILES:${PN}-dbg += "${base_bindir}/.debug ${base_sbindir}/.debug ${bindir}/.debug ${sbindir}/.debug"
+PACKAGES += "${PN}-dev"
+FILES:${PN}-dev += "${base_libdir}/*.so"
+TOOLCHAIN = "gcc"
+COMPATIBLE_HOST:riscv64 = "null"
+COMPATIBLE_HOST:riscv32 = "null"
diff --git a/meta-oe/recipes-devtools/pstack/pstack_2.10.bb b/meta-oe/recipes-devtools/pstack/pstack_2.10.bb
new file mode 100644
index 0000000000..bed49b62ba
--- /dev/null
+++ b/meta-oe/recipes-devtools/pstack/pstack_2.10.bb
@@ -0,0 +1,31 @@
+SUMMARY = "A from-scratch implementation of pstack using DWARF debugging \
+and unwind information. Works for C/C++, Go, Rust, and Python."
+HOMEPAGE = "https://github.com/peadar/pstack"
+SECTION = "devel/pstack"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=671019a96ba80415b696240ed2ca5e80"
+DEPENDS = "tcl virtual/libx11 libxt zip-native"
+SRC_URI = "git://github.com/peadar/pstack;branch=master;tag=v${PV};protocol=https"
+SRCREV = "a310df637d74917a1d3570c540bf3aef899d7e63"
+PACKAGES =+ "${PN}-lib"
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
+# isn't getting picked up by shlibs code
+RDEPENDS:${PN} += "tk-lib"
+RDEPENDS:${PN}:class-native = ""
+BBCLASSEXTEND = "native nativesdk"
+inherit binconfig
+SYSROOT_DIRS += "${bindir_crossscripts}"
+# Fix some paths that might be used by Tcl extensions
+BINCONFIG_GLOB = "*Config.sh"
diff --git a/meta-oe/recipes-devtools/pstack/pstack_git.bb b/meta-oe/recipes-devtools/pstack/pstack_git.bb
new file mode 100644
index 0000000000..cc6721f9e3
--- /dev/null
+++ b/meta-oe/recipes-devtools/pstack/pstack_git.bb
@@ -0,0 +1,8 @@
+require pstack.inc
+SRCREV = "1e1734be3adb6d9c81b57c5cc3d0c8fbc43bdee3"
+PV = "2.11"
+SRC_URI = "git://github.com/peadar/pstack.git;branch=master;protocol=https \
+           file://0001-tests-fix-the-issue-of-cross-compilation-failure.patch \
+          "
diff --git a/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb b/meta-oe/recipes-devtools/pugixml/pugixml_1.15.bb
index 458958edf5..457fa59435 100644
--- a/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb
+++ b/meta-oe/recipes-devtools/pugixml/pugixml_1.15.bb
@@ -7,12 +7,13 @@ data-driven tree queries."
 HOMEPAGE = "https://pugixml.org/"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=ad370df61d83846cf9e4726244671201"
+LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=5dbb98bbc2e5051c26ce32508b4f703e"
 SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015"
+SRC_URI[sha256sum] = "655ade57fa703fb421c2eb9a0113b5064bddb145d415dd1f88c79353d90d511a"
 UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
 inherit cmake
diff --git a/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb b/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb
index 1d54b9f6af..d5c440f413 100644
--- a/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb
+++ b/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb
@@ -7,7 +7,6 @@ SRC_URI = "git://salsa.debian.org/apt-team/python-apt.git;protocol=https;branch=
 SRCREV = "3252935b6224b3bd2e2250894b9559b47c61b2e1"
-S = "${WORKDIR}/git"
 inherit setuptools3
diff --git a/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb b/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb
index a98dfab6d9..d80eac7756 100644
--- a/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb
+++ b/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb
@@ -10,6 +10,6 @@ SRC_URI[sha256sum] = "723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae
 inherit setuptools3
-S = "${WORKDIR}/python-distutils-extra-${PV}"
+S = "${UNPACKDIR}/python-distutils-extra-${PV}"
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/python/python3-psycopg_3.2.9.bb b/meta-oe/recipes-devtools/python/python3-psycopg_3.2.9.bb
new file mode 100644
index 0000000000..9be72bc4fd
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python3-psycopg_3.2.9.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Psycopg 3 is the implementation of a PostgreSQL adapter for Python."
+DESCRIPTION = "Psycopg is the most popular PostgreSQL adapter for the Python \
+programming language. Its core is a complete implementation of the Python DB \
+API 2.0 specifications. Several extensions allow access to many of the \
+features offered by PostgreSQL."
+LICENSE = "LGPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404"
+SRC_URI[sha256sum] = "2fbb46fcd17bc81f993f28c47f1ebea38d66ae97cc2dbc3cad73b37cefbff700"
+inherit pypi python_setuptools_build_meta
+RDEPENDS:${PN} = "libpq"
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
index 8519479c4d..724d329ee2 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
@@ -10,7 +10,6 @@ SRCREV = "0ccdbf364c577803e2a751f5aededce935314313"
 PV = "1.1.0+git"
-S = "${WORKDIR}/git"
 inherit cmake
diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
index 29abfe1af5..672c46055d 100644
--- a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
+++ b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
@@ -9,7 +9,6 @@ SRC_URI = " \
 SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872"
-S = "${WORKDIR}/git"
 inherit autotools
diff --git a/meta-oe/recipes-devtools/sexpect/sexpect_2.3.15.bb b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.15.bb
new file mode 100644
index 0000000000..72ccd1d6b7
--- /dev/null
+++ b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.15.bb
@@ -0,0 +1,11 @@
+SUMMARY = "sexpect is another implementation of Expect which is specifically designed for Shell scripts"
+HOMEPAGE = "https://github.com/clarkwang/sexpect"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
+BRANCH = "master"
+SRC_URI = "git://github.com/clarkwang/sexpect;branch=${BRANCH};protocol=https;tag=v${PV}"
+SRCREV = "d3645392424d47532be90fcbc0abf3148324785b"
+inherit cmake
diff --git a/meta-oe/recipes-devtools/sip/sip_6.8.3.bb b/meta-oe/recipes-devtools/sip/sip_6.12.0.bb
index d12130af43..20e705f1a6 100644
--- a/meta-oe/recipes-devtools/sip/sip_6.8.3.bb
+++ b/meta-oe/recipes-devtools/sip/sip_6.12.0.bb
@@ -3,15 +3,17 @@
 SUMMARY = "A Python bindings generator for C/C++ libraries"
-HOMEPAGE = "https://www.riverbankcomputing.com/software/sip/"
+HOMEPAGE = "https://github.com/Python-SIP/sip"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "BSD-2-Clause"
 SECTION = "devel"
-LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=236276327275fdb261636fb40b18d88d"
-inherit pypi setuptools3 python3native
+inherit pypi python_setuptools_build_meta python3native
 PYPI_PACKAGE = "sip"
-SRC_URI[sha256sum] = "888547b018bb24c36aded519e93d3e513d4c6aa0ba55b7cc1affbd45cf10762c"
+SRC_URI[sha256sum] = "083ced94f85315493231119a63970b2ba42b1d38b38e730a70e02a99191a89c6"
+DEPENDS += "python3-setuptools-scm-native"
 RDEPENDS:${PN} = " \
    python3-core \
diff --git a/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb b/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb
index bf5c52fe50..ea4fc5d3dd 100644
--- a/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb
+++ b/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb
@@ -9,7 +9,6 @@ DEPENDS = "ncurses"
 SRC_URI = "git://github.com/ColinIanKing/smemstat.git;protocol=https;branch=master"
 SRCREV = "1edc560602aa116b96408110b8b9d66a4edef60e"
-S = "${WORKDIR}/git"
 inherit bash-completion
diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch
new file mode 100644
index 0000000000..af884808f2
--- /dev/null
+++ b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch
@@ -0,0 +1,52 @@
+From f011501e719e0042fc6ca29ac7b33e8a14562246 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Tue, 1 Apr 2025 19:45:01 +0900
+Subject: [PATCH] fix cstdint error with gcc-15.0.1
+* see more details:
+  http://errors.yoctoproject.org/Errors/Details/850148/
+    TOPDIR/tmp/work/core2-64-oe-linux/sqlite-orm/1.5/git/examples/synchronous.cpp:7:5: error: 'uint16_t' does not name a type
+        7 |     uint16_t src_port;
+        |     ^~~~~~~~
+    TOPDIR/tmp/work/core2-64-oe-linux/sqlite-orm/1.5/git/examples/synchronous.cpp:3:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
+        2 | #include <sqlite_orm/sqlite_orm.h>
+    +++ |+#include <cstdint>
+        3 | #include <string>
+While this was backported from 6a96d1cec4(Explicitly included <cstdint> in examples and unit tests),
+since it was a commit made in v1.9, only synchronous.cpp was modified as other files do not exist in the current version.
+Signed-off-by: mark.yang <mark.yang@lge.com>
+Upstream-Status: Backport [6a96d1c Explicitly included <cstdint> in examples and unit tests]
+---
+ examples/synchronous.cpp | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+diff --git a/examples/synchronous.cpp b/examples/synchronous.cpp
+index d10da13d..b103b48c 100644
+--- a/examples/synchronous.cpp
+++ b/examples/synchronous.cpp
+@@ -1,15 +1,16 @@
+ 
+ #include <sqlite_orm/sqlite_orm.h>
+#include <cstdint>
+ #include <string>
+ 
+ struct Query {
+     std::string src_ip;
+-    uint16_t src_port;
+-    uint16_t txn_id;
+-    uint32_t tv_sec;
+-    uint32_t tv_usec;
+    std::uint16_t src_port;
+    std::uint16_t txn_id;
+    std::uint32_t tv_sec;
+    std::uint32_t tv_usec;
+     std::string name;
+-    uint16_t type;
+    std::uint16_t type;
+ };
+ 
+ int main(int, char **) {
diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
index db90bc589e..ee203f83e2 100644
--- a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
+++ b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
@@ -8,8 +8,10 @@ inherit cmake
 DEPENDS += "sqlite3"
 SRCREV = "e8a9e9416f421303f4b8970caab26dadf8bae98b"
-SRC_URI = "git://github.com/fnc12/sqlite_orm;protocol=https;branch=master"
+SRC_URI = " \
-S = "${WORKDIR}/git"
+    git://github.com/fnc12/sqlite_orm;protocol=https;branch=master \
+    file://0001-fix-cstdint-error-with-gcc-15.0.1.patch \
+"
 EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF -DLIB_INSTALL_DIR=${libdir} \
                  -DCMAKE_INSTALL_DIR=${libdir}/cmake \
diff --git a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.2.bb
index 880af82bba..966d14874e 100644
--- a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb
+++ b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.2.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=a709b68f1ce8a9f10aeea6401446c1f4 \
                    file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8 \
                    "
-SRCREV = "f2a3ad56e40c9711b23371238f9fa07dd24245f1"
+SRCREV = "667faf69cc35215e33e747b4bffdcba3643c2629"
-SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=fixes-1.3.0"
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
index f9e3679590..7824ed1a68 100644
--- a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
+++ b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
@@ -1,4 +1,4 @@
-SUMMARY="SSD1306 OLED I2C drive"
+SUMMARY = "SSD1306 OLED I2C drive"
 DESCRIPTION = "SSD1306 OLED I2C driver working in Linux"
 HOMEPAGE = "https://github.com/armlabs/ssd1306_linux"
 SECTION = "console/utils"
@@ -11,7 +11,6 @@ SRC_URI = " \
 "
 SRCREV = "34b42992a43fda69c6ba2557b718601cafe16251"
-S = "${WORKDIR}/git"
 # coreutils provides fmt which is used in the Makefile
 DEPENDS = "i2c-tools coreutils-native"
diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse/makefile-quoting.patch b/meta-oe/recipes-devtools/suitesparse/suitesparse/makefile-quoting.patch
new file mode 100644
index 0000000000..6bd2ffbb55
--- /dev/null
+++ b/meta-oe/recipes-devtools/suitesparse/suitesparse/makefile-quoting.patch
@@ -0,0 +1,32 @@
+OE's CC and CXX contain spaces and extra options which is incompatible with 
+cmake way of handling them. Remove passing the compiler options this way in
+favour of our normal cmake toolchain files added elsewhere.
+Upstream-Status: Pending
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
+++ git/Makefile
+@@ -282,7 +282,7 @@ metis: include/metis.h
+ # hardcoded below.
+ include/metis.h:
+ ifeq (,$(MY_METIS_LIB))
+-       - ( cd metis-5.1.0 && $(MAKE) config shared=1 prefix=$(SUITESPARSE) cc=$(CC) )
+       - ( cd metis-5.1.0 && $(MAKE) config shared=1 prefix=$(SUITESPARSE) )
+        - ( cd metis-5.1.0 && $(MAKE) )
+        - ( cd metis-5.1.0 && $(MAKE) install )
+        - $(SO_INSTALL_NAME) $(SUITESPARSE)/lib/libmetis.dylib \
+Index: git/SuiteSparse_config/SuiteSparse_config.mk
+===================================================================
+--- git.orig/SuiteSparse_config/SuiteSparse_config.mk
+++ git/SuiteSparse_config/SuiteSparse_config.mk
+@@ -146,7 +146,7 @@ SUITESPARSE_VERSION = 5.10.1
+         endif
+     endif
+ 
+-    CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=$(CXX) -DCMAKE_C_COMPILER=$(CC)
+    #CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=$(CXX) -DCMAKE_C_COMPILER=$(CC)
+ 
+     #---------------------------------------------------------------------------
+     # CFLAGS for the C/C++ compiler
diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb
index 13e6fd066c..8effd042fb 100644
--- a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb
+++ b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb
@@ -4,35 +4,27 @@ SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https;branc
           file://0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch \
           file://0002-Preserve-links-when-installing-libmetis.patch \
           file://0003-Add-version-information-to-libmetis.patch \
+           file://makefile-quoting.patch \
           "
 SRCREV = "538273cfd53720a10e34a3d80d3779b607e1ac26"
-S = "${WORKDIR}/git"
 DEPENDS = "cmake-native lapack gmp mpfr chrpath-native"
 PROVIDES = "mongoose graphblas"
 RPROVIDES:${PN} = "mongoose graphblas"
-# The values of $CC, $CXX, and $LD that Bitbake uses have spaces in them which
+inherit cmake
-# causes problems when the SuiteSparse Makefiles try to pass these values on
-# the command line. To get around this problem, set these variables to only the
-# program name and prepend the rest of the value onto the corresponding FLAGS
-# variable.
-CFLAGS:prepend := "${@" ".join(d.getVar('CC').split()[1:])} "
-export CC := "${@d.getVar('CC').split()[0]}"
-CXXFLAGS:prepend := "${@" ".join(d.getVar('CXX').split()[1:])} "
+B = "${S}"
-export CXX := "${@d.getVar('CXX').split()[0]}"
-LDFLAGS:prepend := "${@" ".join(d.getVar('LD').split()[1:])} "
-export LD := "${@d.getVar('LD').split()[0]}"
 export CMAKE_OPTIONS = " \
    -DCMAKE_INSTALL_PREFIX=${D}${prefix} \
    -DCMAKE_INSTALL_LIBDIR=${baselib} \
 "
+OECMAKE_SOURCEPATH = "${S}/Mongoose ${S}/metis-5.1.0 ${S}/GraphBLAS"
 do_compile () {
        oe_runmake library
 }
diff --git a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb
index f7160f508b..6c5591b461 100644
--- a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb
+++ b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb
@@ -7,9 +7,9 @@ inherit nativesdk
 SRC_URI = "file://systemctl"
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 do_install() {
        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/systemctl ${D}${bindir}
+        install -m 0755 ${UNPACKDIR}/systemctl ${D}${bindir}
 }
diff --git a/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch b/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch
deleted file mode 100644
index 58c9aec088..0000000000
--- a/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 9d47d2fd45c455339759dbfe9a0d6fd24b0a0fa1 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Wed, 24 Mar 2021 15:39:36 +0800
-Subject: [PATCH] tclap: add pkg-config file
-The tclap switched from autotools to CMake in 1.4.0 and drop the
-pkg-config file tclap.pc. Some projects (e.g. ima-inspect) still require
-it. So add it back.
-Upstream-Status: Pending
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
- CMakeLists.txt | 5 +++++
- tclap.pc.in    | 7 +++++++
- 2 files changed, 12 insertions(+)
- create mode 100644 tclap.pc.in
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2c9a26..b56eac7 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,6 +25,11 @@ install(FILES "${PROJECT_BINARY_DIR}/tclap/TCLAPConfig.h"
-   DESTINATION include/tclap
-   )
- 
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tclap.pc.in
-+  ${CMAKE_CURRENT_BINARY_DIR}/tclap.pc @ONLY)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tclap.pc
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+
- add_subdirectory(docs)
- add_subdirectory(examples)
- add_subdirectory(tests)
-diff --git a/tclap.pc.in b/tclap.pc.in
-new file mode 100644
-index 0000000..ef51c94
--- /dev/null
-+++ b/tclap.pc.in
-@@ -0,0 +1,7 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+
-+Name: tclap
-+Description: Templatized C++ Command Line Parser
-+Version: @PROJECT_VERSION@
-+Cflags: -I${includedir}
-- 
-2.17.1
diff --git a/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb b/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb
index 6d55c58526..6f452d3b93 100644
--- a/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb
+++ b/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb
@@ -10,12 +10,9 @@ compliant with the GNU or POSIX standards, it is close. \
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c64b2e8cc50917b2744a90950faa7cd"
-SRCREV = "799a8b1f99818e39fee19d0601030770af1221e1"
+SRCREV = "81b3d2a0c47895c22e9bb8c577f5ab521f76e5d2"
-SRC_URI = "git://git.code.sf.net/p/tclap/code;branch=1.4 \
+SRC_URI = "git://git.code.sf.net/p/tclap/code;branch=1.4"
-           file://0001-tclap-add-pkg-config-file.patch \
-"
-S = "${WORKDIR}/git"
 inherit cmake
 ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk8/confsearch.diff
index e13bf69b23..81d4735752 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk8/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/tk8/fix-xft.diff
index fdf3c66535..c1e2f7344e 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk8/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/tk8/tkprivate.diff
index 62467af1d5..8cdcf20207 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk8/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/tk8_8.6.15.bb
index 237c4e7389..8cb9f6cb5e 100644
--- a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk8_8.6.15.bb
@@ -4,39 +4,43 @@ 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"
+DEPENDS = "tcl8 virtual/libx11 libxt"
 SRC_URI = "\
-    ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \
+    ${SOURCEFORGE_MIRROR}/tcl/tk${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"
-S = "${WORKDIR}/${BPN}${PV}/unix"
+SRC_URI[sha256sum] = "550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca793fec"
-DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${S}/../=${TARGET_DBGSRC_DIR}/.."
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"
+UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/"
-PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}"
+S = "${UNPACKDIR}/tk${PV}"
 # Short version format: "8.6"
 VER = "${@os.path.splitext(d.getVar('PV'))[0]}"
 LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib"
+CFLAGS += "-I${STAGING_INCDIR}/tcl${VER}"
 inherit autotools features_check pkgconfig
+AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
+EXTRA_AUTORECONF += "--exclude=aclocal"
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -46,7 +50,9 @@ EXTRA_OECONF = "\
    --with-tcl=${STAGING_BINDIR}/crossscripts \
    --libdir=${libdir} \
 "
-export TK_LIBRARY='${libdir}/tk${VER}'
+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}
@@ -68,7 +74,7 @@ FILES:${PN}-lib = "${libdir}/libtk${VER}.so*"
 FILES:${PN} += "${libdir}/tk*"
 # isn't getting picked up by shlibs code
-RDEPENDS:${PN} += "tk-lib"
+RDEPENDS:${PN} += "tk8-lib"
 RDEPENDS:${PN}:class-native = ""
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/tcltk/tk_9.0.1.bb b/meta-oe/recipes-devtools/tcltk/tk_9.0.1.bb
new file mode 100644
index 0000000000..504b40927e
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk_9.0.1.bb
@@ -0,0 +1,101 @@
+SUMMARY = "Tool Command Language ToolKit Extension"
+HOMEPAGE = "http://tcl.sourceforge.net"
+SECTION = "devel/tcltk"
+# http://www.tcl.tk/software/tcltk/license.html
+LICENSE = "TCL"
+LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+"
+DEPENDS = "tcl virtual/libx11 libxt zip-native"
+SRC_URI = "\
+    ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \
+"
+SRC_URI[sha256sum] = "d6f01a4d598bfc6398be9584e1bab828c907b0758db4bbb351a1429106aec527"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"
+UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/"
+S = "${UNPACKDIR}/${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"
+EXTRA_AUTORECONF += "--exclude=aclocal"
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+EXTRA_OECONF = "\
+    --with-x \
+    --with-tcl=${STAGING_BINDIR}/crossscripts \
+    --libdir=${libdir} \
+"
+export TK_LIBRARY = '${libdir}/tk${VER}'
+do_install:append() {
+    ln -sf wish${VER} ${D}${bindir}/wish
+    sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tkConfig.sh
+    sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tkConfig.sh
+    install -d ${D}${bindir_crossscripts}
+    install -m 0755 tkConfig.sh ${D}${bindir_crossscripts}
+}
+PACKAGECONFIG ??= "xft"
+PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft"
+PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext"
+PACKAGES =+ "${PN}-lib"
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
+FILES:${PN}-lib = "${libdir}/libtcl9tk${VER}.so*"
+FILES:${PN} += "${libdir}/tk*"
+# isn't getting picked up by shlibs code
+RDEPENDS:${PN} += "tk-lib"
+RDEPENDS:${PN}:class-native = ""
+BBCLASSEXTEND = "native nativesdk"
+# Fix the path in sstate
+SSTATE_SCAN_FILES += "*Config.sh"
+inherit binconfig
+SYSROOT_DIRS += "${bindir_crossscripts}"
+# Fix some paths that might be used by Tcl extensions
+BINCONFIG_GLOB = "*Config.sh"
+# Cleanup host path from ${libdir}/tclConfig.sh and remove the
+# ${bindir_crossscripts}/tclConfig.sh from target
+PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess"
+tcl_package_preprocess() {
+        sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \
+               -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \
+               -e "s;${STAGING_INCDIR};${includedir};g" \
+               -e "s;--sysroot=${RECIPE_SYSROOT};;g" \
+               -e "s;${B};${libdir};g" \
+               -e "s;${WORKDIR};${TARGET_DBGSRC_DIR};g" \
+               ${PKGD}${libdir}/tkConfig.sh
+        rm -f ${PKGD}${bindir_crossscripts}/tkConfig.sh
+}
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 0000000000..4f682c5eb2
--- /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 0000000000..da8b1602be
--- /dev/null
+++ b/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb
@@ -0,0 +1,24 @@
+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"
+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/uftrace/uftrace_0.16.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.17.bb
index 320b5a88a6..776bb014f4 100644
--- a/meta-oe/recipes-devtools/uftrace/uftrace_0.16.bb
+++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.17.bb
@@ -10,10 +10,9 @@ DEPENDS:append:libc-musl = " argp-standalone"
 inherit autotools
-SRCREV = "68aed9b0a20d3d1b5e1dc15e0f8aabba7e34735b"
+SRCREV = "b0d936107edcefb519abbc9c363ca40daaac23b3"
 SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \
           file://0001-include-libgen.h-for-basename.patch"
-S = "${WORKDIR}/git"
 LDFLAGS:append:libc-musl = " -largp"
diff --git a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb
index e37dbcd02f..3d92f59ff2 100644
--- a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb
+++ b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/mvo5/unattended-upgrades.git;protocol=https;branch=m
 SRCREV = "5aff8fa2b5b60b7c11bbfb39c884477e72d11d02"
-S = "${WORKDIR}/git"
 inherit setuptools3_legacy
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/CVE-2018-19518.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/CVE-2018-19518.patch
new file mode 100644
index 0000000000..d942a752b3
--- /dev/null
+++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/CVE-2018-19518.patch
@@ -0,0 +1,24 @@
+uw-imap (8:2007f~dfsg-6) unstable; urgency=medium
+  * [CVE-2018-19518] 2013_disable_rsh.patch (new): Disable access to IMAP
+    mailboxes through running imapd over rsh, and therefore ssh (Closes:
+    #914632). Code using the library can enable it with tcp_parameters()
+    after making sure that the IMAP server name is sanitized.
+ -- Magnus Holmgren <holmgren@debian.org>  Tue, 26 Feb 2019 23:35:43 +0100
+CVE: CVE-2018-19518
+Upstream-Status: Inactive-Upstream [lastrelease: 2007]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+--- a/src/osdep/unix/Makefile
+++ b/src/osdep/unix/Makefile
+@@ -988,7 +988,7 @@ onceenv:
+         -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
+         -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
+         -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+-        -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \
+        -DLOCKPGM=\"$(LOCKPGM)\" \
+         -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
+         -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+        echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-fix-incompatible-pointer-types.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-fix-incompatible-pointer-types.patch
new file mode 100644
index 0000000000..8744cdd103
--- /dev/null
+++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-fix-incompatible-pointer-types.patch
@@ -0,0 +1,355 @@
+Fix compile errors when gcc option '-Wincompatible-pointer-types' set:
+mx.c: In function 'mx_setdate':
+mx.c:1286:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1286 |   utime (file,tp);              /* set the times */
+      |               ^~
+      |               |
+      |               time_t * {aka long int *}
+Upstream-Status: Inactive-Upstream [lastrelease: 2011]
+[1]: https://en.wikipedia.org/wiki/UW_IMAP
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ src/osdep/unix/mbx.c       |  12 ++++++------
+ src/osdep/unix/mh.c        |   2 +-
+ src/osdep/unix/mmdf.c      |  10 +++++-----
+ src/osdep/unix/mtx.c       |  16 ++++++++--------
+ src/osdep/unix/mx.c        |   2 +-
+ src/osdep/unix/tenex.c     |  16 ++++++++--------
+ src/osdep/unix/unix.c      |  10 +++++-----
+ 7 files changed, 34 insertions(+), 34 deletions(-)
+diff --git a/src/osdep/unix/mbx.c b/src/osdep/unix/mbx.c
+index c8a45a5..0a587fe 100644
+--- a/src/osdep/unix/mbx.c
+++ b/src/osdep/unix/mbx.c
+@@ -302,7 +302,7 @@ int mbx_isvalid (MAILSTREAM **stream,char *name,char *tmp,int *ld,char *lock,
+     if (sbuf.st_ctime > sbuf.st_atime) {
+       tp[0] = sbuf.st_atime;   /* preserve atime and mtime */
+       tp[1] = sbuf.st_mtime;
+-      utime (tmp,tp);          /* set the times */
+      utime (tmp, (const struct utimbuf *)tp);         /* set the times */
+     }
+   }
+                                /* in case INBOX but not mbx format */
+@@ -776,7 +776,7 @@ void mbx_flag (MAILSTREAM *stream,char *sequence,char *flag,long flags)
+         stream->user_flags[LOCAL->ffuserflag]) || (oldpid != LOCAL->lastpid))
+       mbx_update_header (stream);
+     tp[0] = time (0);          /* make sure read comes after all that */
+-    utime (stream->mailbox,tp);
+    utime (stream->mailbox, (const struct utimbuf *)tp);
+   }
+   if (LOCAL->ld >= 0) {                /* unlock now */
+     unlockfd (LOCAL->ld,LOCAL->lock);
+@@ -1075,7 +1075,7 @@ long mbx_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options)
+                                /* else preserve \Marked status */
+   else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0);
+   tp[1] = sbuf.st_mtime;       /* preserve mtime */
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+   close (fd);                  /* close the file */
+   MM_NOCRITICAL (stream);      /* release critical */
+   unlockfd (ld,lock);          /* release exclusive parse/append permission */
+@@ -1213,7 +1213,7 @@ long mbx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
+                                /* else preserve \Marked status */
+     else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0);
+     tp[1] = sbuf.st_mtime;     /* preserve mtime */
+-    utime (file,tp);           /* set the times */
+    utime (file, (const struct utimbuf *)tp);          /* set the times */
+     fclose (df);               /* close the file */
+     MM_NOCRITICAL (dstream);   /* release critical */
+   }
+@@ -1446,7 +1446,7 @@ long mbx_parse (MAILSTREAM *stream)
+     time_t tp[2];
+     tp[0] = time (0);
+     tp[1] = LOCAL->filetime;
+-    utime (stream->mailbox,tp);
+    utime (stream->mailbox, (const struct utimbuf *)tp);
+   }
+   stream->silent = silent;     /* can pass up events now */
+   mail_exists (stream,nmsgs);  /* notify upper level of new mailbox size */
+@@ -1814,7 +1814,7 @@ unsigned long mbx_rewrite (MAILSTREAM *stream,unsigned long *reclaimed,
+   fstat (LOCAL->fd,&sbuf);     /* get new write time */
+   tp[1] = LOCAL->filetime = sbuf.st_mtime;
+   tp[0] = time (0);            /* reset atime to now */
+-  utime (stream->mailbox,tp);
+  utime (stream->mailbox, (const struct utimbuf *)tp);
+   unlockfd (ld,lock);          /* release exclusive parse/append permission */
+                                /* notify upper level of new mailbox size */
+   mail_exists (stream,stream->nmsgs);
+diff --git a/src/osdep/unix/mh.c b/src/osdep/unix/mh.c
+index 9264624..26f3539 100644
+--- a/src/osdep/unix/mh.c
+++ b/src/osdep/unix/mh.c
+@@ -1279,5 +1279,5 @@ void mh_setdate (char *file,MESSAGECACHE *elt)
+   time_t tp[2];
+   tp[0] = time (0);            /* atime is now */
+   tp[1] = mail_longdate (elt); /* modification time */
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+ }
+diff --git a/src/osdep/unix/mmdf.c b/src/osdep/unix/mmdf.c
+index e962434..c0adbee 100644
+--- a/src/osdep/unix/mmdf.c
+++ b/src/osdep/unix/mmdf.c
+@@ -379,7 +379,7 @@ long mmdf_isvalid (char *name,char *tmp)
+       if ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) {
+        tp[0] = sbuf.st_atime;  /* preserve atime and mtime */
+        tp[1] = sbuf.st_mtime;
+-       utime (file,tp);        /* set the times */
+       utime (file, (const struct utimbuf *)tp);       /* set the times */
+       }
+     }
+   }
+@@ -1131,7 +1131,7 @@ long mmdf_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options)
+   else tp[0] =                 /* else preserve \Marked status */
+         ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) ?
+         sbuf.st_atime : tp[1];
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+   mmdf_unlock (fd,NIL,&lock);  /* unlock and close mailbox */
+   if (tstream) {               /* update last UID if we can */
+     MMDFLOCAL *local = (MMDFLOCAL *) tstream->local;
+@@ -1292,7 +1292,7 @@ long mmdf_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
+     ret = NIL;                 /* return error */
+   }
+   else tp[0] = tp[1] - 1;      /* set atime to now-1 if successful copy */
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+   fclose (sf);                 /* done with scratch file */
+                                /* force UIDVALIDITY assignment now */
+   if (tstream && !tstream->uid_validity) tstream->uid_validity = time (0);
+@@ -1550,7 +1550,7 @@ void mmdf_unlock (int fd,MAILSTREAM *stream,DOTLOCK *lock)
+     }
+     else now = 0;              /* no time change needed */
+                                /* set the times, note change */
+-    if (now && !utime (stream->mailbox,tp)) LOCAL->filetime = tp[1];
+    if (now && !utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1];
+   }
+   flock (fd,LOCK_UN);          /* release flock'ers */
+   if (!stream) close (fd);     /* close the file if no stream */
+@@ -2393,7 +2393,7 @@ long mmdf_rewrite (MAILSTREAM *stream,unsigned long *nexp,DOTLOCK *lock,
+                                /* set atime to now, mtime a second earlier */
+     tp[1] = (tp[0] = time (0)) - 1;
+                                /* set the times, note change */
+-    if (!utime (stream->mailbox,tp)) LOCAL->filetime = tp[1];
+    if (!utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1];
+     close (LOCAL->fd);         /* close and reopen file */
+     if ((LOCAL->fd = open (stream->mailbox,O_RDWR,
+                           (long) mail_parameters (NIL,GET_MBXPROTECTION,NIL)))
+diff --git a/src/osdep/unix/mtx.c b/src/osdep/unix/mtx.c
+index 8e6f76e..f64142b 100644
+--- a/src/osdep/unix/mtx.c
+++ b/src/osdep/unix/mtx.c
+@@ -196,7 +196,7 @@ int mtx_isvalid (char *name,char *tmp)
+       if (sbuf.st_ctime > sbuf.st_atime) {
+        tp[0] = sbuf.st_atime;  /* preserve atime and mtime */
+        tp[1] = sbuf.st_mtime;
+-       utime (file,tp);        /* set the times */
+       utime (file, (const struct utimbuf *)tp);       /* set the times */
+       }
+     }
+   }
+@@ -565,7 +565,7 @@ void mtx_flag (MAILSTREAM *stream,char *sequence,char *flag,long flags)
+     fstat (LOCAL->fd,&sbuf);   /* get current write time */
+     tp[1] = LOCAL->filetime = sbuf.st_mtime;
+     tp[0] = time (0);          /* make sure read comes after all that */
+-    utime (stream->mailbox,tp);
+    utime (stream->mailbox, (const struct utimbuf *)tp);
+   }
+ }
+ 
+@@ -834,7 +834,7 @@ long mtx_expunge (MAILSTREAM *stream,char *sequence,long options)
+       fstat (LOCAL->fd,&sbuf); /* get new write time */
+       tp[1] = LOCAL->filetime = sbuf.st_mtime;
+       tp[0] = time (0);                /* reset atime to now */
+-      utime (stream->mailbox,tp);
+      utime (stream->mailbox, (const struct utimbuf *)tp);
+       MM_NOCRITICAL (stream);  /* release critical */
+                                /* notify upper level of new mailbox size */
+       mail_exists (stream,stream->nmsgs);
+@@ -929,7 +929,7 @@ long mtx_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options)
+                                /* else preserve \Marked status */
+   else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0);
+   tp[1] = sbuf.st_mtime;       /* preserve mtime */
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+   close (fd);                  /* close the file */
+   unlockfd (ld,lock);          /* release exclusive parse/append permission */
+   MM_NOCRITICAL (stream);      /* release critical */
+@@ -946,7 +946,7 @@ long mtx_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options)
+       fstat (LOCAL->fd,&sbuf); /* get current write time */
+       tp[1] = LOCAL->filetime = sbuf.st_mtime;
+       tp[0] = time (0);                /* make sure atime remains greater */
+-      utime (stream->mailbox,tp);
+      utime (stream->mailbox, (const struct utimbuf *)tp);
+     }
+   }
+   if (ret && mail_parameters (NIL,GET_COPYUID,NIL))
+@@ -1062,7 +1062,7 @@ long mtx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
+                                /* else preserve \Marked status */
+   else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0);
+   tp[1] = sbuf.st_mtime;       /* preserve mtime */
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+   fclose (df);                 /* close the file */
+   unlockfd (ld,lock);          /* release exclusive parse/append permission */
+   MM_NOCRITICAL (stream);      /* release critical */
+@@ -1212,7 +1212,7 @@ long mtx_parse (MAILSTREAM *stream)
+     time_t tp[2];
+     tp[0] = time (0);
+     tp[1] = LOCAL->filetime;
+-    utime (stream->mailbox,tp);
+    utime (stream->mailbox, (const struct utimbuf *)tp);
+   }
+   stream->silent = silent;     /* can pass up events now */
+   mail_exists (stream,nmsgs);  /* notify upper level of new mailbox size */
+@@ -1312,7 +1312,7 @@ void mtx_update_status (MAILSTREAM *stream,unsigned long msgno,long syncflag)
+       fstat (LOCAL->fd,&sbuf); /* get new write time */
+       tp[1] = LOCAL->filetime = sbuf.st_mtime;
+       tp[0] = time (0);                /* make sure read is later */
+-      utime (stream->mailbox,tp);
+      utime (stream->mailbox, (const struct utimbuf *)tp);
+     }
+   }
+ }
+diff --git a/src/osdep/unix/mx.c b/src/osdep/unix/mx.c
+index b5c5adf..4146409 100644
+--- a/src/osdep/unix/mx.c
+++ b/src/osdep/unix/mx.c
+@@ -1283,5 +1283,5 @@ void mx_setdate (char *file,MESSAGECACHE *elt)
+   time_t tp[2];
+   tp[0] = time (0);            /* atime is now */
+   tp[1] = mail_longdate (elt); /* modification time */
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+ }
+diff --git a/src/osdep/unix/tenex.c b/src/osdep/unix/tenex.c
+index eee61fb..622da61 100644
+--- a/src/osdep/unix/tenex.c
+++ b/src/osdep/unix/tenex.c
+@@ -203,7 +203,7 @@ int tenex_isvalid (char *name,char *tmp)
+       if (sbuf.st_ctime > sbuf.st_atime) {
+        tp[0] = sbuf.st_atime;  /* preserve atime and mtime */
+        tp[1] = sbuf.st_mtime;
+-       utime (file,tp);        /* set the times */
+       utime (file, (const struct utimbuf *)tp);       /* set the times */
+       }
+     }
+   }
+@@ -654,7 +654,7 @@ void tenex_flag (MAILSTREAM *stream,char *sequence,char *flag,long flags)
+     fstat (LOCAL->fd,&sbuf);   /* get current write time */
+     tp[1] = LOCAL->filetime = sbuf.st_mtime;
+     tp[0] = time (0);          /* make sure read comes after all that */
+-    utime (stream->mailbox,tp);
+    utime (stream->mailbox, (const struct utimbuf *)tp);
+   }
+ }
+ 
+@@ -924,7 +924,7 @@ long tenex_expunge (MAILSTREAM *stream,char *sequence,long options)
+       fstat (LOCAL->fd,&sbuf); /* get new write time */
+       tp[1] = LOCAL->filetime = sbuf.st_mtime;
+       tp[0] = time (0);                /* reset atime to now */
+-      utime (stream->mailbox,tp);
+      utime (stream->mailbox, (const struct utimbuf *)tp);
+       MM_NOCRITICAL (stream);  /* release critical */
+                                /* notify upper level of new mailbox size */
+       mail_exists (stream,stream->nmsgs);
+@@ -1019,7 +1019,7 @@ long tenex_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options)
+                                /* else preserve \Marked status */
+   else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0);
+   tp[1] = sbuf.st_mtime;       /* preserve mtime */
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+   close (fd);                  /* close the file */
+   unlockfd (ld,lock);          /* release exclusive parse/append permission */
+   MM_NOCRITICAL (stream);      /* release critical */
+@@ -1036,7 +1036,7 @@ long tenex_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options)
+       fstat (LOCAL->fd,&sbuf); /* get current write time */
+       tp[1] = LOCAL->filetime = sbuf.st_mtime;
+       tp[0] = time (0);                /* make sure atime remains greater */
+-      utime (stream->mailbox,tp);
+      utime (stream->mailbox, (const struct utimbuf *)tp);
+     }
+   }
+   if (ret && mail_parameters (NIL,GET_COPYUID,NIL))
+@@ -1159,7 +1159,7 @@ long tenex_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
+                                /* else preserve \Marked status */
+   else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0);
+   tp[1] = sbuf.st_mtime;       /* preserve mtime */
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+   fclose (df);                 /* close the file */
+   unlockfd (ld,lock);          /* release exclusive parse/append permission */
+   MM_NOCRITICAL (stream);      /* release critical */
+@@ -1324,7 +1324,7 @@ long tenex_parse (MAILSTREAM *stream)
+     time_t tp[2];
+     tp[0] = time (0);
+     tp[1] = LOCAL->filetime;
+-    utime (stream->mailbox,tp);
+    utime (stream->mailbox, (const struct utimbuf *)tp);
+   }
+   stream->silent = silent;     /* can pass up events now */
+   mail_exists (stream,nmsgs);  /* notify upper level of new mailbox size */
+@@ -1424,7 +1424,7 @@ void tenex_update_status (MAILSTREAM *stream,unsigned long msgno,long syncflag)
+       fstat (LOCAL->fd,&sbuf); /* get new write time */
+       tp[1] = LOCAL->filetime = sbuf.st_mtime;
+       tp[0] = time (0);                /* make sure read is later */
+-      utime (stream->mailbox,tp);
+      utime (stream->mailbox, (const struct utimbuf *)tp);
+     }
+   }
+ }
+diff --git a/src/osdep/unix/unix.c b/src/osdep/unix/unix.c
+index 86be3f9..012dc83 100644
+--- a/src/osdep/unix/unix.c
+++ b/src/osdep/unix/unix.c
+@@ -232,7 +232,7 @@ DRIVER *unix_valid (char *name)
+       if ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) {
+        tp[0] = sbuf.st_atime;  /* yes, preserve atime and mtime */
+        tp[1] = sbuf.st_mtime;
+-       utime (file,tp);        /* set the times */
+       utime (file, (const struct utimbuf *)tp);       /* set the times */
+       }
+     }
+   }
+@@ -999,7 +999,7 @@ long unix_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options)
+   else tp[0] =                 /* else preserve \Marked status */
+         ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) ?
+         sbuf.st_atime : tp[1];
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+   unix_unlock (fd,NIL,&lock);  /* unlock and close mailbox */
+   if (tstream) {               /* update last UID if we can */
+     UNIXLOCAL *local = (UNIXLOCAL *) tstream->local;
+@@ -1160,7 +1160,7 @@ long unix_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data)
+     ret = NIL;                 /* return error */
+   }
+   else tp[0] = tp[1] - 1;      /* set atime to now-1 if successful copy */
+-  utime (file,tp);             /* set the times */
+  utime (file, (const struct utimbuf *)tp);            /* set the times */
+   fclose (sf);                 /* done with scratch file */
+                                /* force UIDVALIDITY assignment now */
+   if (tstream && !tstream->uid_validity) tstream->uid_validity = time (0);
+@@ -1425,7 +1425,7 @@ void unix_unlock (int fd,MAILSTREAM *stream,DOTLOCK *lock)
+     }
+     else now = 0;              /* no time change needed */
+                                /* set the times, note change */
+-    if (now && !utime (stream->mailbox,tp)) LOCAL->filetime = tp[1];
+    if (now && !utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1];
+   }
+   flock (fd,LOCK_UN);          /* release flock'ers */
+   if (!stream) close (fd);     /* close the file if no stream */
+@@ -2251,7 +2251,7 @@ long unix_rewrite (MAILSTREAM *stream,unsigned long *nexp,DOTLOCK *lock,
+                                /* set atime to now, mtime a second earlier */
+     tp[1] = (tp[0] = time (0)) - 1;
+                                /* set the times, note change */
+-    if (!utime (stream->mailbox,tp)) LOCAL->filetime = tp[1];
+    if (!utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1];
+     close (LOCAL->fd);         /* close and reopen file */
+     if ((LOCAL->fd = open (stream->mailbox,O_RDWR,
+                           (long) mail_parameters (NIL,GET_MBXPROTECTION,NIL)))
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-newer-tls.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-newer-tls.patch
new file mode 100644
index 0000000000..958abc90f8
--- /dev/null
+++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-newer-tls.patch
@@ -0,0 +1,29 @@
+Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
+Upstream-Status: Pending
+--- imap-2007f/src/osdep/unix/ssl_unix.c.old    2024-05-08 09:41:06.183450584 +0200
+++ imap-2007f/src/osdep/unix/ssl_unix.c        2024-05-08 09:43:38.512931933 +0200
+@@ -220,7 +220,11 @@
+   if (ssl_last_error) fs_give ((void **) &ssl_last_error);
+   ssl_last_host = host;
+   if (!(stream->context = SSL_CTX_new ((flags & NET_TLSCLIENT) ?
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+                                      TLS_client_method () :
+#else
+                                       TLSv1_client_method () :
+#endif
+                                       SSLv23_client_method ())))
+     return "SSL context failed";
+   SSL_CTX_set_options (stream->context,0);
+@@ -703,7 +707,11 @@
+   }
+                                /* create context */
+   if (!(stream->context = SSL_CTX_new (start_tls ?
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+                                      TLS_server_method () :
+#else
+                                       TLSv1_server_method () :
+#endif
+                                       SSLv23_server_method ())))
+     syslog (LOG_ALERT,"Unable to create SSL context, host=%.80s",
+            tcp_clienthost ());
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
index dcb59f4ea0..877f1d57f6 100644
--- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
+++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
@@ -15,12 +15,14 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \
           file://0001-Do-not-build-mtest.patch \
           file://0002-tmail-Include-ctype.h-for-isdigit.patch \
           file://0001-Fix-Wincompatible-function-pointer-types.patch \
+           file://uw-imap-newer-tls.patch \
+           file://uw-imap-fix-incompatible-pointer-types.patch \
+           file://CVE-2018-19518.patch \
           "
-SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369"
 SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28"
-S = "${WORKDIR}/imap-${PV}"
+S = "${UNPACKDIR}/imap-${PV}"
 CVE_STATUS[CVE-2005-0198] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
@@ -51,3 +53,10 @@ ALLOW_EMPTY:${PN} = "1"
 PARALLEL_MAKE = ""
+# http://errors.yoctoproject.org/Errors/Details/766915/
+# unix.c:235:21: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+# unix.c:1002:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+# unix.c:1163:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+# unix.c:1428:40: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+# unix.c:2254:33: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-devtools/valijson/valijson_1.0.2.bb b/meta-oe/recipes-devtools/valijson/valijson_1.0.6.bb
index f531218aeb..4e5f02746c 100644
--- a/meta-oe/recipes-devtools/valijson/valijson_1.0.2.bb
+++ b/meta-oe/recipes-devtools/valijson/valijson_1.0.6.bb
@@ -3,10 +3,9 @@ HOMEPAGE = "https://github.com/tristanpenman/valijson"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5c4583a434195e4f3b418e17c8ca2daf"
-SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https;tag=v${PV}"
-SRCREV = "0b4771e273a065d437814baf426bcfcafec0f434"
+SRCREV = "4edda758546436462da479bb8c8514f8a95c35ad"
-S = "${WORKDIR}/git"
 inherit cmake
diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch b/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch
new file mode 100644
index 0000000000..2ad7beb51c
--- /dev/null
+++ b/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch
@@ -0,0 +1,58 @@
+From d001f12d428f7adaeaadee5263a22c797c99d67b Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Fri, 30 Aug 2024 11:42:27 +0200
+Subject: [PATCH] aclocal.m4: don't use full path of $with_curl in xerces-c.pc
+* fixes:
+  ERROR: QA Issue: File /usr/lib32/pkgconfig/xerces-c.pc in package lib32-libxerces-c-dev contains reference to TMPDIR [buildpaths]
+* xerces-c was blacklisted due to tmpdir since 2016:
+  https://git.openembedded.org/meta-openembedded/commit/?id=1af196e42c811947bb483df30bfce758adee83d1
+* then sed call:
+  sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc
+  was added to do_install:append and blacklist dropped in:
+  https://git.openembedded.org/meta-openembedded/commit/?id=87b9efff79e62f569525e4760adc594d0d9ac476
+* sed call was adjusted in:
+  https://git.openembedded.org/meta-openembedded/commit/?id=87c9e9537dc43468a6aaf706853b784ce6de14e0
+  sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc
+* but it was still failing in some cases, e.g. with multilib where libdir is /usr/lib64, so the sed call is:
+  sed -i s:-L{WORKDIR}/recipe-sysroot/usr/lib64::g ${WORKDIR}/build/xerces-c.pc
+  but the actual xerces-c.pc file still has:
+  Libs: -L${libdir} -lxerces-c
+  Libs.private: -L${WORKDIR}/recipe-sysroot/usr/lib -lcurl
+  because this aclocal was always hardcoding "lib" (appended to --with-curl
+  value which is passed together with ${prefix}) and not respecting the libdir value:
+  PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl"
+  PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu"
+* xerces-c supports CMake since 2017:
+  https://github.com/apache/xerces-c/commit/2606b2924c3e2bf0cf50f72b79378721b6bcf04e
+  switching from autotools to CMake would probably resolve some of this as well
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+Upstream-Status: Pending [It would be better to just switch to CMake]
+ m4/xerces_curl_prefix.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/m4/xerces_curl_prefix.m4 b/m4/xerces_curl_prefix.m4
+index d1d015c..7928bdc 100644
+--- a/m4/xerces_curl_prefix.m4
+++ b/m4/xerces_curl_prefix.m4
+@@ -39,8 +39,8 @@ AC_DEFUN([XERCES_CURL_PREFIX],
+                        curl_libs=`$curl_config --libs`
+                else
+                        if test -n "$with_curl"; then
+-                               curl_flags="-I$with_curl/include"
+-                               curl_libs="-L$with_curl/lib -lcurl"
+                               curl_flags=""
+                               curl_libs="-lcurl"
+                        else
+                                # Default compiler paths.
+                                #
diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb
index 1643af2546..2819366dc9 100644
--- a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb
+++ b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb
@@ -9,8 +9,10 @@ SECTION =  "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2"
+SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2 \
-SRC_URI[sha256sum] = "1db4028c9b7f1f778efbf4a9462d65e13f9938f2c22f9e9994e12c49ba97e252"
+    file://0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch \
+"
+SRC_URI[sha256sum] = "ef752578587e26013a933f16d76305c9b43ca32f869e3d3426986e03efb01d64"
 inherit autotools
@@ -18,10 +20,6 @@ PACKAGECONFIG ??= "curl icu"
 PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl"
 PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu"
-do_install:prepend () {
-    sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc
-}
 PACKAGES = "libxerces-c \
    libxerces-c-dev \
    xerces-c-samples \
@@ -31,7 +29,7 @@ PACKAGES = "libxerces-c \
 RPROVIDES:${PN}-dbg += "libxerces-c-dbg xerces-c-samples-dbg"
-FILES:libxerces-c = "${libdir}/libxerces-c-3.2.so"
+FILES:libxerces-c = "${libdir}/libxerces-c-3.3.so"
 FILES:libxerces-c-dev = "${libdir}/lib*.la \
    ${libdir}/libxerces-c.so \
    ${libdir}/pkgconfig/xerces-c.pc \
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-bool-reserved-word-error-in-gcc-15.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-bool-reserved-word-error-in-gcc-15.patch
new file mode 100644
index 0000000000..813efbc62a
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-bool-reserved-word-error-in-gcc-15.patch
@@ -0,0 +1,50 @@
+From a811ea6af5296b89ee7c2a358dd4ffd2584429f4 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 2 Apr 2025 11:00:27 +0900
+Subject: [PATCH] fix bool reserved word error in gcc 15
+* Fix build error with gcc-15.0.1
+  http://errors.yoctoproject.org/Errors/Details/850147/
+    srcdir/lib/util/include/bool.h:13:5: error: cannot use keyword 'false' as enumeration constant
+    13 |     false = 0,
+        |     ^~~~~
+    srcdir/lib/util/include/bool.h:13:5: note: 'false' is a keyword with '-std=c23' onwards
+    srcdir/lib/util/include/bool.h:15:3: error: expected ';', identifier or '(' before 'bool'
+    15 | } bool;
+        |   ^~~~
+    srcdir/lib/util/include/bool.h:15:3: warning: useless type name in empty declaration
+    In file included from sleep.c:2:
+    srcdir/lib/util/include/bool.h:13:5: error: cannot use keyword 'false' as enumeration constant
+    13 |     false = 0,
+        |     ^~~~~
+    srcdir/lib/util/include/bool.h:13:5: note: 'false' is a keyword with '-std=c23' onwards
+    srcdir/lib/util/include/bool.h:15:3: error: expected ';', identifier or '(' before 'bool'
+    15 | } bool;
+        |   ^~~~
+  gcc-15 switched to -std=c23 by default.
+  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
+Upstream-Status: Submitted [https://sourceforge.net/p/xmlrpc-c/discussion/131628/thread/70e626d73a]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ stable/lib/util/include/bool.h | 2 ++
+ 1 file changed, 2 insertions(+)
+diff --git a/stable/lib/util/include/bool.h b/stable/lib/util/include/bool.h
+index 312477c4..a5e81eb6 100644
+--- a/stable/lib/util/include/bool.h
+++ b/stable/lib/util/include/bool.h
+@@ -9,10 +9,12 @@
+ /* At least the GNU compiler defines __bool_true_false_are_defined */
+ #ifndef __bool_true_false_are_defined
+ #define __bool_true_false_are_defined
+#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L
+ typedef enum {
+     false = 0,
+     true = 1
+ } bool;
+ #endif
+ #endif
+#endif
+ 
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
index be83b0166c..531f0d45fb 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
@@ -1,6 +1,6 @@
-From dba3c5bf34ed530fd41ed50968825af2158f142e Mon Sep 17 00:00:00 2001
+From 371c59c6135f53a6892c415bf9450c32e7ca3523 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 29 Jan 2019 13:31:39 -0800
+Date: Mon, 10 Mar 2025 20:25:02 -0700
 Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
 /mnt/a/yoe/workspace/sources/xmlrpc-c/test/cpp/server_abyss.cpp:87:14: error: assigning to 'int' from incompatible type '__bind<int
@@ -10,10 +10,15 @@ Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Rebase to 1.64.0
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- test/cpp/server_abyss.cpp | 56 +++++++++++++++++++--------------------
+ test/cpp/server_abyss.cpp | 2 +-
- 1 file changed, 28 insertions(+), 28 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/test/cpp/server_abyss.cpp b/test/cpp/server_abyss.cpp
+index c1b44995..14faf5a5 100644
 --- a/test/cpp/server_abyss.cpp
 +++ b/test/cpp/server_abyss.cpp
 @@ -85,7 +85,7 @@ public:
@@ -25,3 +30,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
         
         if (rc != 0) {
             closesock(this->fd);
+-- 
+2.25.1
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 0000000000..15e088965f
--- /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,80 @@
+From e246247aceb3ac0fd7491b1ee34a049dd44f5025 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 10 Mar 2025 20:26:29 -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/lib/libutil++/Makefile \
+    all
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/Makefile \
+    libxmlrpc_util++.so
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/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>
+Rebase to 1.64.0
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ unix-common.mk | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+diff --git a/unix-common.mk b/unix-common.mk
+index 6954faf5..e15a4f5c 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
+-- 
+2.25.1
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 9d92e4712b..0000000000
--- 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/no-automake.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/no-automake.patch
new file mode 100644
index 0000000000..f309cd4890
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/no-automake.patch
@@ -0,0 +1,18 @@
+This doesn't use automake so don't turn it on, as autoreconf will refuse to work.
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+diff --git i/stable/configure.in w/stable/configure.in
+index 4a9ade8c..baba1edc 100644
+--- i/configure.in
+++ w/configure.in
+@@ -8,7 +8,7 @@ dnl =======================================================================
+ 
+ dnl "x.xx" is supposed to be a version number, but is meaningless here.
+ dnl The real version number is in Makefile.version.
+-AM_INIT_AUTOMAKE(xmlrpc-c, x.xx)
+dnl AM_INIT_AUTOMAKE(xmlrpc-c, x.xx)
+ 
+ dnl Define @build@, @build_cpu@, @build_vendor@, @build_os,
+ dnl @host, @host_cpu@, @host_vender, and @host_os@ substitutions.
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.64.0.bb
index 5d5152b834..3b923fb99e 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
@@ -6,18 +6,20 @@ LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951"
 SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \
+           file://no-automake.patch \
           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 \
+           file://0001-fix-bool-reserved-word-error-in-gcc-15.patch;striplevel=2 \
           "
-#Release 1.59.01
+SRCREV = "8ce36bce2438df9b02fcaafd19efa90a56426601"
-SRCREV = "352aeaa9ae49e90e55187cbda839f2113df06278"
-S = "${WORKDIR}/git/stable"
+S = "${UNPACKDIR}/${BP}/advanced"
 inherit autotools-brokensep binconfig pkgconfig
 TARGET_CFLAGS += "-Wno-narrowing"
+# These are needed for the integrated expat
 EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \
                 LD_FOR_BUILD='${BUILD_LD}' \
                 CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \
@@ -32,10 +34,7 @@ PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-ab
 PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus"
 PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl"
-do_configure() {
+do_configure:prepend() {
-        gnu-configize --verbose --force ${S}
-        autoconf
-        oe_runconf
        # license is incompatible with lib/util/getoptx.*
        rm -fv ${S}/tools/turbocharger/mod_gzip.c
 }
diff --git a/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb b/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
index 186f2c8ed0..3e569859b7 100644
--- a/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
+++ b/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/lloyd/yajl;nobranch=1;protocol=https"
 inherit cmake lib_package
-S = "${WORKDIR}/git"
 EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
diff --git a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
index c5b5e60027..e4434bee45 100644
--- a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
+++ b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/lloyd/yajl;branch=master;protocol=https \
           "
 SRCREV = "a0ecdde0c042b9256170f2f8890dd9451a4240aa"
-S = "${WORKDIR}/git"
 inherit cmake lib_package
diff --git a/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch b/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch
deleted file mode 100644
index bda90edb20..0000000000
--- a/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6b1cbe8b4dcc45103d69bc7337e5eb33d1fd21f3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 3 Feb 2021 14:22:51 -0800
-Subject: [PATCH] Do not use AC_HEADER_STDC
-This macro is removed in autotools 2.70+ and it can be expected that C90
-headers are always available [1]
-Upstream-Status: Pending
-[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.70/autoconf.html#index-AC_005fHEADER_005fSTDC
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- configure.ac | 6 ------
- 1 file changed, 6 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 01b61097..2823ecd7 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -101,14 +101,8 @@ AM_WITH_DMALLOC
- #
- # Checks for header files.
- #
-AC_HEADER_STDC
- AC_CHECK_HEADERS([strings.h libgen.h unistd.h direct.h sys/stat.h])
- 
-# REQUIRE standard C headers
-if test "$ac_cv_header_stdc" != yes; then
-       AC_MSG_ERROR([Standard (ANSI/ISO C89) header files are required.])
-fi
-
- #
- # Checks for typedefs, structures, and compiler characteristics.
- #
-- 
-2.30.0
diff --git a/meta-oe/recipes-devtools/yasm/yasm/0001-bitvect-fix-build-with-gcc-15.patch b/meta-oe/recipes-devtools/yasm/yasm/0001-bitvect-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..f3f2c431d5
--- /dev/null
+++ b/meta-oe/recipes-devtools/yasm/yasm/0001-bitvect-fix-build-with-gcc-15.patch
@@ -0,0 +1,38 @@
+From 64ef740eb262f329e55eebadf2ce276b146d44e9 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Tue, 22 Apr 2025 19:06:24 +0200
+Subject: [PATCH] bitvect: fix build with gcc-15
+* fixes:
+libyasm/bitvect.h:86:32: error: cannot use keyword 'false' as enumeration constant
+   86 |         typedef enum boolean { false = FALSE, true = TRUE } boolean;
+      |                                ^~~~~
+../git/libyasm/bitvect.h:86:32: note: 'false' is a keyword with '-std=c23' onwards
+as suggested in:
+https://github.com/yasm/yasm/issues/283#issuecomment-2661108816
+Upstream-Status: Submitted [https://github.com/yasm/yasm/pull/287]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ libyasm/bitvect.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+diff --git a/libyasm/bitvect.h b/libyasm/bitvect.h
+index 3aee3a53..a13470ad 100644
+--- a/libyasm/bitvect.h
+++ b/libyasm/bitvect.h
+@@ -83,7 +83,11 @@ typedef  Z_longword         *Z_longwordptr;
+     #ifdef MACOS_TRADITIONAL
+         #define boolean Boolean
+     #else
+-        typedef enum boolean { false = FALSE, true = TRUE } boolean;
+        #if __STDC_VERSION__ < 202311L
+             typedef enum boolean { false = FALSE, true = TRUE } boolean;
+        #else
+             typedef bool boolean;
+        #endif
+     #endif
+ #endif
+ 
diff --git a/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-31975.patch b/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-31975.patch
deleted file mode 100644
index ae10e99c2f..0000000000
--- a/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-31975.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b2cc5a1693b17ac415df76d0795b15994c106441 Mon Sep 17 00:00:00 2001
-From: Katsuhiko Gondow <gondow@cs.titech.ac.jp>
-Date: Tue, 13 Jun 2023 05:00:47 +0900
-Subject: [PATCH] Fix memory leak in bin-objfmt (#231)
-Upstream-Status: Backport [https://github.com/yasm/yasm/commit/b2cc5a1693b17ac415df76d0795b15994c106441]
-CVE: CVE-2023-31975
---
- modules/objfmts/bin/bin-objfmt.c | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/modules/objfmts/bin/bin-objfmt.c b/modules/objfmts/bin/bin-objfmt.c
-index 18026750..a38c3422 100644
--- a/modules/objfmts/bin/bin-objfmt.c
-+++ b/modules/objfmts/bin/bin-objfmt.c
-@@ -1680,6 +1680,10 @@ static void
- bin_section_data_destroy(void *data)
- {
-     bin_section_data *bsd = (bin_section_data *)data;
-+    if (bsd->align)
-+        yasm_xfree(bsd->align);
-+    if (bsd->valign)
-+        yasm_xfree(bsd->valign);
-     if (bsd->start)
-         yasm_expr_destroy(bsd->start);
-     if (bsd->vstart)
--
-2.40.0
diff --git a/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch b/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch
deleted file mode 100644
index 1ca33f0a92..0000000000
--- a/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2cd3bb50e256f5ed5f611ac611d25fe673f2cec3 Mon Sep 17 00:00:00 2001
-From: Peter Johnson <johnson.peter@gmail.com>
-Date: Fri, 11 Aug 2023 10:49:51 +0000
-Subject: [PATCH] elf.c: Fix NULL deref on bad xsize expression (#234)
-CVE: CVE-2023-37732
-Upstream-Status: Backport [https://github.com/yasm/yasm/commit/2cd3bb50e256f5ed5f611ac611d25fe673f2cec3]
-Signed-off-by: Soumya <soumya.sambu@windriver.com>
---
- modules/objfmts/elf/elf.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/modules/objfmts/elf/elf.c b/modules/objfmts/elf/elf.c
-index 2486bba8..bab4c9ca 100644
--- a/modules/objfmts/elf/elf.c
-+++ b/modules/objfmts/elf/elf.c
-@@ -482,15 +482,15 @@ elf_symtab_write_to_file(FILE *f, elf_symtab_head *symtab,
-         /* get size (if specified); expr overrides stored integer */
-         if (entry->xsize) {
-            size_intn = yasm_intnum_copy(
-                yasm_expr_get_intnum(&entry->xsize, 1));
-            if (!size_intn) {
-+            yasm_intnum *intn = yasm_expr_get_intnum(&entry->xsize, 1);
-+            if (!intn) {
-                 yasm_error_set(YASM_ERROR_VALUE,
-                                N_("size specifier not an integer expression"));
-                 yasm_errwarn_propagate(errwarns, entry->xsize->line);
-            }
-+            } else
-+                size_intn = yasm_intnum_copy(intn);
-         }
-        else
-+        if (!size_intn)
-             size_intn = yasm_intnum_create_uint(entry->size);
-         /* get EQU value for constants */
--
-2.40.0
diff --git a/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-oe/recipes-devtools/yasm/yasm_git.bb
index 216b777667..68895a1697 100644
--- a/meta-oe/recipes-devtools/yasm/yasm_git.bb
+++ b/meta-oe/recipes-devtools/yasm/yasm_git.bb
@@ -8,17 +8,14 @@ DEPENDS += "flex-native bison-native"
 PACKAGECONFIG[docs] = ",,xmlto-native,"
 PV = "1.3.0+git"
-# v1.3.0
+# v1.3.0-87
-SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a"
+SRCREV = "121ab150b3577b666c79a79f4a511798d7ad2432"
 SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \
-           file://0001-Do-not-use-AC_HEADER_STDC.patch \
-           file://CVE-2023-31975.patch \
-           file://CVE-2023-37732.patch \
           file://0001-yasm-Set-build-date-to-SOURCE_DATE_EPOCH.patch \
           file://0002-yasm-Use-BUILD_DATE-for-reproducibility.patch \
+           file://0001-bitvect-fix-build-with-gcc-15.patch \
 "
-S = "${WORKDIR}/git"
 inherit autotools gettext python3native
@@ -33,3 +30,6 @@ do_configure:prepend() {
     sed -i -e "s/^echo \"\/\* generated \$ac_cv_stdint_message \*\/\" >>\$ac_stdint$"// ${S}/m4/ax_create_stdint_h.m4
 }
+CVE_STATUS_GROUPS += "CVE_STATUS_HASH_UPDATE"
+CVE_STATUS_HASH_UPDATE = "CVE-2021-33454 CVE-2023-31975 CVE-2023-37732"
+CVE_STATUS_HASH_UPDATE[status] = "fixed-version: patched in current git hash"