157 files changed, 4657 insertions, 5963 deletions

diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20260107.1.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20260526.0.bb
index 128ed81556..d0d0d44610 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20260107.1.bb
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20260526.0.bb
@@ -11,7 +11,7 @@ SRC_URI = "https://github.com/abseil/${BPN}/releases/download/${PV}/${BP}.tar.gz
            file://0001-absl-always-use-asm-sgidefs.h.patch \
            file://0002-abseil-ppc-fixes.patch \
            "
-SRC_URI[sha256sum] = "4314e2a7cbac89cac25a2f2322870f343d81579756ceff7f431803c2c9090195"
+SRC_URI[sha256sum] = "6e1aee535473414164bf83e4ebc40240dec71a4701f8a642d906e95bea1aea0c"
 
 UPSTREAM_CHECK_URI = "https://github.com/abseil/abseil-cpp/releases"
 UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/0001-Avoid-redefining-constants-introduced-in-glibc-2.41.patch b/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/0001-Avoid-redefining-constants-introduced-in-glibc-2.41.patch
new file mode 100644
index 0000000000..f4133572ca
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/0001-Avoid-redefining-constants-introduced-in-glibc-2.41.patch
@@ -0,0 +1,172 @@
+From 950b8565e333e2ed1a515e2b342009a33ef51733 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sergio=20G=C3=B3mez?=
+ <sergio.gdr@collabora.corp-partner.google.com>
+Date: Tue, 15 Apr 2025 17:57:46 -0500
+Subject: [PATCH] Avoid redefining constants introduced in glibc 2.41.
+
+These constants are now available through <sys/auxv.h> when using
+glibc >= 2.41, so we get re-define compilation errors.
+Just rename them by prefixing them with "CRYPTO_" to avoid the
+collision.
+
+Change-Id: I61807d8dfc8b5f482ec6191cb41aebfa5676c5b6
+Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/78527
+Commit-Queue: David Benjamin <davidben@google.com>
+Reviewed-by: David Benjamin <davidben@google.com>
+Reviewed-by: Adam Langley <agl@google.com>
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+Upstream-Status: Backport [https://github.com/google/boringssl/commit/ff9475331e72936bc1c00fcda6d4820ba67d4dae]
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+---
+ src/crypto/cpu_arm_linux.c       | 33 +++++++++++++++++++++++++++-----
+ src/crypto/cpu_arm_linux.h       | 20 ++++++++++---------
+ src/crypto/cpu_arm_linux_test.cc | 12 +++++++-----
+ 3 files changed, 46 insertions(+), 19 deletions(-)
+
+diff --git a/src/crypto/cpu_arm_linux.c b/src/crypto/cpu_arm_linux.c
+index d13ac215c4df..7c7cd9dd93f4 100644
+--- a/src/crypto/cpu_arm_linux.c
++++ b/src/crypto/cpu_arm_linux.c
+@@ -112,7 +112,11 @@ void OPENSSL_cpuid_setup(void) {
+ 
+   // Matching OpenSSL, only report other features if NEON is present.
+   unsigned long hwcap = getauxval(AT_HWCAP);
+-  if (hwcap & HWCAP_NEON) {
++  if (hwcap & CRYPTO_HWCAP_NEON) {
++#if defined(HWCAP_ARM_NEON)
++      static_assert(HWCAP_ARM_NEON == CRYPTO_HWCAP_NEON,
++                    "CRYPTO_HWCAP values must match Linux");
++#endif
+     OPENSSL_armcap_P |= ARMV7_NEON;
+ 
+     // Some ARMv8 Android devices don't expose AT_HWCAP2. Fall back to
+@@ -126,16 +130,35 @@ void OPENSSL_cpuid_setup(void) {
+       g_needs_hwcap2_workaround = hwcap2 != 0;
+     }
+ 
+-    if (hwcap2 & HWCAP2_AES) {
++    // HWCAP2_* values, without the "CRYPTO_" prefix, are exposed through
++    // <sys/auxv.h> in some versions of glibc(>= 2.41). Assert that we don't
++    // diverge from those values.
++    if (hwcap2 & CRYPTO_HWCAP2_AES) {
++#if defined(HWCAP2_AES)
++      static_assert(HWCAP2_AES == CRYPTO_HWCAP2_AES,
++                    "CRYPTO_HWCAP2 values must match Linux");
++#endif
+       OPENSSL_armcap_P |= ARMV8_AES;
+     }
+-    if (hwcap2 & HWCAP2_PMULL) {
++    if (hwcap2 & CRYPTO_HWCAP2_PMULL) {
++#if defined(HWCAP2_PMULL)
++      static_assert(HWCAP2_PMULL == CRYPTO_HWCAP2_PMULL,
++                    "CRYPTO_HWCAP2 values must match Linux");
++#endif
+       OPENSSL_armcap_P |= ARMV8_PMULL;
+     }
+-    if (hwcap2 & HWCAP2_SHA1) {
++    if (hwcap2 & CRYPTO_HWCAP2_SHA1) {
++#if defined(HWCAP2_SHA1)
++      static_assert(HWCAP2_SHA1 == CRYPTO_HWCAP2_SHA1,
++                    "CRYPTO_HWCAP2 values must match Linux");
++#endif
+       OPENSSL_armcap_P |= ARMV8_SHA1;
+     }
+-    if (hwcap2 & HWCAP2_SHA2) {
++    if (hwcap2 & CRYPTO_HWCAP2_SHA2) {
++#if defined(HWCAP2_SHA2)
++      static_assert(HWCAP2_SHA2 == CRYPTO_HWCAP2_SHA2,
++                    "CRYPTO_HWCAP2 values must match Linux");
++#endif
+       OPENSSL_armcap_P |= ARMV8_SHA256;
+     }
+   }
+diff --git a/src/crypto/cpu_arm_linux.h b/src/crypto/cpu_arm_linux.h
+index 895099787439..4b0ecfc77b49 100644
+--- a/src/crypto/cpu_arm_linux.h
++++ b/src/crypto/cpu_arm_linux.h
+@@ -29,14 +29,16 @@ extern "C" {
+ // The cpuinfo parser lives in a header file so it may be accessible from
+ // cross-platform fuzzers without adding code to those platforms normally.
+ 
+-#define HWCAP_NEON (1 << 12)
++#define CRYPTO_HWCAP_NEON (1 << 12)
+ 
+ // See /usr/include/asm/hwcap.h on an ARM installation for the source of
+ // these values.
+-#define HWCAP2_AES (1 << 0)
+-#define HWCAP2_PMULL (1 << 1)
+-#define HWCAP2_SHA1 (1 << 2)
+-#define HWCAP2_SHA2 (1 << 3)
++// We add the prefix "CRYPTO_" to the definitions so as not to collide with
++// some versions of glibc (>= 2.41) that expose them through <sys/auxv.h>.
++#define CRYPTO_HWCAP2_AES (1 << 0)
++#define CRYPTO_HWCAP2_PMULL (1 << 1)
++#define CRYPTO_HWCAP2_SHA1 (1 << 2)
++#define CRYPTO_HWCAP2_SHA2 (1 << 3)
+ 
+ typedef struct {
+   const char *data;
+@@ -141,16 +143,16 @@ static unsigned long crypto_get_arm_hwcap2_from_cpuinfo(
+ 
+   unsigned long ret = 0;
+   if (has_list_item(&features, "aes")) {
+-    ret |= HWCAP2_AES;
++    ret |= CRYPTO_HWCAP2_AES;
+   }
+   if (has_list_item(&features, "pmull")) {
+-    ret |= HWCAP2_PMULL;
++    ret |= CRYPTO_HWCAP2_PMULL;
+   }
+   if (has_list_item(&features, "sha1")) {
+-    ret |= HWCAP2_SHA1;
++    ret |= CRYPTO_HWCAP2_SHA1;
+   }
+   if (has_list_item(&features, "sha2")) {
+-    ret |= HWCAP2_SHA2;
++    ret |= CRYPTO_HWCAP2_SHA2;
+   }
+   return ret;
+ }
+diff --git a/src/crypto/cpu_arm_linux_test.cc b/src/crypto/cpu_arm_linux_test.cc
+index 0b6b02fbe4d1..cd626a90512e 100644
+--- a/src/crypto/cpu_arm_linux_test.cc
++++ b/src/crypto/cpu_arm_linux_test.cc
+@@ -93,7 +93,8 @@ TEST(ARMLinuxTest, CPUInfo) {
+           // (Extra processors omitted.)
+           "\n"
+           "Hardware        : Qualcomm Technologies, Inc MSM8998\n",
+-          HWCAP2_AES | HWCAP2_PMULL | HWCAP2_SHA1 | HWCAP2_SHA2,
++          CRYPTO_HWCAP2_AES | CRYPTO_HWCAP2_PMULL | CRYPTO_HWCAP2_SHA1 |
++              CRYPTO_HWCAP2_SHA2,
+       },
+       // Garbage should be tolerated.
+       {
+@@ -105,23 +106,24 @@ TEST(ARMLinuxTest, CPUInfo) {
+       {
+           "Features        : aes pmull sha1 sha2\n"
+           "CPU architecture: 8\n",
+-          HWCAP2_AES | HWCAP2_PMULL | HWCAP2_SHA1 | HWCAP2_SHA2,
++          CRYPTO_HWCAP2_AES | CRYPTO_HWCAP2_PMULL | CRYPTO_HWCAP2_SHA1 |
++              CRYPTO_HWCAP2_SHA2,
+       },
+       // Various combinations of ARMv8 flags.
+       {
+           "Features        : aes sha1 sha2\n"
+           "CPU architecture: 8\n",
+-          HWCAP2_AES | HWCAP2_SHA1 | HWCAP2_SHA2,
++          CRYPTO_HWCAP2_AES | CRYPTO_HWCAP2_SHA1 | CRYPTO_HWCAP2_SHA2,
+       },
+       {
+           "Features        : pmull sha2\n"
+           "CPU architecture: 8\n",
+-          HWCAP2_PMULL | HWCAP2_SHA2,
++          CRYPTO_HWCAP2_PMULL | CRYPTO_HWCAP2_SHA2,
+       },
+       {
+           "Features        : aes aes   aes not_aes aes aes \n"
+           "CPU architecture: 8\n",
+-          HWCAP2_AES,
++          CRYPTO_HWCAP2_AES,
+       },
+       {
+           "Features        : \n"
diff --git a/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/0001-cmake-add-SOVERSION-0-to-crypto-and-ssl-shared-libra.patch b/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/0001-cmake-add-SOVERSION-0-to-crypto-and-ssl-shared-libra.patch
new file mode 100644
index 0000000000..74ad93aa8d
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/0001-cmake-add-SOVERSION-0-to-crypto-and-ssl-shared-libra.patch
@@ -0,0 +1,62 @@
+From 03a13ef3ea786286d9317562647e9856c1b71736 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Thu, 11 Jun 2026 00:00:00 +0000
+Subject: [PATCH] cmake: add SOVERSION 0 to crypto and ssl shared libraries
+
+BoringSSL's CMakeLists.txt does not set SOVERSION, so the built shared
+libraries have no SONAME embedded and cmake names them libcrypto.so /
+libssl.so without any version suffix.  This causes two problems in a
+Yocto build:
+
+1. The Yocto QA check "dev-so" rejects unversioned .so symlinks in
+   non-dev packages, but those symlinks are required at runtime because
+   the DT_NEEDED entry in binaries that link against BoringSSL refers to
+   the bare libcrypto.so name.
+
+2. Standard Yocto FILES patterns split libraries by suffix: .so.* goes
+   into the runtime package and .so symlinks go into -dev.  Without a
+   SOVERSION these patterns do not apply correctly.
+
+Setting SOVERSION to 0 causes cmake to:
+  - build libcrypto.so.0 as the real ELF with SONAME=libcrypto.so.0
+  - create libcrypto.so as a development symlink
+
+Binaries linked with -l:libcrypto.so.0 (as android-tools does) will
+record DT_NEEDED=libcrypto.so.0 and resolve correctly at runtime.
+
+Upstream-Status: Inappropriate [OE-specific packaging requirement]
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ crypto/CMakeLists.txt | 2 ++
+ ssl/CMakeLists.txt    | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
+index cdb5ddc..fca86cc 100644
+--- a/crypto/CMakeLists.txt
++++ b/crypto/CMakeLists.txt
+@@ -327,6 +327,8 @@ endif()
+ 
+ set_target_properties(crypto PROPERTIES LINKER_LANGUAGE C)
+ 
++set_target_properties(crypto PROPERTIES SOVERSION 0)
++
+ if(WIN32)
+   target_link_libraries(crypto ws2_32)
+ endif()
+diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
+index d8d997e..e49b350 100644
+--- a/ssl/CMakeLists.txt
++++ b/ssl/CMakeLists.txt
+@@ -46,6 +46,8 @@ install_if_enabled(TARGETS ssl EXPORT OpenSSLTargets ${INSTALL_DESTINATION_DEFAU
+ set_property(TARGET ssl PROPERTY EXPORT_NAME SSL)
+ target_link_libraries(ssl crypto)
+ 
++set_target_properties(ssl PROPERTIES SOVERSION 0)
++
+ add_executable(
+   ssl_test
+ 
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/boringssl-go-stub b/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/boringssl-go-stub
new file mode 100644
index 0000000000..de63f38c9c
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/boringssl-go-stub
@@ -0,0 +1,22 @@
+#!/bin/sh
+if [ "$1" = "run" ] && [ "$2" = "util/embed_test_data.go" ]; then
+    echo 'extern const int boringssl_dummy_crypto_test_data = 0;'
+    exit 0
+fi
+if [ "$1" = "run" ] && [ "$2" = "err_data_generate.go" ]; then
+    cat <<'EOF'
+#include <stddef.h>
+#include <stdint.h>
+
+const uint32_t kOpenSSLReasonValues[] = {0};
+const size_t kOpenSSLReasonValuesLen = 0;
+const char kOpenSSLReasonStringData[] = "";
+EOF
+    exit 0
+fi
+if [ "$1" = "version" ]; then
+    echo 'go version go0.0.0 yocto/stub'
+    exit 0
+fi
+echo "Unexpected Go invocation: $*" >&2
+exit 1
diff --git a/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/boringssl-gtest-stub.cc b/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/boringssl-gtest-stub.cc
new file mode 100644
index 0000000000..7477536281
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl/boringssl-gtest-stub.cc
@@ -0,0 +1 @@
+int boringssl_dummy_gtest_translation_unit = 0;
diff --git a/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl_14.0.0+r45.bb b/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl_14.0.0+r45.bb
new file mode 100644
index 0000000000..ebf125c735
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-libboringssl/android-libboringssl_14.0.0+r45.bb
@@ -0,0 +1,70 @@
+DESCRIPTION = "BoringSSL shared libraries for android-tools"
+SECTION = "libs"
+# This recipe is tightly coupled to android-tools: when upgrading android-tools,
+# update this recipe to the BoringSSL version shipped in the corresponding Debian
+# android-platform-tools source package.
+# BoringSSL is a fork of OpenSSL; new files carry ISC license, OpenSSL license
+# covers the forked parts.
+LICENSE = "OpenSSL & ISC"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ca501bc96ce9ed0814e2c592c3f9593"
+
+SRC_URI = "https://deb.debian.org/debian/pool/main/a/android-platform-external-boringssl/android-platform-external-boringssl_${PV}.orig.tar.xz \
+           file://boringssl-go-stub \
+           file://boringssl-gtest-stub.cc \
+           file://0001-cmake-add-SOVERSION-0-to-crypto-and-ssl-shared-libra.patch \
+           file://0001-Avoid-redefining-constants-introduced-in-glibc-2.41.patch;patchdir=.. \
+           "
+SRC_URI[md5sum] = "83d24d2f3136ba6a486b5464369b91b4"
+SRC_URI[sha256sum] = "f9223e8c15ad5d9e3f1cd50861f4c272658864661e2332bea5d60952aa0930cd"
+
+# The Debian orig tarball unpacks to android-platform-external-boringssl-${PV}/
+# with the actual source under a src/ subdirectory.
+S = "${UNPACKDIR}/android-platform-external-boringssl-${PV}/src"
+
+inherit cmake
+
+CFLAGS:append = " -Wno-discarded-qualifiers"
+
+OECMAKE_TARGET_COMPILE = "crypto ssl"
+
+EXTRA_OECMAKE = " \
+    -DBUILD_SHARED_LIBS=ON \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DGO_EXECUTABLE=${WORKDIR}/hosttools/go \
+"
+
+do_configure:prepend() {
+    install -d ${WORKDIR}/hosttools
+    install -m 0755 ${UNPACKDIR}/boringssl-go-stub ${WORKDIR}/hosttools/go
+
+    # BoringSSL builds its own minimal gtest from third_party/googletest; provide
+    # an empty stub .cc. We only build the crypto and ssl targets so the test
+    # source files are never compiled, but cmake still needs gtest-all.cc to
+    # exist to create the boringssl_gtest target.
+    if [ ! -f ${S}/third_party/googletest/src/gtest-all.cc ]; then
+        install -d ${S}/third_party/googletest/src
+        install -m 0644 ${UNPACKDIR}/boringssl-gtest-stub.cc \
+            ${S}/third_party/googletest/src/gtest-all.cc
+    fi
+}
+do_install() {
+    # Install headers under a boringssl/ subdirectory to avoid shadowing the
+    # system OpenSSL headers in the sysroot.
+    install -d ${D}${includedir}/boringssl
+    cp -a ${S}/include/openssl ${D}${includedir}/boringssl/
+
+    # Install shared libraries under ${libdir}/android/ to avoid conflicting
+    # with the system libssl/libcrypto in the sysroot.
+    install -d ${D}${libdir}/android
+    install -m 0755 ${B}/crypto/libcrypto.so.0 ${D}${libdir}/android/libcrypto.so.0
+    ln -sf libcrypto.so.0 ${D}${libdir}/android/libcrypto.so
+    install -m 0755 ${B}/ssl/libssl.so.0 ${D}${libdir}/android/libssl.so.0
+    ln -sf libssl.so.0 ${D}${libdir}/android/libssl.so
+
+}
+
+FILES:${PN}-dev = "${includedir}/boringssl ${libdir}/android/libcrypto.so ${libdir}/android/libssl.so"
+FILES:${PN} = "${libdir}/android/libcrypto.so.0 ${libdir}/android/libssl.so.0"
+
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf
deleted file mode 100644
index ddf155a907..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Service]
-ExecStartPre=/usr/bin/android-gadget-setup
-ExecStartPost=/usr/bin/android-gadget-start
-ExecStopPost=/usr/bin/android-gadget-cleanup
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup
deleted file mode 100644
index 47e4edb9be..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-conf="Conf 1"
-manufacturer=RPB
-model="Android device"
-product=0xd002
-serial=0123456789ABCDEF
-vendor=0x18d1
-
-if [ -r /etc/android-gadget-setup.machine ] ; then
-        . /etc/android-gadget-setup.machine
-fi
-
-[ -d /sys/kernel/config/usb_gadget ] || modprobe libcomposite
-
-cd /sys/kernel/config/usb_gadget
-
-[ -d adb ] && /usr/bin/android-gadget-cleanup || true
-
-mkdir adb
-cd adb
-
-mkdir configs/c.1
-mkdir functions/ffs.usb0
-mkdir strings/0x409
-mkdir configs/c.1/strings/0x409
-echo -n "$vendor"  > idVendor
-echo -n "$product" > idProduct
-echo "$serial" > strings/0x409/serialnumber
-echo "$manufacturer" > strings/0x409/manufacturer
-echo "$model" > strings/0x409/product
-echo "$conf" > configs/c.1/strings/0x409/configuration
-ln -s functions/ffs.usb0 configs/c.1
-
-mkdir -p /dev/usb-ffs/adb
-mount -t functionfs usb0 /dev/usb-ffs/adb
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start
deleted file mode 100644
index 76b5e29624..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-sleep 10
-
-ls /sys/class/udc/ | head -n 1 | xargs echo -n > /sys/kernel/config/usb_gadget/adb/UDC
-
-echo "Setting UDC $(ls /sys/class/udc/ | head -n 1) for USB ADB Gadget usage"
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
deleted file mode 100644
index 342e7fd1a5..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "Different utilities from Android - corressponding configuration files for using ConfigFS"
-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 \
-    file://android-gadget-cleanup \
-    file://10-adbd-configfs.conf \
-"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir}
-
-    if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then
-        install -d ${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 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
-}
-
-FILES:${PN} += " \
-    ${systemd_unitdir}/system/ \
-"
-
-PROVIDES += "android-tools-conf"
-RPROVIDES:${PN} = "android-tools-conf"
-BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf b/meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf
new file mode 100644
index 0000000000..7971f319c3
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf
@@ -0,0 +1,7 @@
+[Service]
+# adbd uses sd_notify to signal readiness; ExecStartPost runs only after
+# READY=1 is sent, so no delay is needed before activating the UDC.
+Environment=ANDROID_GADGET_UDC_DELAY=0
+ExecStartPre=/usr/bin/android-gadget-setup
+ExecStartPost=/usr/bin/android-gadget-start
+ExecStopPost=/usr/bin/android-gadget-cleanup
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-cleanup
index f27d77df51..f27d77df51 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-cleanup
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup
index 26cf30eddd..2744d1e98e 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup
@@ -1,37 +1,40 @@
 #!/bin/sh
 
-[ ! -e /dev/pts ] && mkdir -p /dev/pts
-[ ! -e /dev/pts/0 ] && mount devpts /dev/pts -t devpts
-
-# TODO enable the lines below once we have support for getprop
-# retrieve the product info from Android
-# manufacturer=$(getprop ro.product.manufacturer Android)
-# model=$(getprop ro.product.model Android)
-# serial=$(getprop ro.serialno 0123456789ABCDEF)
-
-#below are now needed in order to use FunctionFS for ADB, tested to work with 3.4+ kernels
-if grep -q functionfs /proc/filesystems; then
-    mkdir -p /dev/usb-ffs/adb
-    mount -t functionfs adb /dev/usb-ffs/adb
-    #android-gadget-setup doesn't provide below 2 and without them it won't work, so we provide them here.
-    echo adb > /sys/class/android_usb/android0/f_ffs/aliases
-    echo ffs > /sys/class/android_usb/android0/functions
+set -e
+
+conf="Conf 1"
+manufacturer=RPB
+model="Android device"
+product=0xd002
+serial=0123456789ABCDEF
+vendor=0x18d1
+
+if [ -r /etc/android-gadget-setup.machine ] ; then
+        . /etc/android-gadget-setup.machine
 fi
 
-manufacturer="$(cat /system/build.prop | grep -o 'ro.product.manufacturer=.*' | cut -d'=' -f 2)"
-model="$(cat /system/build.prop | grep -o 'ro.product.model=.*' | cut -d'=' -f 2)"
-# get the device serial number from /proc/cmdline directly(since we have no getprop on
-# GNU/Linux)
-serial="$(cat /proc/cmdline | sed 's/.*androidboot.serialno=//' | sed 's/ .*//')"
+[ -d /sys/kernel/config/usb_gadget ] || modprobe libcomposite
+
+cd /sys/kernel/config/usb_gadget
+
+[ -d adb ] && /usr/bin/android-gadget-cleanup || true
 
-echo $serial > /sys/class/android_usb/android0/iSerial
-echo $manufacturer > /sys/class/android_usb/android0/iManufacturer
-echo $model > /sys/class/android_usb/android0/iProduct
+mkdir adb
+cd adb
 
-echo "0" > /sys/class/android_usb/android0/enable
-echo "18d1" > /sys/class/android_usb/android0/idVendor
-echo "D002" > /sys/class/android_usb/android0/idProduct
-echo "adb" > /sys/class/android_usb/android0/functions
-echo "1" >  /sys/class/android_usb/android0/enable
+mkdir configs/c.1
+mkdir functions/ffs.usb0
+mkdir strings/0x409
+mkdir configs/c.1/strings/0x409
+echo -n "$vendor"  > idVendor
+echo -n "$product" > idProduct
+echo "$serial" > strings/0x409/serialnumber
+echo "$manufacturer" > strings/0x409/manufacturer
+echo "$model" > strings/0x409/product
+echo "$conf" > configs/c.1/strings/0x409/configuration
+ln -s functions/ffs.usb0 configs/c.1
 
-sleep 4
+mkdir -p /dev/usb-ffs/adb
+ADB_UID=$(id -u adb)
+ADB_GID=$(id -g adb)
+mount -t functionfs usb0 /dev/usb-ffs/adb -o "uid=$ADB_UID,gid=$ADB_GID"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-start b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-start
new file mode 100644
index 0000000000..4ea688accb
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-start
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+# Wait for adbd to open ep0 before activating the UDC. Without systemd
+# sd_notify synchronisation there is no other signal that adbd is ready, so
+# a fixed delay is used. When this script is invoked via ExecStartPost in a
+# Type=notify service, adbd has already sent READY=1 before this runs and
+# no delay is needed; set ANDROID_GADGET_UDC_DELAY=0 in that case (e.g. via
+# a systemd drop-in Environment= line).
+ANDROID_GADGET_UDC_DELAY="${ANDROID_GADGET_UDC_DELAY:-10}"
+sleep "$ANDROID_GADGET_UDC_DELAY"
+
+ls /sys/class/udc/ | head -n 1 | xargs echo -n > /sys/kernel/config/usb_gadget/adb/UDC
+
+echo "Setting UDC $(ls /sys/class/udc/ | head -n 1) for USB ADB Gadget usage"
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 764d6b404f..bb55b3599f 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
@@ -1,22 +1,40 @@
-DESCRIPTION = "Different utilities from Android - corressponding configuration files"
+DESCRIPTION = "Different utilities from Android - corresponding configuration files for using ConfigFS"
 SECTION = "console/utils"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-SRC_URI = "file://android-gadget-setup"
-
 S = "${UNPACKDIR}"
 
+SRC_URI = " \
+    file://android-gadget-setup \
+    file://android-gadget-start \
+    file://android-gadget-cleanup \
+    file://10-adbd-configfs.conf \
+"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_install() {
     install -d ${D}${bindir}
     install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
-}
+    install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir}
 
-python () {
-    pn = d.getVar('PN')
-    profprov = d.getVar("PREFERRED_PROVIDER_" + pn)
-    if profprov and pn != profprov:
-        raise bb.parse.SkipRecipe("PREFERRED_PROVIDER_%s set to %s, not %s" % (pn, profprov, pn))
+    if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then
+        install -d ${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 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
 }
+
+FILES:${PN} += " \
+    ${systemd_unitdir}/system/ \
+"
+
+PROVIDES += "android-tools-conf-configfs"
+RPROVIDES:${PN} = "android-tools-conf-configfs"
+RREPLACES:${PN} = "android-tools-conf-configfs"
+RCONFLICTS:${PN} = "android-tools-conf-configfs"
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0001-libbacktrace.mk-Link-against-staged-lib7z.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0001-libbacktrace.mk-Link-against-staged-lib7z.patch
new file mode 100644
index 0000000000..845e267c41
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0001-libbacktrace.mk-Link-against-staged-lib7z.patch
@@ -0,0 +1,38 @@
+From 1eab8bc4974c887c09d6b444c5198ec4c0932b36 Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Fri, 8 May 2026 12:10:00 +0000
+Subject: [PATCH] libbacktrace.mk: Link against staged lib7z
+
+In the Yocto target sysroot, p7zip installs `lib7z.so` under `/usr/lib`.
+The Debian make fragment hardcodes `/usr/lib/7zip` and links `-l:7z.so`,
+which does not exist in this environment and causes link failure.
+
+Use the standard sysroot library search path and link against `-l7z`
+instead.
+
+Upstream-Status: Inappropriate [OE-specific]
+
+Signed-off-by: Mihajlo Marinkovic <mmarinkovic@snap.com>
+---
+ debian/system/libbacktrace.mk | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/debian/system/libbacktrace.mk b/debian/system/libbacktrace.mk
+index b106c24..0f798d4 100644
+--- a/debian/system/libbacktrace.mk
++++ b/debian/system/libbacktrace.mk
+@@ -64,13 +64,11 @@ CPPFLAGS += \
+   -Isystem/unwinding/libunwindstack/include \
+ 
+ LDFLAGS += \
+-  -L/usr/lib/7zip \
+   -Ldebian/out/external \
+   -Ldebian/out/system \
+   -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -Wl,-rpath=/usr/lib/7zip \
+   -Wl,-soname,$(NAME).so.0 \
+-  -l:7z.so \
++  -l7z \
+   -lbase \
+   -llog \
+   -lpthread \
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0002-debian-makefiles-yocto-compat.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0002-debian-makefiles-yocto-compat.patch
new file mode 100644
index 0000000000..a7c8dcf946
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0002-debian-makefiles-yocto-compat.patch
@@ -0,0 +1,240 @@
+From 14058ff506910f19c6e6a49e2bb081c398a7acf0 Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Sun, 10 May 2026 15:20:00 +0000
+Subject: [PATCH] debian makefiles: adapt for cross-compilation in Yocto
+
+The Debian make fragments hardcode several assumptions that only work on
+a Debian build host:
+ - include /usr/share/dpkg/architecture.mk (shells out to dpkg-architecture)
+ - /usr/include/android (host path, not sysroot)
+ - /usr/lib/$(DEB_HOST_MULTIARCH)/android (host rpath)
+ - -lcrypto / -lssl (links against system OpenSSL instead of BoringSSL)
+ - -Wexit-time-destructors (Clang-only, rejected by GCC)
+
+Replace each with its Yocto-compatible equivalent: use $(SYSROOT) for
+include paths, rpath relative to $ORIGIN for installed libraries, exact
+soname matching for the staged BoringSSL shared objects, and drop the
+Clang-only warning flag.
+
+Upstream-Status: Inappropriate [OE-specific]
+
+Signed-off-by: Mihajlo Marinkovic <mmarinkovic@snap.com>
+---
+ debian/system/adb.mk                  |  9 ++++-----
+ debian/system/adbd.mk                 | 10 ++++------
+ debian/system/extras/libext4_utils.mk |  4 ++--
+ debian/system/fastboot.mk             | 13 ++++++-------
+ debian/system/libadb.mk               |  3 +--
+ debian/system/libbacktrace.mk         |  2 +-
+ debian/system/libbase.mk              |  2 +-
+ debian/system/libcrypto_utils.mk      |  2 +-
+ debian/system/libcutils.mk            |  2 +-
+ debian/system/liblog.mk               |  1 +
+ debian/system/libutils.mk             |  3 +--
+ 11 files changed, 23 insertions(+), 28 deletions(-)
+
+diff --git a/debian/system/adb.mk b/debian/system/adb.mk
+index 89530b0..90a816f 100644
+--- a/debian/system/adb.mk
++++ b/debian/system/adb.mk
+@@ -82,22 +82,21 @@ CPPFLAGS += \
+   -Isystem/libbase/include \
+   -Isystem/libziparchive/include \
+   \
+-  -I/usr/include/android \
++  -I$(SYSROOT)/usr/include/android \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -L/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
++  -Wl,-rpath='$$ORIGIN/../lib/android' \
+   -lbase \
+   -lbrotlidec \
+   -lbrotlienc \
+-  -lcrypto \
++  -l:libcrypto.so.0 \
+   -lcutils \
+   -llog \
+   -llz4 \
+   -lprotobuf \
+   -lpthread \
+-  -lssl \
++  -l:libssl.so.0 \
+   -lusb-1.0 \
+   -lziparchive \
+   -lzstd \
+diff --git a/debian/system/adbd.mk b/debian/system/adbd.mk
+index 9d6abd7..73e49a4 100644
+--- a/debian/system/adbd.mk
++++ b/debian/system/adbd.mk
+@@ -81,23 +81,21 @@ CPPFLAGS += \
+   -Isystem/libbase/include \
+   -Isystem/logging/liblog/include \
+   \
+-  -I/usr/include/android \
++  -I$(SYSROOT)/usr/include/android \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -L/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
++  -Wl,-rpath='$$ORIGIN/../lib/android' \
+   -lbase \
+   -lbrotlidec \
+   -lbrotlienc \
+-  -lcrypto \
++  -l:libcrypto.so.0 \
+   -lcutils \
+   -llog \
+   -llz4 \
+   -lprotobuf \
+   -lresolv \
+-  -lssl \
+-  -lsystemd \
++  -l:libssl.so.0 \
+   -lzstd \
+   -pie \
+ 
+diff --git a/debian/system/extras/libext4_utils.mk b/debian/system/extras/libext4_utils.mk
+index 77455f4..5bfc950 100644
+--- a/debian/system/extras/libext4_utils.mk
++++ b/debian/system/extras/libext4_utils.mk
+@@ -26,8 +26,8 @@ CPPFLAGS += \
+   -D_LARGEFILE64_SOURCE \
+   -DFEC_NO_KLOG \
+   -DSQUASHFS_NO_KLOG \
+-  -I/usr/include/android \
+-  -I/usr/include/squashfuse \
++  -I$(SYSROOT)/usr/include/android \
++  -I$(SYSROOT)/usr/include/squashfuse \
+   -Isystem/core/libcutils/include \
+   -Isystem/core/libsparse/include \
+   -Isystem/extras/ext4_utils/include \
+diff --git a/debian/system/fastboot.mk b/debian/system/fastboot.mk
+index d68a99a..52f5d8b 100644
+--- a/debian/system/fastboot.mk
++++ b/debian/system/fastboot.mk
+@@ -56,16 +56,15 @@ CPPFLAGS += \
+   -Isystem/libziparchive/include \
+   -Isystem/tools/mkbootimg/include/bootimg \
+   \
+-  -I/usr/include/android \
++  -I$(SYSROOT)/usr/include/android \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -L/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -lbase \
+-  -lcrypto \
+-  -lcutils \
+-  -llog \
++  -Wl,-rpath='$$ORIGIN/../lib/android' \
++  debian/out/system/libbase.so.0 \
++  -l:libcrypto.so.0 \
++  debian/out/system/libcutils.so.0 \
++  debian/out/system/liblog.so.0 \
+   -lpthread \
+   -lprotobuf \
+   -lsparse \
+diff --git a/debian/system/libadb.mk b/debian/system/libadb.mk
+index 52f2838..ebd52aa 100644
+--- a/debian/system/libadb.mk
++++ b/debian/system/libadb.mk
+@@ -73,7 +73,6 @@ SOURCES_CC = $(filter %.cc,$(SOURCES))
+ OBJECTS_CC = $(SOURCES_CC:.cc=.o)
+ 
+ CXXFLAGS += \
+-  -Wexit-time-destructors \
+   -Wno-non-virtual-dtor \
+   -Wno-unused-parameter \
+   -Wno-missing-field-initializers \
+@@ -96,7 +95,7 @@ CPPFLAGS += \
+   -Isystem/core/libcutils/include \
+   -Isystem/libbase/include \
+   \
+-  -I/usr/include/android \
++  -I$(SYSROOT)/usr/include/android \
+ 
+ debian/out/system/$(NAME).a: $(OBJECTS_CC) $(OBJECTS_CPP)
+        ar -rcs $@ $^
+diff --git a/debian/system/libbacktrace.mk b/debian/system/libbacktrace.mk
+index 0f798d4..f004061 100644
+--- a/debian/system/libbacktrace.mk
++++ b/debian/system/libbacktrace.mk
+@@ -1,4 +1,4 @@
+-include /usr/share/dpkg/architecture.mk
++DEB_HOST_MULTIARCH ?=
+ 
+ NAME = libbacktrace
+ 
+diff --git a/debian/system/libbase.mk b/debian/system/libbase.mk
+index f04d3f9..61f71c6 100644
+--- a/debian/system/libbase.mk
++++ b/debian/system/libbase.mk
+@@ -42,7 +42,7 @@ CPPFLAGS += \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
++  -Wl,-rpath='$$ORIGIN' \
+   -Wl,-soname,$(NAME).so.0 \
+   -llog \
+   -lpthread \
+diff --git a/debian/system/libcrypto_utils.mk b/debian/system/libcrypto_utils.mk
+index 39fd8a7..82ae46c 100644
+--- a/debian/system/libcrypto_utils.mk
++++ b/debian/system/libcrypto_utils.mk
+@@ -7,7 +7,7 @@ CPPFLAGS += \
+   -Isystem/core/include \
+   -Isystem/core/libcrypto_utils/include \
+   \
+-  -I/usr/include/android \
++  -I$(SYSROOT)/usr/include/android \
+ 
+ debian/out/system/$(NAME).a: $(OBJECTS)
+        ar -rcs $@ $^
+diff --git a/debian/system/libcutils.mk b/debian/system/libcutils.mk
+index 596ebd8..ff9e911 100644
+--- a/debian/system/libcutils.mk
++++ b/debian/system/libcutils.mk
+@@ -50,7 +50,7 @@ CPPFLAGS += \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
++  -Wl,-rpath='$$ORIGIN' \
+   -Wl,-soname,$(NAME).so.0 \
+   -lbase \
+   -llog \
+diff --git a/debian/system/liblog.mk b/debian/system/liblog.mk
+index b08a50c..091ccad 100644
+--- a/debian/system/liblog.mk
++++ b/debian/system/liblog.mk
+@@ -27,6 +27,7 @@ CPPFLAGS += \
+   -Isystem/logging/liblog/include \
+ 
+ LDFLAGS += \
++  -Wl,-rpath='$$ORIGIN' \
+   -Wl,-soname,$(NAME).so.0 \
+   -lpthread \
+   -shared
+diff --git a/debian/system/libutils.mk b/debian/system/libutils.mk
+index 6218c73..c7948e7 100644
+--- a/debian/system/libutils.mk
++++ b/debian/system/libutils.mk
+@@ -1,4 +1,3 @@
+-include /usr/share/dpkg/architecture.mk
+ 
+ NAME = libutils
+ 
+@@ -42,7 +41,7 @@ CPPFLAGS += \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
++  -Wl,-rpath='$$ORIGIN' \
+   -Wl,-soname,$(NAME).so.0 \
+   -lbacktrace \
+   -lcutils \
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0003-gcc-nullability-and-thread-annotation-compat.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0003-gcc-nullability-and-thread-annotation-compat.patch
new file mode 100644
index 0000000000..c3cf572ebd
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0003-gcc-nullability-and-thread-annotation-compat.patch
@@ -0,0 +1,34 @@
+From 793ad99196c5b9cf2922689d993b8f798e87174c Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Sun, 10 May 2026 12:00:00 +0200
+Subject: [PATCH] GCC nullability and thread annotation compat
+
+GCC does not understand the Clang-only nullability markers used in adb,
+and it rejects function-definition attributes emitted by the thread
+annotation macros. The nullability markers are injected from the Yocto
+recipe flags, while thread annotation attributes are made Clang-only so
+the sources parse under Yocto's GCC toolchain.
+
+Upstream-Status: Inappropriate [OE-specific]
+
+Signed-off-by: Mihajlo Marinkovic <mmarinkovic@snap.com>
+---
+ system/libbase/include/android-base/thread_annotations.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/system/libbase/include/android-base/thread_annotations.h b/system/libbase/include/android-base/thread_annotations.h
+index 53fe6da..5523521 100644
+--- a/system/libbase/include/android-base/thread_annotations.h
++++ b/system/libbase/include/android-base/thread_annotations.h
+@@ -18,7 +18,11 @@
+ 
+ #include <mutex>
+ 
++#if defined(__clang__)
+ #define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
++#else
++#define THREAD_ANNOTATION_ATTRIBUTE__(x)
++#endif
+ 
+ #define CAPABILITY(x) \
+       THREAD_ANNOTATION_ATTRIBUTE__(capability(x))
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0004-fastboot-super_flash_helper-include-climits.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0004-fastboot-super_flash_helper-include-climits.patch
new file mode 100644
index 0000000000..2b155e6a71
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0004-fastboot-super_flash_helper-include-climits.patch
@@ -0,0 +1,41 @@
+From fe7c2aa9a9032d11cb14ff7ab2a1a000237edaa3 Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Tue, 26 May 2026 17:41:00 +0200
+Subject: [PATCH] adb: include <climits> for missing integer constants
+
+GCC rejects builds where IOV_MAX (sysdeps/uio.h) or UINT_MAX
+(super_flash_helper.cpp) are used without the header that defines them.
+Add #include <climits> in both files.
+
+Upstream-Status: Inappropriate [OE-specific sysroot compat]
+
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ packages/modules/adb/sysdeps/uio.h          | 1 +
+ system/core/fastboot/super_flash_helper.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/packages/modules/adb/sysdeps/uio.h b/packages/modules/adb/sysdeps/uio.h
+index f3ace64..163b4a8 100644
+--- a/packages/modules/adb/sysdeps/uio.h
++++ b/packages/modules/adb/sysdeps/uio.h
+@@ -35,6 +35,7 @@ ssize_t adb_writev(borrowed_fd fd, const adb_iovec* iov, int iovcnt);
+ #else
+ 
+ #include <sys/uio.h>
++#include <climits>
+ using adb_iovec = struct iovec;
+ inline ssize_t adb_writev(borrowed_fd fd, const adb_iovec* iov, int iovcnt) {
+     return writev(fd.get(), iov, std::min(iovcnt, IOV_MAX));
+diff --git a/system/core/fastboot/super_flash_helper.cpp b/system/core/fastboot/super_flash_helper.cpp
+index b617ce8..8c1edde 100644
+--- a/system/core/fastboot/super_flash_helper.cpp
++++ b/system/core/fastboot/super_flash_helper.cpp
+@@ -16,6 +16,7 @@
+ 
+ #include "super_flash_helper.h"
+ 
++#include <climits>
+ #include <android-base/logging.h>
+ 
+ #include "util.h"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0005-adb-host-usb-compat.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0005-adb-host-usb-compat.patch
new file mode 100644
index 0000000000..6f396b7e9d
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0005-adb-host-usb-compat.patch
@@ -0,0 +1,34 @@
+From da0746f90c80bb5621d01f35d505412cd26898e2 Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Thu, 21 May 2026 14:10:00 +0200
+Subject: [PATCH] adb: replace socket_get_local_port with inline getsockname
+
+The libcutils socket_get_local_port helper is not available in the native
+libcutils build. Replace the call with an inline getsockname implementation.
+
+Upstream-Status: Inappropriate [OE-specific]
+
+Signed-off-by: Mihajlo Marinkovic <mmarinkovic@snap.com>
+---
+ packages/modules/adb/sysdeps.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/packages/modules/adb/sysdeps.h b/packages/modules/adb/sysdeps.h
+index 99f6b74..9a99295 100644
+--- a/packages/modules/adb/sysdeps.h
++++ b/packages/modules/adb/sysdeps.h
+@@ -626,7 +626,13 @@ inline int adb_getsockname(borrowed_fd fd, struct sockaddr* sockaddr, socklen_t*
+ }
+ 
+ inline int adb_socket_get_local_port(borrowed_fd fd) {
+-    return socket_get_local_port(fd.get());
++    sockaddr_storage addr;
++    socklen_t addr_size = sizeof(addr);
++
++    if (getsockname(fd.get(), reinterpret_cast<sockaddr*>(&addr), &addr_size) == 0) {
++        return ntohs(reinterpret_cast<sockaddr_in*>(&addr)->sin_port);
++    }
++    return -1;
+ }
+ 
+ // Operate on a file descriptor returned from unix_open() or a well-known file
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0006-adbd-enable-root-and-remount-support.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0006-adbd-enable-root-and-remount-support.patch
new file mode 100644
index 0000000000..700e64f06d
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0006-adbd-enable-root-and-remount-support.patch
@@ -0,0 +1,466 @@
+From d247444cf5ef0c8ee2fcf207febe09f5101c2215 Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Fri, 29 May 2026 12:10:00 +0200
+Subject: [PATCH] adbd: enable root and remount support
+
+Enable root/unroot and remount support for the non-Android adbd build.
+
+Upstream-Status: Inappropriate [embedded Linux integration]
+
+Signed-off-by: Mihajlo Marinkovic <mmarinkovic@snap.com>
+---
+ debian/system/adbd.mk                         |  3 +
+ .../modules/adb/daemon/framebuffer_service.h  |  2 +-
+ packages/modules/adb/daemon/main.cpp          | 93 +++++++++++++++----
+ .../modules/adb/daemon/restart_service.cpp    | 40 +++++++-
+ packages/modules/adb/daemon/restart_service.h |  2 +-
+ packages/modules/adb/daemon/services.cpp      | 81 ++++++++++++++--
+ packages/modules/adb/sockets.cpp              | 20 +++-
+ packages/modules/adb/transport.cpp            |  1 -
+ 8 files changed, 204 insertions(+), 38 deletions(-)
+
+diff --git a/debian/system/adbd.mk b/debian/system/adbd.mk
+index 73e49a4..beb412e 100644
+--- a/debian/system/adbd.mk
++++ b/debian/system/adbd.mk
+@@ -17,6 +17,8 @@ ADBD_SRC_FILES = \
+   daemon/jdwp_service.cpp \
+   daemon/logging.cpp \
+   daemon/main.cpp \
++  daemon/framebuffer_service.cpp \
++  daemon/restart_service.cpp \
+   daemon/transport_local.cpp \
+   daemon/usb.cpp \
+   daemon/usb_ffs.cpp \
+@@ -64,6 +66,7 @@ CPPFLAGS += \
+   -DPLATFORM_TOOLS_VERSION='"$(PLATFORM_TOOLS_VERSION)"' \
+   -DADB_HOST=0 \
+   -DADB_VERSION='"$(DEB_VERSION)"' \
++  -DALLOW_ADBD_ROOT=1 \
+   -DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION=1 \
+   -DPAGE_SIZE=4096 \
+   -Iframeworks/native/libs/adbd_auth/include/ \
+diff --git a/packages/modules/adb/daemon/framebuffer_service.h b/packages/modules/adb/daemon/framebuffer_service.h
+index bab44be..0a8c822 100644
+--- a/packages/modules/adb/daemon/framebuffer_service.h
++++ b/packages/modules/adb/daemon/framebuffer_service.h
+@@ -18,6 +18,6 @@
+ 
+ #include "adb_unique_fd.h"
+ 
+-#if defined(__ANDROID__)
++#if !defined(__ANDROID_RECOVERY__)
+ void framebuffer_service(unique_fd fd);
+ #endif
+diff --git a/packages/modules/adb/daemon/main.cpp b/packages/modules/adb/daemon/main.cpp
+index 83905d3..f177abf 100644
+--- a/packages/modules/adb/daemon/main.cpp
++++ b/packages/modules/adb/daemon/main.cpp
+@@ -19,11 +19,15 @@
+ #include "sysdeps.h"
+ 
+ #include <errno.h>
++#include <fcntl.h>
+ #include <getopt.h>
++#include <grp.h>
+ #include <malloc.h>
++#include <pwd.h>
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <sys/capability.h>
+ #include <sys/prctl.h>
+ 
+@@ -61,6 +65,13 @@
+ #include "daemon/mdns.h"
+ #include "daemon/watchdog.h"
+ 
++namespace {
++constexpr char kAdbRootStatePath[] = "/run/.adb.root";
++constexpr char kRootMagic[] = "#ROOT#";
++constexpr char kNoRootMagic[] = "#NOROOT#";
++constexpr size_t kRootMagicSize = sizeof(kRootMagic) - 1;
++}
++
+ #if defined(__ANDROID__)
+ static const char* root_seclabel = nullptr;
+ 
+@@ -75,24 +86,16 @@ static bool should_drop_privileges() {
+     //
+     // ro.secure:
+     //   Drop privileges by default. Set to 1 on userdebug and user builds.
+-    bool ro_secure = android::base::GetBoolProperty("ro.secure", true);
+-    bool ro_debuggable = __android_log_is_debuggable();
+-
+-    // Drop privileges if ro.secure is set...
+-    bool drop = ro_secure;
+-
+-    // ... except "adb root" lets you keep privileges in a debuggable build.
+-    std::string prop = android::base::GetProperty("service.adb.root", "");
+-    bool adb_root = (prop == "1");
+-    bool adb_unroot = (prop == "0");
+-    if (ro_debuggable && adb_root) {
+-        drop = false;
++    int f = unix_open(kAdbRootStatePath, O_RDONLY | O_CLOEXEC);
++    if (f < 0) {
++        return true;
+     }
+-    // ... and "adb unroot" lets you explicitly drop privileges.
+-    if (adb_unroot) {
+-        drop = true;
++    char buf[kRootMagicSize];
++    bool drop = true;
++    if (unix_read(f, buf, sizeof(buf)) != -1 && !strncmp(buf, kRootMagic, kRootMagicSize)) {
++        drop = false;
+     }
+-
++    unix_close(f);
+     return drop;
+ }
+ 
+@@ -122,6 +125,17 @@ static void drop_privileges(int server_port) {
+     // Don't listen on a port (default 5037) if running in secure mode.
+     // Don't run as root if running in secure mode.
+     if (should_drop_privileges()) {
++        int f = unix_open(kAdbRootStatePath, O_WRONLY | O_CREAT | O_CLOEXEC, 0666);
++        if (f >= 0) {
++            if (fchmod(f, 0666) == -1) {
++                PLOG(ERROR) << "failed to set root state permissions";
++            }
++            if (unix_write(f, kNoRootMagic, sizeof(kNoRootMagic) - 1) == -1) {
++                PLOG(ERROR) << "failed to initialize root state";
++            }
++            unix_close(f);
++        }
++
+         const bool should_drop_caps = !__android_log_is_debuggable();
+ 
+         if (should_drop_caps) {
+@@ -182,6 +196,51 @@ static void drop_privileges(int server_port) {
+ }
+ #endif
+ 
++#if !defined(__ANDROID__)
++static bool should_drop_privileges() {
++    int f = unix_open(kAdbRootStatePath, O_RDONLY | O_CLOEXEC);
++    if (f < 0) {
++        return true;
++    }
++    char buf[kRootMagicSize];
++    bool drop = true;
++    if (unix_read(f, buf, sizeof(buf)) != -1 && !strncmp(buf, kRootMagic, kRootMagicSize)) {
++        drop = false;
++    }
++    unix_close(f);
++    return drop;
++}
++
++static void drop_privileges(int) {
++    if (!should_drop_privileges()) {
++        return;
++    }
++    int f = unix_open(kAdbRootStatePath, O_WRONLY | O_CREAT | O_CLOEXEC, 0666);
++    if (f >= 0) {
++        if (fchmod(f, 0666) == -1) {
++            PLOG(ERROR) << "failed to set root state permissions";
++        }
++        if (unix_write(f, kNoRootMagic, sizeof(kNoRootMagic) - 1) == -1) {
++            PLOG(ERROR) << "failed to initialize root state";
++        }
++        unix_close(f);
++    }
++    passwd* adb_user = getpwnam("adb");
++    if (adb_user == nullptr) {
++        PLOG(FATAL) << "getpwnam(adb) failed";
++    }
++    if (initgroups(adb_user->pw_name, adb_user->pw_gid) != 0) {
++        PLOG(FATAL) << "initgroups(adb) failed";
++    }
++    if (setgid(adb_user->pw_gid) != 0) {
++        PLOG(FATAL) << "setgid(adb) failed";
++    }
++    if (setuid(adb_user->pw_uid) != 0) {
++        PLOG(FATAL) << "setuid(adb) failed";
++    }
++}
++#endif
++
+ static void setup_adb(const std::vector<std::string>& addrs) {
+ #if defined(__ANDROID__)
+     // Get the first valid port from addrs and setup mDNS.
+@@ -242,9 +301,7 @@ int adbd_main(int server_port) {
+           " unchanged.\n");
+     }
+ 
+-#if defined(__ANDROID__)
+     drop_privileges(server_port);
+-#endif
+ 
+ #if defined(__ANDROID__)
+     // A thread gets spawned as a side-effect of initializing the watchdog, so it needs to happen
+diff --git a/packages/modules/adb/daemon/restart_service.cpp b/packages/modules/adb/daemon/restart_service.cpp
+index 16d2627..fcba9c8 100644
+--- a/packages/modules/adb/daemon/restart_service.cpp
++++ b/packages/modules/adb/daemon/restart_service.cpp
+@@ -18,6 +18,9 @@
+ 
+ #include "sysdeps.h"
+ 
++#include <errno.h>
++#include <fcntl.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ #include <android-base/logging.h>
+@@ -28,6 +31,26 @@
+ #include "adb_io.h"
+ #include "adb_unique_fd.h"
+ 
++namespace {
++constexpr char kAdbRootStatePath[] = "/run/.adb.root";
++constexpr char kRootMagic[] = "#ROOT#";
++constexpr char kNoRootMagic[] = "#NOROOT#";
++constexpr size_t kRootMagicSize = sizeof(kRootMagic) - 1;
++
++bool write_root_state(const char* value, size_t size) {
++    int f = unix_open(kAdbRootStatePath, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0666);
++    if (f < 0) {
++        return false;
++    }
++    bool ok = unix_write(f, value, size) == static_cast<int>(size);
++    if (ok) {
++        ok = fsync(f) == 0;
++    }
++    unix_close(f);
++    return ok;
++}
++}
++
+ void restart_root_service(unique_fd fd) {
+     if (getuid() == 0) {
+         WriteFdExactly(fd.get(), "adbd is already running as root\n");
+@@ -38,9 +61,15 @@ void restart_root_service(unique_fd fd) {
+         return;
+     }
+ 
+-    LOG(INFO) << "adbd restarting as root";
+-    android::base::SetProperty("service.adb.root", "1");
+-    WriteFdExactly(fd.get(), "restarting adbd as root\n");
++    for (int retry = 5; retry-- > 0;) {
++        if (write_root_state(kRootMagic, kRootMagicSize)) {
++            LOG(INFO) << "adbd restarting as root";
++            WriteFdExactly(fd.get(), "restarting adbd as root\n");
++            return;
++        }
++        usleep(100000);
++    }
++    WriteFdExactly(fd.get(), "failed to switch adbd to root\n");
+ }
+ 
+ void restart_unroot_service(unique_fd fd) {
+@@ -49,8 +78,11 @@ void restart_unroot_service(unique_fd fd) {
+         return;
+     }
+ 
++    if (!write_root_state(kNoRootMagic, sizeof(kNoRootMagic) - 1)) {
++        PLOG(ERROR) << "failed to write root state";
++        return;
++    }
+     LOG(INFO) << "adbd restarting as nonroot";
+-    android::base::SetProperty("service.adb.root", "0");
+     WriteFdExactly(fd.get(), "restarting adbd as non root\n");
+ }
+ 
+diff --git a/packages/modules/adb/daemon/restart_service.h b/packages/modules/adb/daemon/restart_service.h
+index 19840bd..2d239db 100644
+--- a/packages/modules/adb/daemon/restart_service.h
++++ b/packages/modules/adb/daemon/restart_service.h
+@@ -18,7 +18,7 @@
+ 
+ #include "adb_unique_fd.h"
+ 
+-#if defined(__ANDROID__)
++#if !defined(__ANDROID_RECOVERY__)
+ void restart_root_service(unique_fd fd);
+ void restart_unroot_service(unique_fd fd);
+ void restart_tcp_service(unique_fd fd, int port);
+diff --git a/packages/modules/adb/daemon/services.cpp b/packages/modules/adb/daemon/services.cpp
+index 5090441..1b27314 100644
+--- a/packages/modules/adb/daemon/services.cpp
++++ b/packages/modules/adb/daemon/services.cpp
+@@ -19,12 +19,18 @@
+ #include "sysdeps.h"
+ 
+ #include <errno.h>
++#include <fcntl.h>
++#include <linux/fs.h>
++#include <linux/reboot.h>
++#include <mntent.h>
+ #include <netdb.h>
+ #include <netinet/in.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/mount.h>
++#include <sys/syscall.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+@@ -40,7 +46,6 @@
+ #include <android-base/stringprintf.h>
+ #include <android-base/strings.h>
+ #include <android-base/unique_fd.h>
+-#include <cutils/android_reboot.h>
+ #include <cutils/sockets.h>
+ #include <log/log_properties.h>
+ 
+@@ -143,6 +148,60 @@ static void spin_service(unique_fd fd) {
+     WriteFdExactly(fd.get(), "spinning\n");
+ }
+ 
++static std::string find_mount(std::string_view dir) {
++    std::unique_ptr<FILE, int (*)(FILE*)> fp(setmntent("/proc/mounts", "r"), endmntent);
++    if (!fp) {
++        return {};
++    }
++    while (mntent* entry = getmntent(fp.get())) {
++        if (dir == entry->mnt_dir) {
++            return entry->mnt_fsname;
++        }
++    }
++    return {};
++}
++
++static bool make_block_device_writable(const std::string& dev) {
++    android::base::unique_fd fd(unix_open(dev.c_str(), O_RDONLY | O_CLOEXEC));
++    if (fd == -1) {
++        return false;
++    }
++    int off = 0;
++    return ioctl(fd.get(), BLKROSET, &off) != -1;
++}
++
++static bool remount_partition(unique_fd& fd, std::string_view dir) {
++    std::string mount_point(dir);
++    if (!directory_exists(mount_point)) {
++        return true;
++    }
++    std::string dev = find_mount(dir);
++    if (dev.empty()) {
++        WriteFdFmt(fd.get(), "remount of %.*s failed; mount not found\n",
++                   static_cast<int>(dir.size()), dir.data());
++        return false;
++    }
++    if (!make_block_device_writable(dev)) {
++        WriteFdFmt(fd.get(), "remount of %.*s failed; couldn't make block device %s writable: %s\n",
++                   static_cast<int>(dir.size()), dir.data(), dev.c_str(), strerror(errno));
++        return false;
++    }
++    if (mount(dev.c_str(), mount_point.c_str(), "none", MS_REMOUNT, nullptr) == -1) {
++        WriteFdFmt(fd.get(), "remount of %.*s failed: %s\n", static_cast<int>(dir.size()), dir.data(), strerror(errno));
++        return false;
++    }
++    return true;
++}
++
++static void remount_service(unique_fd fd) {
++    if (getuid() != 0) {
++        WriteFdExactly(fd.get(), "Not running as root. Try \"adb root\" first.\n");
++        return;
++    }
++    bool success = remount_partition(fd, "/");
++    WriteFdExactly(fd.get(), success ? "remount succeeded\n" : "remount failed\n");
++}
++
+ [[maybe_unused]] static unique_fd reboot_device(const std::string& name) {
+ #if defined(__ANDROID_RECOVERY__)
+     if (!__android_log_is_debuggable()) {
+@@ -157,10 +216,16 @@ static void spin_service(unique_fd fd) {
+         return create_service_thread("reboot", reboot_service);
+     }
+ #endif
+-    // Fall through
+-    std::string cmd = "/system/bin/reboot ";
+-    cmd += name;
+-    return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);
++    auto reboot_service = [name](unique_fd fd) {
++        sync();
++        if (syscall(SYS_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2,
++                    LINUX_REBOOT_CMD_RESTART2, "adb") != 0) {
++            WriteFdFmt(fd.get(), "reboot (%s) failed: %s\n", name.c_str(), strerror(errno));
++            return;
++        }
++        while (true) pause();
++    };
++    return create_service_thread("reboot", reboot_service);
+ }
+ 
+ struct ServiceSocket : public asocket {
+@@ -281,13 +346,11 @@ unique_fd daemon_service_to_fd(std::string_view name, atransport* transport) {
+     }
+ #endif
+ 
+-#if defined(__ANDROID__)
++#if !defined(__ANDROID_RECOVERY__)
+     if (name.starts_with("framebuffer:")) {
+         return create_service_thread("fb", framebuffer_service);
+     } else if (android::base::ConsumePrefix(&name, "remount:")) {
+-        std::string cmd = "/system/bin/remount ";
+-        cmd += name;
+-        return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);
++        return create_service_thread("remount", remount_service);
+     } else if (android::base::ConsumePrefix(&name, "reboot:")) {
+         return reboot_device(std::string(name));
+     } else if (name.starts_with("root:")) {
+diff --git a/packages/modules/adb/sockets.cpp b/packages/modules/adb/sockets.cpp
+index f766f7e..8aa1e2b 100644
+--- a/packages/modules/adb/sockets.cpp
++++ b/packages/modules/adb/sockets.cpp
+@@ -337,7 +337,7 @@ static void local_socket_destroy(asocket* s) {
+ 
+     if (exit_on_close) {
+         D("local_socket_destroy: exiting");
+-        exit(0);
++        exit(exit_on_close - 1);
+     }
+ }
+ 
+@@ -473,9 +473,21 @@ asocket* create_local_service_socket(std::string_view name, atransport* transpor
+     LOG(VERBOSE) << "LS(" << s->id << "): bound to '" << name << "' via " << fd_value;
+ 
+ #if !ADB_HOST
+-    if ((name.starts_with("root:") && getuid() != 0 && __android_log_is_debuggable()) ||
+-        (name.starts_with("unroot:") && getuid() == 0) || name.starts_with("usb:") ||
+-        name.starts_with("tcpip:")) {
++    bool exit_on_close = false;
++#if defined(__ANDROID__)
++    exit_on_close = (name.starts_with("root:") && getuid() != 0 &&
++                     __android_log_is_debuggable()) ||
++                    (name.starts_with("unroot:") && getuid() == 0);
++#else
++    exit_on_close = (name.starts_with("root:") && getuid() != 0) ||
++                    (name.starts_with("unroot:") && getuid() == 0);
++#endif
++    // exit_on_close == 2: exit(1) — triggers Restart=on-failure (root/unroot)
++    // exit_on_close == 1: exit(0) — clean exit (usb/tcpip)
++    if (exit_on_close) {
++        D("LS(%d): enabling exit_on_close", s->id);
++        s->exit_on_close = 2;
++    } else if (name.starts_with("usb:") || name.starts_with("tcpip:")) {
+         D("LS(%d): enabling exit_on_close", s->id);
+         s->exit_on_close = 1;
+     }
+diff --git a/packages/modules/adb/transport.cpp b/packages/modules/adb/transport.cpp
+index b99e8bc..b89f495 100644
+--- a/packages/modules/adb/transport.cpp
++++ b/packages/modules/adb/transport.cpp
+@@ -1200,7 +1200,6 @@ const FeatureSet& supported_features() {
+             kFeatureAbb,
+             kFeatureFixedPushSymlinkTimestamp,
+             kFeatureAbbExec,
+-            kFeatureRemountShell,
+             kFeatureTrackApp,
+             kFeatureSendRecv2,
+             kFeatureSendRecv2Brotli,
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0007-libcutils-guard-Android-private-header-with-addition.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0007-libcutils-guard-Android-private-header-with-addition.patch
new file mode 100644
index 0000000000..aa5ffc2825
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0007-libcutils-guard-Android-private-header-with-addition.patch
@@ -0,0 +1,36 @@
+From 35e41ab351e03abcd2709f136c57df7bc4855532 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Wed, 10 Jun 2026 00:00:00 +0000
+Subject: [PATCH] libcutils: guard Android-private header with additional
+ __has_include check
+
+The properties.cpp file uses __has_include(<sys/system_properties.h>) to
+conditionally compile the Android bionic property system implementation.
+However, some Linux host environments (e.g. those with Android SDK headers
+installed in /usr/local/include) have sys/system_properties.h without the
+accompanying private header sys/_system_properties.h.
+
+Guard both the public and private header inclusion to prevent a fatal error
+on such hosts.
+
+Upstream-Status: Inappropriate [OE-specific, guards against host header contamination]
+
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ system/core/libcutils/properties.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/system/core/libcutils/properties.cpp b/system/core/libcutils/properties.cpp
+index 03f0496..fd0f6c3 100644
+--- a/system/core/libcutils/properties.cpp
++++ b/system/core/libcutils/properties.cpp
+@@ -91,7 +91,8 @@ int property_get(const char* key, char* value, const char* default_value) {
+     return len;
+ }
+ 
+-#if __has_include(<sys/system_properties.h>)
++#if __has_include(<sys/system_properties.h>) && \
++    __has_include(<sys/_system_properties.h>)
+ 
+ #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
+ #include <sys/_system_properties.h>
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0008-adb-GCC-compatibility-fixes-for-usb_linux-and-sysdep.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0008-adb-GCC-compatibility-fixes-for-usb_linux-and-sysdep.patch
new file mode 100644
index 0000000000..ae7de97e49
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0008-adb-GCC-compatibility-fixes-for-usb_linux-and-sysdep.patch
@@ -0,0 +1,197 @@
+From 67a400310c07fad8f9ecc0058203942237ab6325 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Wed, 10 Jun 2026 00:00:00 +0000
+Subject: [PATCH] adb: GCC compatibility fixes for usb_linux, sysdeps, and adbd
+
+GCC-specific issues when building adb/adbd with GCC instead of Clang:
+
+1. usb_linux.cpp embeds usbdevfs_urb (which ends in a flexible array member
+   iso_frame_desc[]) in a non-last position inside struct usb_handle. GCC
+   rejects this as a hard error. Introduce usbdevfs_urb_bulk, a copy of the
+   struct without the FAM, for use in embedding contexts.
+
+2. sysdeps.h uses #define write/pwrite to redirect callers to adb_write/
+   adb_pwrite. GCC's newer abseil in the native sysroot calls ostream::write()
+   which gets incorrectly macro-expanded. Replace the #define redirects with
+   #pragma GCC poison.
+
+3. adbd.mk links -lprotobuf but with protobuf 6.x the abseil log helpers are
+   no longer pulled in transitively. Add -labsl_log_internal_message and
+   -labsl_log_internal_check_op explicitly.
+
+Upstream-Status: Inappropriate [OE-specific, GCC compat]
+
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ debian/system/adb.mk                      |  2 ++
+ debian/system/adbd.mk                     |  2 ++
+ packages/modules/adb/client/usb_linux.cpp | 44 ++++++++++++++++-------
+ packages/modules/adb/sysdeps.h            | 11 ++----
+ 4 files changed, 37 insertions(+), 22 deletions(-)
+
+diff --git a/debian/system/adb.mk b/debian/system/adb.mk
+index 90a816f..6c9b4ce 100644
+--- a/debian/system/adb.mk
++++ b/debian/system/adb.mk
+@@ -95,6 +95,8 @@ LDFLAGS += \
+   -llog \
+   -llz4 \
+   -lprotobuf \
++  -labsl_log_internal_message \
++  -labsl_log_internal_check_op \
+   -lpthread \
+   -l:libssl.so.0 \
+   -lusb-1.0 \
+diff --git a/debian/system/adbd.mk b/debian/system/adbd.mk
+index beb412e..e755f20 100644
+--- a/debian/system/adbd.mk
++++ b/debian/system/adbd.mk
+@@ -97,6 +97,8 @@ LDFLAGS += \
+   -llog \
+   -llz4 \
+   -lprotobuf \
++  -labsl_log_internal_message \
++  -labsl_log_internal_check_op \
+   -lresolv \
+   -l:libssl.so.0 \
+   -lzstd \
+diff --git a/packages/modules/adb/client/usb_linux.cpp b/packages/modules/adb/client/usb_linux.cpp
+index 96d7a8a..ecc1035 100644
+--- a/packages/modules/adb/client/usb_linux.cpp
++++ b/packages/modules/adb/client/usb_linux.cpp
+@@ -57,6 +57,27 @@ using namespace std::literals;
+ /* usb scan debugging is waaaay too verbose */
+ #define DBGX(x...)
+ 
++// usbdevfs_urb embeds a flexible array member iso_frame_desc[]. Embedding this
++// struct in another struct in a non-last position is a hard GCC error. Since
++// ADB only uses bulk endpoints (never ISO), define a wrapper type without the
++// FAM to use for struct embedding.
++struct usbdevfs_urb_bulk {
++    unsigned char type;
++    unsigned char endpoint;
++    int status;
++    unsigned int flags;
++    void* buffer;
++    int buffer_length;
++    int actual_length;
++    int start_frame;
++    union { int number_of_packets; unsigned int stream_id; };
++    int error_count;
++    unsigned int signr;
++    void* usercontext;
++};
++static_assert(sizeof(usbdevfs_urb_bulk) == sizeof(usbdevfs_urb),
++              "usbdevfs_urb_bulk size mismatch");
++
+ struct usb_handle {
+     ~usb_handle() {
+         if (fd != -1) unix_close(fd);
+@@ -74,11 +95,8 @@ struct usb_handle {
+     // The usbdevfs_urb structure ends in a variable length array of
+     // usbdevfs_iso_packet_desc. Since none of the usb calls ever attempt
+     // to fill in those values, ignore this warning.
+-#pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Wgnu-variable-sized-type-not-at-end"
+-    usbdevfs_urb urb_in;
+-    usbdevfs_urb urb_out;
+-#pragma clang diagnostic pop
++    usbdevfs_urb_bulk urb_in;
++    usbdevfs_urb_bulk urb_out;
+ 
+     bool urb_in_busy = false;
+     bool urb_out_busy = false;
+@@ -316,7 +334,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) {
+     std::unique_lock<std::mutex> lock(h->mutex);
+     D("++ usb_bulk_write ++");
+ 
+-    usbdevfs_urb* urb = &h->urb_out;
++    usbdevfs_urb_bulk* urb = &h->urb_out;
+     memset(urb, 0, sizeof(*urb));
+     urb->type = USBDEVFS_URB_TYPE_BULK;
+     urb->endpoint = h->ep_out;
+@@ -329,7 +347,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) {
+         return -1;
+     }
+ 
+-    if (TEMP_FAILURE_RETRY(ioctl(h->fd, USBDEVFS_SUBMITURB, urb)) == -1) {
++    if (TEMP_FAILURE_RETRY(ioctl(h->fd, USBDEVFS_SUBMITURB, reinterpret_cast<usbdevfs_urb*>(urb))) == -1) {
+         return -1;
+     }
+ 
+@@ -355,7 +373,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+     std::unique_lock<std::mutex> lock(h->mutex);
+     D("++ usb_bulk_read ++");
+ 
+-    usbdevfs_urb* urb = &h->urb_in;
++    usbdevfs_urb_bulk* urb = &h->urb_in;
+     memset(urb, 0, sizeof(*urb));
+     urb->type = USBDEVFS_URB_TYPE_BULK;
+     urb->endpoint = h->ep_in;
+@@ -368,7 +386,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+         return -1;
+     }
+ 
+-    if (TEMP_FAILURE_RETRY(ioctl(h->fd, USBDEVFS_SUBMITURB, urb)) == -1) {
++    if (TEMP_FAILURE_RETRY(ioctl(h->fd, USBDEVFS_SUBMITURB, reinterpret_cast<usbdevfs_urb*>(urb))) == -1) {
+         return -1;
+     }
+ 
+@@ -400,7 +418,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+         }
+         D("[ urb @%p status = %d, actual = %d ]", out, out->status, out->actual_length);
+ 
+-        if (out == &h->urb_in) {
++        if (out == reinterpret_cast<usbdevfs_urb*>(&h->urb_in)) {
+             D("[ reap urb - IN complete ]");
+             h->urb_in_busy = false;
+             if (urb->status != 0) {
+@@ -409,7 +427,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+             }
+             return urb->actual_length;
+         }
+-        if (out == &h->urb_out) {
++        if (out == reinterpret_cast<usbdevfs_urb*>(&h->urb_out)) {
+             D("[ reap urb - OUT compelete ]");
+             h->urb_out_busy = false;
+             h->cv.notify_all();
+@@ -513,8 +531,8 @@ void usb_kick(usb_handle* h) {
+             ** but this ensures that a reader blocked on REAPURB
+             ** will get unblocked
+             */
+-            ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_in);
+-            ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_out);
++            ioctl(h->fd, USBDEVFS_DISCARDURB, reinterpret_cast<usbdevfs_urb*>(&h->urb_in));
++            ioctl(h->fd, USBDEVFS_DISCARDURB, reinterpret_cast<usbdevfs_urb*>(&h->urb_out));
+             h->urb_in.status = -ENODEV;
+             h->urb_out.status = -ENODEV;
+             h->urb_in_busy = false;
+diff --git a/packages/modules/adb/sysdeps.h b/packages/modules/adb/sysdeps.h
+index 9a99295..b364a47 100644
+--- a/packages/modules/adb/sysdeps.h
++++ b/packages/modules/adb/sysdeps.h
+@@ -141,11 +141,7 @@ static inline int unix_read(borrowed_fd fd, void* buf, size_t len) {
+ static inline int unix_write(borrowed_fd fd, const void* buf, size_t len) {
+     return write(fd.get(), buf, len);
+ }
+-#undef   write
+-#define  write  ___xxx_write
+-
+-#undef pwrite
+-#define pwrite ___xxx_pwrite
++// (write and pwrite macros omitted: incompatible with GCC/abseil compat)
+ 
+ // See the comments for the !defined(_WIN32) version of unix_lseek().
+ static inline int unix_lseek(borrowed_fd fd, int pos, int where) {
+@@ -549,10 +545,7 @@ static inline int adb_pwrite(int fd, const void* buf, size_t len, off64_t offset
+ #endif
+ }
+ 
+-#undef   write
+-#define  write  ___xxx_write
+-#undef pwrite
+-#define pwrite ___xxx_pwrite
++// (write and pwrite macros omitted: incompatible with GCC/abseil compat)
+ 
+ static inline int64_t adb_lseek(borrowed_fd fd, int64_t pos, int where) {
+ #if defined(__APPLE__)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0009-libbase-include-stdint.h-in-hex.cpp.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0009-libbase-include-stdint.h-in-hex.cpp.patch
new file mode 100644
index 0000000000..179f97363f
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0009-libbase-include-stdint.h-in-hex.cpp.patch
@@ -0,0 +1,26 @@
+From 164b4261fd5abd851a432c7d56280b1b1adc7f2b Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Wed, 10 Jun 2026 00:00:00 +0000
+Subject: [PATCH] libbase: include stdint.h in hex.cpp
+
+hex.cpp uses uint8_t but neither the file nor its transitive headers
+always pull in <stdint.h> on every sysroot.  Add an explicit include.
+
+Upstream-Status: Inappropriate [OE-specific sysroot compat]
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ system/libbase/hex.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/system/libbase/hex.cpp b/system/libbase/hex.cpp
+index a4b7715..857ff29 100644
+--- a/system/libbase/hex.cpp
++++ b/system/libbase/hex.cpp
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include "android-base/hex.h"
++#include <stdint.h>
+ 
+ #include "android-base/logging.h"
+ 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0010-adbd-make-systemd-sd_notify-conditional-on-HAVE_SYSTEMD.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0010-adbd-make-systemd-sd_notify-conditional-on-HAVE_SYSTEMD.patch
new file mode 100644
index 0000000000..a8c16a41d4
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0010-adbd-make-systemd-sd_notify-conditional-on-HAVE_SYSTEMD.patch
@@ -0,0 +1,54 @@
+From 8874be8b9a3906c5720d75320b176b51523b6c15 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Fri, 12 Jun 2026 15:54:47 +0200
+Subject: [PATCH] adbd: make systemd sd_notify conditional on HAVE_SYSTEMD
+
+Guard the sd-daemon.h include and sd_notify() call behind HAVE_SYSTEMD
+instead of __linux__, so the feature is opt-in via a recipe PACKAGECONFIG.
+Add a corresponding ifeq block in debian/system/adbd.mk to pass
+-DHAVE_SYSTEMD and -lsystemd only when the flag is set.
+
+Upstream-Status: Inappropriate [OE-specific]
+---
+ debian/system/adbd.mk                | 5 +++++
+ packages/modules/adb/daemon/main.cpp | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/debian/system/adbd.mk b/debian/system/adbd.mk
+index e755f20..a3f88f1 100644
+--- a/debian/system/adbd.mk
++++ b/debian/system/adbd.mk
+@@ -104,6 +104,11 @@ LDFLAGS += \
+   -lzstd \
+   -pie \
+ 
++ifeq ($(HAVE_SYSTEMD),1)
++LDFLAGS += -lsystemd
++CPPFLAGS += -DHAVE_SYSTEMD
++endif
++
+ STATIC_LIBS = \
+   debian/out/system/libadb.a \
+   debian/out/system/libcrypto_utils.a \
+diff --git a/packages/modules/adb/daemon/main.cpp b/packages/modules/adb/daemon/main.cpp
+index f177abf..789c25b 100644
+--- a/packages/modules/adb/daemon/main.cpp
++++ b/packages/modules/adb/daemon/main.cpp
+@@ -49,7 +49,7 @@
+ #include "selinux/android.h"
+ #endif
+ 
+-#if defined(__linux__)
++#if defined(HAVE_SYSTEMD)
+ #include <systemd/sd-daemon.h>
+ #endif
+ 
+@@ -365,7 +365,7 @@ int adbd_main(int server_port) {
+     init_jdwp();
+     D("adbd_main(): post init_jdwp()");
+ 
+-#if defined(__linux__)
++#if defined(HAVE_SYSTEMD)
+     sd_notify(1, "READY=1");
+ #endif
+ 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk b/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk
deleted file mode 100644
index 0687c22c17..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# Makefile for adb
-
-SRCDIR ?= $(S)
-
-VPATH += $(SRCDIR)/system/core/adb
-adb_SRC_FILES += adb.c
-adb_SRC_FILES += console.c
-adb_SRC_FILES += transport.c
-adb_SRC_FILES += transport_local.c
-adb_SRC_FILES += transport_usb.c
-adb_SRC_FILES += commandline.c
-adb_SRC_FILES += adb_client.c
-adb_SRC_FILES += adb_auth_host.c
-adb_SRC_FILES += sockets.c
-adb_SRC_FILES += services.c
-adb_SRC_FILES += file_sync_client.c
-adb_SRC_FILES += get_my_path_linux.c
-adb_SRC_FILES += usb_linux.c
-adb_SRC_FILES += usb_vendors.c
-adb_SRC_FILES += fdevent.c
-adb_OBJS := $(adb_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libcutils
-libcutils_SRC_FILES += atomic.c
-libcutils_SRC_FILES += hashmap.c
-libcutils_SRC_FILES += native_handle.c
-libcutils_SRC_FILES += config_utils.c
-libcutils_SRC_FILES += cpu_info.c
-libcutils_SRC_FILES += load_file.c
-# libcutils_SRC_FILES += open_memstream.c
-# libcutils_SRC_FILES += strdup16to8.c
-# libcutils_SRC_FILES += strdup8to16.c
-# libcutils_SRC_FILES += record_stream.c
-# libcutils_SRC_FILES += process_name.c
-# libcutils_SRC_FILES += threads.c
-# libcutils_SRC_FILES += sched_policy.c
-# libcutils_SRC_FILES += iosched_policy.c
-libcutils_SRC_FILES += str_parms.c
-libcutils_SRC_FILES += fs.c
-libcutils_SRC_FILES += multiuser.c
-libcutils_SRC_FILES += socket_inaddr_any_server.c
-libcutils_SRC_FILES += socket_local_client.c
-libcutils_SRC_FILES += socket_local_server.c
-libcutils_SRC_FILES += socket_loopback_client.c
-libcutils_SRC_FILES += socket_loopback_server.c
-libcutils_SRC_FILES += socket_network_client.c
-libcutils_SRC_FILES += sockets.c
-libcutils_SRC_FILES += ashmem-host.c
-libcutils_SRC_FILES += dlmalloc_stubs.c
-libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o)
-
-CFLAGS += -DANDROID
-CFLAGS += -DWORKAROUND_BUG6558362
-CFLAGS += -DADB_HOST=1
-CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
-CFLAGS += -DANDROID_SMP=0
-CFLAGS += -I$(SRCDIR)/system/core/adb
-CFLAGS += -I$(SRCDIR)/system/core/include
-CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h
-
-LIBS += libcutils.a -lpthread -lcrypto
-
-all: adb
-
-adb: libcutils.a $(adb_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(adb_OBJS) $(LIBS)
-
-libcutils.a: $(libcutils_OBJS)
-        $(AR) rcs $@ $(libcutils_OBJS)
-
-clean:
-        $(RM) $(adb_OBJS) $(libcutils_OBJS) adb *.a
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk b/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk
deleted file mode 100644
index 31452ae104..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk
+++ /dev/null
@@ -1,164 +0,0 @@
-# Makefile for adbd
-
-SRCDIR ?= $(S)
-
-VPATH += $(SRCDIR)/system/core/adb
-adbd_SRC_FILES += adb.c
-adbd_SRC_FILES += fdevent.c
-adbd_SRC_FILES += transport.c
-adbd_SRC_FILES += transport_local.c
-adbd_SRC_FILES += transport_usb.c
-adbd_SRC_FILES += adb_auth_client.c
-adbd_SRC_FILES += sockets.c
-adbd_SRC_FILES += services.c
-adbd_SRC_FILES += file_sync_service.c
-adbd_SRC_FILES += jdwp_service.c
-adbd_SRC_FILES += framebuffer_service.c
-adbd_SRC_FILES += remount_service.c
-adbd_SRC_FILES += disable_verity_service.c
-adbd_SRC_FILES += base64.c
-adbd_SRC_FILES += usb_linux_client.c
-adbd_OBJS := $(adbd_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/liblog
-liblog_SRC_FILES += logd_write.c
-liblog_SRC_FILES += log_event_write.c
-liblog_SRC_FILES += logprint.c
-liblog_SRC_FILES += event_tag_map.c
-liblog_SRC_FILES += fake_log_device.c
-liblog_OBJS := $(liblog_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/fs_mgr
-fs_mgr_SRC_FILES += fs_mgr_fstab.c
-fs_mgr_OBJS := $(fs_mgr_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libcutils
-libcutils_SRC_FILES += atomic.c
-libcutils_SRC_FILES += hashmap.c
-libcutils_SRC_FILES += native_handle.c
-libcutils_SRC_FILES += config_utils.c
-libcutils_SRC_FILES += cpu_info.c
-libcutils_SRC_FILES += load_file.c
-# libcutils_SRC_FILES += open_memstream.c
-# libcutils_SRC_FILES += strdup16to8.c
-# libcutils_SRC_FILES += strdup8to16.c
-# libcutils_SRC_FILES += record_stream.c
-# libcutils_SRC_FILES += process_name.c
-# libcutils_SRC_FILES += threads.c
-# libcutils_SRC_FILES += sched_policy.c
-# libcutils_SRC_FILES += iosched_policy.c
-libcutils_SRC_FILES += str_parms.c
-libcutils_SRC_FILES += fs.c
-libcutils_SRC_FILES += multiuser.c
-libcutils_SRC_FILES += socket_inaddr_any_server.c
-libcutils_SRC_FILES += socket_local_client.c
-libcutils_SRC_FILES += socket_local_server.c
-libcutils_SRC_FILES += socket_loopback_client.c
-libcutils_SRC_FILES += socket_loopback_server.c
-libcutils_SRC_FILES += socket_network_client.c
-libcutils_SRC_FILES += sockets.c
-libcutils_SRC_FILES += ashmem-host.c
-libcutils_SRC_FILES += dlmalloc_stubs.c
-libcutils_SRC_FILES += klog.c
-libcutils_SRC_FILES += properties.c
-libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/external/libselinux/src
-libselinux_SRC_FILES += booleans.c
-libselinux_SRC_FILES += canonicalize_context.c
-libselinux_SRC_FILES += disable.c
-libselinux_SRC_FILES += enabled.c
-libselinux_SRC_FILES += fgetfilecon.c
-libselinux_SRC_FILES += fsetfilecon.c
-libselinux_SRC_FILES += getenforce.c
-libselinux_SRC_FILES += getfilecon.c
-libselinux_SRC_FILES += getpeercon.c
-libselinux_SRC_FILES += lgetfilecon.c
-libselinux_SRC_FILES += load_policy.c
-libselinux_SRC_FILES += lsetfilecon.c
-libselinux_SRC_FILES += policyvers.c
-libselinux_SRC_FILES += procattr.c
-libselinux_SRC_FILES += setenforce.c
-libselinux_SRC_FILES += setfilecon.c
-libselinux_SRC_FILES += context.c
-libselinux_SRC_FILES += mapping.c
-libselinux_SRC_FILES += stringrep.c
-libselinux_SRC_FILES += compute_create.c
-libselinux_SRC_FILES += compute_av.c
-libselinux_SRC_FILES += avc.c
-libselinux_SRC_FILES += avc_internal.c
-libselinux_SRC_FILES += avc_sidtab.c
-libselinux_SRC_FILES += get_initial_context.c
-libselinux_SRC_FILES += checkAccess.c
-libselinux_SRC_FILES += sestatus.c
-libselinux_SRC_FILES += deny_unknown.c
-
-libselinux_SRC_FILES += callbacks.c
-libselinux_SRC_FILES += check_context.c
-libselinux_SRC_FILES += freecon.c
-libselinux_SRC_FILES += init.c
-libselinux_SRC_FILES += label.c
-libselinux_SRC_FILES += label_file.c
-libselinux_SRC_FILES += label_android_property.c
-libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/extras/ext4_utils
-libext4_utils_SRC_FILES += make_ext4fs.c
-libext4_utils_SRC_FILES += ext4fixup.c
-libext4_utils_SRC_FILES += ext4_utils.c
-libext4_utils_SRC_FILES += allocate.c
-libext4_utils_SRC_FILES += contents.c
-libext4_utils_SRC_FILES += extent.c
-libext4_utils_SRC_FILES += indirect.c
-libext4_utils_SRC_FILES += uuid.c
-libext4_utils_SRC_FILES += sha1.c
-libext4_utils_SRC_FILES += wipe.c
-libext4_utils_SRC_FILES += crc16.c
-libext4_utils_SRC_FILES += ext4_sb.c
-libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o)
-
-CFLAGS += -std=gnu11
-CFLAGS += -DANDROID
-CFLAGS += -DADB_HOST=0
-CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
-CFLAGS += -DALLOW_ADBD_ROOT=1
-CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1
-CFLAGS += -DPROP_NAME_MAX=32
-CFLAGS += -DPROP_VALUE_MAX=92
-CFLAGS += -DAUDITD_LOG_TAG=1003
-# CFLAGS += -DHOST
-CFLAGS += -DANDROID_SMP=0
-CFLAGS += -I$(SRCDIR)/system/core/adb
-CFLAGS += -I$(SRCDIR)/system/core/include
-CFLAGS += -I$(SRCDIR)/system/core/libsparse/include
-CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils
-CFLAGS += -I$(SRCDIR)/system/core/fs_mgr/include
-CFLAGS += -I$(SRCDIR)/hardware/libhardware/include
-CFLAGS += -I$(SRCDIR)/external/libselinux/include
-CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h
-
-LIBS += liblog.a libfs_mgr.a libcutils.a libselinux.a libext4_utils.a -lpthread -lbsd -lpcre -lresolv -lcrypto
-
-all: adbd
-
-adbd: liblog.a libfs_mgr.a libcutils.a libselinux.a libext4_utils.a $(adbd_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(adbd_OBJS) $(LIBS)
-
-liblog.a: $(liblog_OBJS)
-        $(AR) rcs $@ $(liblog_OBJS)
-
-libfs_mgr.a: $(fs_mgr_OBJS)
-        $(AR) rcs $@ $(fs_mgr_OBJS)
-
-libcutils.a: $(libcutils_OBJS)
-        $(AR) rcs $@ $(libcutils_OBJS)
-
-libselinux.a: $(libselinux_OBJS)
-        export CFLAGS="-DANDROID -DHOST"
-        $(AR) rcs $@ $(libselinux_OBJS)
-
-libext4_utils.a: $(libext4_utils_OBJS)
-        $(AR) rcs $@ $(libext4_utils_OBJS)
-
-clean:
-        $(RM) *.o *.a adbd
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 b6661f2e39..7c16b5cea2 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
@@ -4,7 +4,7 @@ ConditionPathExists=/etc/usb-debugging-enabled
 Before=android-system.service
 
 [Service]
-Type=simple
+Type=notify
 Restart=on-failure
 ExecStartPre=-/usr/bin/android-gadget-setup adb
 ExecStart=/usr/bin/adbd
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch b/meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch
deleted file mode 100644
index c091fd404b..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch
+++ /dev/null
@@ -1,361 +0,0 @@
-From 82dce13ea7b5b31c63851bd67f66072413917e73 Mon Sep 17 00:00:00 2001
-From: Chenxi Mao <maochenxi@eswin.com>
-Date: Mon, 20 Apr 2020 15:32:40 +0800
-Subject: [PATCH 1/1] Riscv: Add risc-v Android config header
-
----
-Upstream-Status: Pending
-
- .../arch/linux-riscv64/AndroidConfig.h        | 340 ++++++++++++++++++
- 1 file changed, 340 insertions(+)
- create mode 100644 core/combo/include/arch/linux-riscv64/AndroidConfig.h
-
-diff --git a/core/combo/include/arch/linux-riscv64/AndroidConfig.h b/core/combo/include/arch/linux-riscv64/AndroidConfig.h
-new file mode 100644
-index 0000000000..bcbda8f87f
---- /dev/null
-+++ b/core/combo/include/arch/linux-riscv64/AndroidConfig.h
-@@ -0,0 +1,340 @@
-+/*
-+ * Copyright (C) 2013 The Android Open Source Project
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *      http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+/*
-+ * Android config -- "android-aarch64".  Used for ARM aarch64 device builds.
-+ */
-+#ifndef _ANDROID_CONFIG_H
-+#define _ANDROID_CONFIG_H
-+
-+/*
-+ * ===========================================================================
-+ *                              !!! IMPORTANT !!!
-+ * ===========================================================================
-+ *
-+ * This file is included by ALL C/C++ source files.  Don't put anything in
-+ * here unless you are absolutely certain it can't go anywhere else.
-+ *
-+ * Any C++ stuff must be wrapped with "#ifdef __cplusplus".  Do not use "//"
-+ * comments.
-+ */
-+
-+/*
-+ * Threading model.  Choose one:
-+ *
-+ * HAVE_PTHREADS - use the pthreads library.
-+ * HAVE_WIN32_THREADS - use Win32 thread primitives.
-+ *  -- combine HAVE_CREATETHREAD, HAVE_CREATEMUTEX, and HAVE__BEGINTHREADEX
-+ */
-+#define HAVE_PTHREADS
-+
-+/*
-+ * Do we have pthread_setname_np()?
-+ *
-+ * (HAVE_PTHREAD_SETNAME_NP is used by WebKit to enable a function with
-+ * the same name but different parameters, so we can't use that here.)
-+ */
-+#define HAVE_ANDROID_PTHREAD_SETNAME_NP
-+
-+/*
-+ * Do we have the futex syscall?
-+ */
-+#define HAVE_FUTEX
-+
-+/*
-+ * Process creation model.  Choose one:
-+ *
-+ * HAVE_FORKEXEC - use fork() and exec()
-+ * HAVE_WIN32_PROC - use CreateProcess()
-+ */
-+#define HAVE_FORKEXEC
-+
-+/*
-+ * Process out-of-memory adjustment.  Set if running on Linux,
-+ * where we can write to /proc/<pid>/oom_adj to modify the out-of-memory
-+ * badness adjustment.
-+ */
-+#define HAVE_OOM_ADJ
-+
-+/*
-+ * IPC model.  Choose one:
-+ *
-+ * HAVE_SYSV_IPC - use the classic SysV IPC mechanisms (semget, shmget).
-+ * HAVE_MACOSX_IPC - use Macintosh IPC mechanisms (sem_open, mmap).
-+ * HAVE_WIN32_IPC - use Win32 IPC (CreateSemaphore, CreateFileMapping).
-+ * HAVE_ANDROID_IPC - use Android versions (?, mmap).
-+ */
-+#define HAVE_ANDROID_IPC
-+
-+/*
-+ * Memory-mapping model. Choose one:
-+ *
-+ * HAVE_POSIX_FILEMAP - use the Posix sys/mmap.h
-+ * HAVE_WIN32_FILEMAP - use Win32 filemaps
-+ */
-+#define  HAVE_POSIX_FILEMAP
-+
-+/*
-+ * Define this if you have <termio.h>
-+ */
-+#define  HAVE_TERMIO_H 1
-+
-+/*
-+ * Define this if you have <sys/sendfile.h>
-+ */
-+#define  HAVE_SYS_SENDFILE_H 1
-+
-+/*
-+ * Define this if you build against MSVCRT.DLL
-+ */
-+/* #define HAVE_MS_C_RUNTIME */
-+
-+/*
-+ * Define this if you have sys/uio.h
-+ */
-+#define  HAVE_SYS_UIO_H 1
-+
-+/*
-+ * Define this if your platforms implements symbolic links
-+ * in its filesystems
-+ */
-+#define HAVE_SYMLINKS
-+
-+/*
-+ * Define this if we have localtime_r().
-+ */
-+/* #define HAVE_LOCALTIME_R 1 */
-+
-+/*
-+ * Define this if we have gethostbyname_r().
-+ */
-+/* #define HAVE_GETHOSTBYNAME_R */
-+
-+/*
-+ * Define this if we have ioctl().
-+ */
-+#define HAVE_IOCTL
-+
-+/*
-+ * Define this if we want to use WinSock.
-+ */
-+/* #define HAVE_WINSOCK */
-+
-+/*
-+ * Define this if have clock_gettime() and friends
-+ */
-+#define HAVE_POSIX_CLOCKS
-+
-+/*
-+ * Define this if we have linux style epoll()
-+ */
-+#define HAVE_EPOLL
-+
-+/*
-+ * Endianness of the target machine.  Choose one:
-+ *
-+ * HAVE_ENDIAN_H -- have endian.h header we can include.
-+ * HAVE_LITTLE_ENDIAN -- we are little endian.
-+ * HAVE_BIG_ENDIAN -- we are big endian.
-+ */
-+#define HAVE_ENDIAN_H
-+#define HAVE_LITTLE_ENDIAN
-+
-+#define _FILE_OFFSET_BITS 64
-+/* #define _LARGEFILE_SOURCE 1 */
-+
-+/*
-+ * Define if platform has off64_t (and lseek64 and other xxx64 functions)
-+ */
-+#define HAVE_OFF64_T
-+
-+/*
-+ * Defined if we have the backtrace() call for retrieving a stack trace.
-+ * Needed for CallStack to operate; if not defined, CallStack is
-+ * non-functional.
-+ */
-+#define HAVE_BACKTRACE 0
-+
-+/*
-+ * Defined if we have the cxxabi.h header for demangling C++ symbols.  If
-+ * not defined, stack crawls will be displayed with raw mangled symbols
-+ */
-+#define HAVE_CXXABI 0
-+
-+/*
-+ * Defined if we have the gettid() system call.
-+ */
-+#define HAVE_GETTID
-+
-+/*
-+ * Defined if we have the sched_setscheduler() call
-+ */
-+#define HAVE_SCHED_SETSCHEDULER
-+
-+/*
-+ * Add any extra platform-specific defines here.
-+ */
-+#ifndef __linux__
-+#define __linux__
-+#endif
-+
-+/*
-+ * Define if we have <malloc.h> header
-+ */
-+#define HAVE_MALLOC_H
-+
-+/*
-+ * Define if we're running on *our* linux on device or emulator.
-+ */
-+#define HAVE_ANDROID_OS 1
-+
-+/*
-+ * Define if we have Linux-style non-filesystem Unix Domain Sockets
-+ */
-+#define HAVE_LINUX_LOCAL_SOCKET_NAMESPACE 1
-+
-+/*
-+ * Define if we have Linux's inotify in <sys/inotify.h>.
-+ */
-+#define HAVE_INOTIFY 1
-+
-+/*
-+ * Define if we have madvise() in <sys/mman.h>
-+ */
-+#define HAVE_MADVISE 1
-+
-+/*
-+ * Define if tm struct has tm_gmtoff field
-+ */
-+#define HAVE_TM_GMTOFF 1
-+
-+/*
-+ * Define if dirent struct has d_type field
-+ */
-+#define HAVE_DIRENT_D_TYPE 1
-+
-+/*
-+ * Define if libc includes Android system properties implementation.
-+ */
-+#define HAVE_LIBC_SYSTEM_PROPERTIES 1
-+
-+/*
-+ * Define if system provides a system property server (should be
-+ * mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES).
-+ */
-+/* #define HAVE_SYSTEM_PROPERTY_SERVER */
-+
-+/*
-+ * What CPU architecture does this platform use?
-+ */
-+#define ARCH_AARCH64
-+
-+/*
-+ * Define if the size of enums is as short as possible,
-+ */
-+/* #define HAVE_SHORT_ENUMS */
-+
-+/*
-+ * sprintf() format string for shared library naming.
-+ */
-+#define OS_SHARED_LIB_FORMAT_STR    "lib%s.so"
-+
-+/*
-+ * type for the third argument to mincore().
-+ */
-+#define MINCORE_POINTER_TYPE unsigned char *
-+
-+/*
-+ * The default path separator for the platform
-+ */
-+#define OS_PATH_SEPARATOR '/'
-+
-+/*
-+ * Is the filesystem case sensitive?
-+ */
-+#define OS_CASE_SENSITIVE
-+
-+/*
-+ * Define if <sys/socket.h> exists.
-+ */
-+#define HAVE_SYS_SOCKET_H 1
-+
-+/*
-+ * Define if the strlcpy() function exists on the system.
-+ */
-+#define HAVE_STRLCPY 1
-+
-+/*
-+ * Define if the open_memstream() function exists on the system.
-+ */
-+/* #define HAVE_OPEN_MEMSTREAM 1 */
-+
-+/*
-+ * Define if the BSD funopen() function exists on the system.
-+ */
-+#define HAVE_FUNOPEN 1
-+
-+/*
-+ * Define if prctl() exists
-+ */
-+#define HAVE_PRCTL 1
-+
-+/*
-+ * Define if writev() exists
-+ */
-+#define HAVE_WRITEV 1
-+
-+/*
-+ * Define if <stdint.h> exists.
-+ */
-+#define HAVE_STDINT_H 1
-+
-+/*
-+ * Define if <stdbool.h> exists.
-+ */
-+#define HAVE_STDBOOL_H 1
-+
-+/*
-+ * Define if <sched.h> exists.
-+ */
-+#define HAVE_SCHED_H 1
-+
-+/*
-+ * Define if pread() exists
-+ */
-+#define HAVE_PREAD 1
-+
-+/*
-+ * Define if we have st_mtim in struct stat
-+ */
-+#define HAVE_STAT_ST_MTIM 1
-+
-+/*
-+ * Define if printf() supports %zd for size_t arguments
-+ */
-+#define HAVE_PRINTF_ZD 1
-+
-+/*
-+ * Define to 1 if <stdlib.h> provides qsort_r() with a BSD style function prototype.
-+ */
-+#define HAVE_BSD_QSORT_R 0
-+
-+/*
-+ * Define to 1 if <stdlib.h> provides qsort_r() with a GNU style function prototype.
-+ */
-+#define HAVE_GNU_QSORT_R 0
-+
-+#endif /* _ANDROID_CONFIG_H */
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-adb-remove-selinux-extensions.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-adb-remove-selinux-extensions.patch
deleted file mode 100644
index 7d20c50680..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-adb-remove-selinux-extensions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7b7200727413ca4a9bb132221c543ec033dffafa Mon Sep 17 00:00:00 2001
-From: Sergio Schvezov <sergio.schvezov@canonical.com>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] adb: remove selinux extensions
-
-* drop useless includes of Android SELINUX extensions
-* avoids having to clone another module
-* this should be sent upstream
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- adb/file_sync_service.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/adb/file_sync_service.c b/adb/file_sync_service.c
-index 7933858516..3cbd0cd863 100644
---- a/adb/file_sync_service.c
-+++ b/adb/file_sync_service.c
-@@ -26,7 +26,6 @@
- 
- #include <errno.h>
- #include <private/android_filesystem_config.h>
--#include <selinux/android.h>
- #include "sysdeps.h"
- 
- #define TRACE_TAG  TRACE_SYNC
-@@ -73,7 +72,6 @@ static int mkdirs(char *name)
-                 *x = '/';
-                 return ret;
-             }
--            selinux_android_restorecon(name, 0);
-         }
-         *x++ = '/';
-     }
-@@ -251,7 +249,6 @@ static int handle_send_file(int s, char *path, uid_t uid,
-     if(fd >= 0) {
-         struct utimbuf u;
-         adb_close(fd);
--        selinux_android_restorecon(path, 0);
-         u.actime = timestamp;
-         u.modtime = timestamp;
-         utime(path, &u);
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch
deleted file mode 100644
index 82e97152be..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From db3a3714be07c8ab51b9ae7b035e4afe9f39c645 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 7 Sep 2022 13:20:22 -0700
-Subject: [PATCH] memory.h: Always define strlcpy for glibc based systems
-
-android-config.h file includes on compiler cmdline sets HAVE_STRLCPY
-unconditionally, since bionic supports it, its no big deal on android
-and also no problem when using musl since implementation exists for musl
-too, but glibc does not provide this. So either we include libbsd or use
-the implementation provided by android-tools here. We are currently
-using the in tree implementation for systems which do not provide it
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/cutils/memory.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/cutils/memory.h b/include/cutils/memory.h
-index e725cdd032..9e99353c58 100644
---- a/include/cutils/memory.h
-+++ b/include/cutils/memory.h
-@@ -30,7 +30,7 @@ void android_memset16(uint16_t* dst, uint16_t value, size_t size);
- /* size is given in bytes and must be multiple of 4 */
- void android_memset32(uint32_t* dst, uint32_t value, size_t size);
- 
--#if !HAVE_STRLCPY
-+#if !HAVE_STRLCPY || defined(__GLIBC__)
- /* Declaration of strlcpy() for platforms that don't already have it. */
- size_t strlcpy(char *dst, const char *src, size_t size);
- #endif
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0002-adb-Use-local-sockets-where-appropriate.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0002-adb-Use-local-sockets-where-appropriate.patch
deleted file mode 100644
index 3627110ad8..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0002-adb-Use-local-sockets-where-appropriate.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From d855f042ca09a358cebe2d3c1d29d512afd7ebb8 Mon Sep 17 00:00:00 2001
-From: Hilko Bengen <bengen@debian.org>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] adb: Use local sockets where appropriate
-
-Upstream-Status: Inappropriate
----
- adb/adb.c             | 6 +++++-
- adb/adb_client.c      | 5 +++--
- adb/transport_local.c | 3 ++-
- 3 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/adb/adb.c b/adb/adb.c
-index 10a1e0da26..027edd9359 100644
---- a/adb/adb.c
-+++ b/adb/adb.c
-@@ -1230,7 +1230,11 @@ int launch_server(int server_port)
-  */
- void build_local_name(char* target_str, size_t target_size, int server_port)
- {
--  snprintf(target_str, target_size, "tcp:%d", server_port);
-+  if (gListenAll > 0) {
-+    snprintf(target_str, target_size, "tcp:%d", server_port);
-+  } else {
-+    snprintf(target_str, target_size, "local:%d", server_port);
-+  }
- }
- 
- #if !ADB_HOST
-diff --git a/adb/adb_client.c b/adb/adb_client.c
-index eb1720d22c..a383faefe3 100644
---- a/adb/adb_client.c
-+++ b/adb/adb_client.c
-@@ -185,12 +185,12 @@ int _adb_connect(const char *service)
-         strcpy(__adb_error, "service name too long");
-         return -1;
-     }
--    snprintf(tmp, sizeof tmp, "%04x", len);
-+    snprintf(tmp, sizeof tmp, "%d", __adb_server_port);
- 
-     if (__adb_server_name)
-         fd = socket_network_client(__adb_server_name, __adb_server_port, SOCK_STREAM);
-     else
--        fd = socket_loopback_client(__adb_server_port, SOCK_STREAM);
-+        fd = socket_local_client(tmp, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);
- 
-     if(fd < 0) {
-         strcpy(__adb_error, "cannot connect to daemon");
-@@ -201,6 +201,7 @@ int _adb_connect(const char *service)
-         return -1;
-     }
- 
-+    snprintf(tmp, sizeof tmp, "%04x", len);
-     if(writex(fd, tmp, 4) || writex(fd, service, len)) {
-         strcpy(__adb_error, "write failure during connection");
-         adb_close(fd);
-diff --git a/adb/transport_local.c b/adb/transport_local.c
-index 948cc15812..71582a8c88 100644
---- a/adb/transport_local.c
-+++ b/adb/transport_local.c
-@@ -121,7 +121,8 @@ int local_connect_arbitrary_ports(int console_port, int adb_port)
-     }
- #endif
-     if (fd < 0) {
--        fd = socket_loopback_client(adb_port, SOCK_STREAM);
-+        snprintf(buf, sizeof buf, "%d", adb_port);
-+        fd = socket_local_client(buf, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);
-     }
- 
-     if (fd >= 0) {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0003-adb-define-shell-command.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0003-adb-define-shell-command.patch
deleted file mode 100644
index cf1d9cbc3d..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0003-adb-define-shell-command.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4421c2e19946dcd651fd8ac022b96627fc526149 Mon Sep 17 00:00:00 2001
-From: Fathi Boudra <fabo@debian.org>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] adb: define shell command
-
-we intend to run on Linux system so the shell is always /bin/sh,
-for the host or the target.
-
-Upstream-Status: Inappropriate
----
- adb/services.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/adb/services.c b/adb/services.c
-index 21b08dc201..d44b0c5068 100644
---- a/adb/services.c
-+++ b/adb/services.c
-@@ -299,11 +299,7 @@ static int create_subproc_raw(const char *cmd, const char *arg0, const char *arg
- }
- #endif  /* !ABD_HOST */
- 
--#if ADB_HOST
- #define SHELL_COMMAND "/bin/sh"
--#else
--#define SHELL_COMMAND "/system/bin/sh"
--#endif
- 
- #if !ADB_HOST
- static void subproc_waiter_service(int fd, void *cookie)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch
deleted file mode 100644
index 7f03cd2beb..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 548b8ca62c64a16305929e2eaf3d546d48de9c25 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 21 Feb 2017 19:46:24 +0100
-Subject: [PATCH] adb: Fix build on big endian systems
-
-The usb_linux_client.c file defines cpu_to_le16/32 by using the C
-library htole16/32 function calls. However, cpu_to_le16/32 are used
-when initializing structures, i.e in a context where a function call
-is not allowed.
-
-It works fine on little endian systems because htole16/32 are defined
-by the C library as no-ops. But on big-endian systems, they are
-actually doing something, which might involve calling a function,
-causing build failures.
-
-To solve this, we simply open-code cpu_to_le16/32 in a way that allows
-them to be used when initializing structures.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
-Upstream-Status: Pending
-
- adb/usb_linux_client.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/adb/usb_linux_client.c b/adb/usb_linux_client.c
-index 8426e0ea14..6e8b5bbbd2 100644
---- a/adb/usb_linux_client.c
-+++ b/adb/usb_linux_client.c
-@@ -34,8 +34,15 @@
- #define MAX_PACKET_SIZE_FS     64
- #define MAX_PACKET_SIZE_HS     512
- 
--#define cpu_to_le16(x)  htole16(x)
--#define cpu_to_le32(x)  htole32(x)
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define cpu_to_le16(x) (x)
-+# define cpu_to_le32(x) (x)
-+#else
-+# define cpu_to_le16(x) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))
-+# define cpu_to_le32(x) \
-+       ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >>  8) | \
-+        (((x) & 0x0000ff00u) <<  8) | (((x) & 0x000000ffu) << 24))
-+#endif
- 
- struct usb_handle
- {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch
deleted file mode 100644
index 4827ffe042..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-From 753bcb5971401b82fb2e6197d31c9e386f6d0392 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 15 Sep 2017 15:46:38 -0700
-Subject: [PATCH] adb: add base64 implementation
-
-musl needs it
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- adb/adb_auth_client.c |   2 +-
- adb/base64.c          | 315 ++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 316 insertions(+), 1 deletion(-)
- create mode 100644 adb/base64.c
-
-diff --git a/adb/adb_auth_client.c b/adb/adb_auth_client.c
-index 55e9dcad19..104b413b8b 100644
---- a/adb/adb_auth_client.c
-+++ b/adb/adb_auth_client.c
-@@ -75,7 +75,7 @@ static void read_keys(const char *file, struct listnode *list)
-         if (sep)
-             *sep = '\0';
- 
--        ret = __b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
-+        ret = b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
-         if (ret != sizeof(key->key)) {
-             D("%s: Invalid base64 data ret=%d\n", file, ret);
-             free(key);
-diff --git a/adb/base64.c b/adb/base64.c
-new file mode 100644
-index 0000000000..95da284d0d
---- /dev/null
-+++ b/adb/base64.c
-@@ -0,0 +1,315 @@
-+/*
-+ * Copyright (c) 1996-1999 by Internet Software Consortium.
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ */
-+
-+/*
-+ * Portions Copyright (c) 1995 by International Business Machines, Inc.
-+ *
-+ * International Business Machines, Inc. (hereinafter called IBM) grants
-+ * permission under its copyrights to use, copy, modify, and distribute this
-+ * Software with or without fee, provided that the above copyright notice and
-+ * all paragraphs of this notice appear in all copies, and that the name of IBM
-+ * not be used in connection with the marketing of any product incorporating
-+ * the Software or modifications thereof, without specific, written prior
-+ * permission.
-+ *
-+ * To the extent it has a right to do so, IBM grants an immunity from suit
-+ * under its patents, if any, for the use, sale or manufacture of products to
-+ * the extent that such products are used for performing Domain Name System
-+ * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
-+ * granted for any product per se or for any other function of any product.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
-+ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
-+ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
-+ */
-+
-+#if !defined(LINT) && !defined(CODECENTER)
-+static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $";
-+#endif /* not lint */
-+
-+#include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/socket.h>
-+
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <arpa/nameser.h>
-+
-+#include <ctype.h>
-+#include <resolv.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <string.h>
-+
-+#define Assert(Cond) if (!(Cond)) abort()
-+
-+static const char Base64[] =
-+       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+static const char Pad64 = '=';
-+
-+/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-+   The following encoding technique is taken from RFC 1521 by Borenstein
-+   and Freed.  It is reproduced here in a slightly edited form for
-+   convenience.
-+
-+   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-+   represented per printable character. (The extra 65th character, "=",
-+   is used to signify a special processing function.)
-+
-+   The encoding process represents 24-bit groups of input bits as output
-+   strings of 4 encoded characters. Proceeding from left to right, a
-+   24-bit input group is formed by concatenating 3 8-bit input groups.
-+   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-+   of which is translated into a single digit in the base64 alphabet.
-+
-+   Each 6-bit group is used as an index into an array of 64 printable
-+   characters. The character referenced by the index is placed in the
-+   output string.
-+
-+                         Table 1: The Base64 Alphabet
-+
-+      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-+          0 A            17 R            34 i            51 z
-+          1 B            18 S            35 j            52 0
-+          2 C            19 T            36 k            53 1
-+          3 D            20 U            37 l            54 2
-+          4 E            21 V            38 m            55 3
-+          5 F            22 W            39 n            56 4
-+          6 G            23 X            40 o            57 5
-+          7 H            24 Y            41 p            58 6
-+          8 I            25 Z            42 q            59 7
-+          9 J            26 a            43 r            60 8
-+         10 K            27 b            44 s            61 9
-+         11 L            28 c            45 t            62 +
-+         12 M            29 d            46 u            63 /
-+         13 N            30 e            47 v
-+         14 O            31 f            48 w         (pad) =
-+         15 P            32 g            49 x
-+         16 Q            33 h            50 y
-+
-+   Special processing is performed if fewer than 24 bits are available
-+   at the end of the data being encoded.  A full encoding quantum is
-+   always completed at the end of a quantity.  When fewer than 24 input
-+   bits are available in an input group, zero bits are added (on the
-+   right) to form an integral number of 6-bit groups.  Padding at the
-+   end of the data is performed using the '=' character.
-+
-+   Since all base64 input is an integral number of octets, only the
-+         -------------------------------------------------
-+   following cases can arise:
-+
-+       (1) the final quantum of encoding input is an integral
-+           multiple of 24 bits; here, the final unit of encoded
-+          output will be an integral multiple of 4 characters
-+          with no "=" padding,
-+       (2) the final quantum of encoding input is exactly 8 bits;
-+           here, the final unit of encoded output will be two
-+          characters followed by two "=" padding characters, or
-+       (3) the final quantum of encoding input is exactly 16 bits;
-+           here, the final unit of encoded output will be three
-+          characters followed by one "=" padding character.
-+   */
-+
-+int
-+b64_ntop(const uint8_t* src, size_t srclength, char* target, size_t targsize)
-+{
-+       size_t datalength = 0;
-+       uint8_t input[3];
-+       uint8_t output[4];
-+       size_t i;
-+
-+       while (2 < srclength) {
-+               input[0] = *src++;
-+               input[1] = *src++;
-+               input[2] = *src++;
-+               srclength -= 3;
-+
-+               output[0] = input[0] >> 2;
-+               output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-+               output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-+               output[3] = input[2] & 0x3f;
-+               Assert(output[0] < 64);
-+               Assert(output[1] < 64);
-+               Assert(output[2] < 64);
-+               Assert(output[3] < 64);
-+
-+               if (datalength + 4 > targsize)
-+                       return (-1);
-+               target[datalength++] = Base64[output[0]];
-+               target[datalength++] = Base64[output[1]];
-+               target[datalength++] = Base64[output[2]];
-+               target[datalength++] = Base64[output[3]];
-+       }
-+
-+       /* Now we worry about padding. */
-+       if (0 != srclength) {
-+               /* Get what's left. */
-+               input[0] = input[1] = input[2] = '\0';
-+               for (i = 0; i < srclength; i++)
-+                       input[i] = *src++;
-+
-+               output[0] = input[0] >> 2;
-+               output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-+               output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-+               Assert(output[0] < 64);
-+               Assert(output[1] < 64);
-+               Assert(output[2] < 64);
-+
-+               if (datalength + 4 > targsize)
-+                       return (-1);
-+               target[datalength++] = Base64[output[0]];
-+               target[datalength++] = Base64[output[1]];
-+               if (srclength == 1)
-+                       target[datalength++] = Pad64;
-+               else
-+                       target[datalength++] = Base64[output[2]];
-+               target[datalength++] = Pad64;
-+       }
-+       if (datalength >= targsize)
-+               return (-1);
-+       target[datalength] = '\0';      /* Returned value doesn't count \0. */
-+       return (datalength);
-+}
-+
-+/* skips all whitespace anywhere.
-+   converts characters, four at a time, starting at (or after)
-+   src from base - 64 numbers into three 8 bit bytes in the target area.
-+   it returns the number of data bytes stored at the target, or -1 on error.
-+ */
-+
-+int b64_pton(const char* src, uint8_t* target, size_t targsize)
-+{
-+       int tarindex, state, ch;
-+       char *pos;
-+
-+       state = 0;
-+       tarindex = 0;
-+
-+       while ((ch = *src++) != '\0') {
-+               if (isspace(ch))        /* Skip whitespace anywhere. */
-+                       continue;
-+
-+               if (ch == Pad64)
-+                       break;
-+
-+               pos = strchr(Base64, ch);
-+               if (pos == 0)           /* A non-base64 character. */
-+                       return (-1);
-+
-+               switch (state) {
-+               case 0:
-+                       if (target) {
-+                               if ((size_t)tarindex >= targsize)
-+                                       return (-1);
-+                               target[tarindex] = (pos - Base64) << 2;
-+                       }
-+                       state = 1;
-+                       break;
-+               case 1:
-+                       if (target) {
-+                               if ((size_t)tarindex + 1 >= targsize)
-+                                       return (-1);
-+                               target[tarindex]   |=  (pos - Base64) >> 4;
-+                               target[tarindex+1]  = ((pos - Base64) & 0x0f)
-+                                                       << 4 ;
-+                       }
-+                       tarindex++;
-+                       state = 2;
-+                       break;
-+               case 2:
-+                       if (target) {
-+                               if ((size_t)tarindex + 1 >= targsize)
-+                                       return (-1);
-+                               target[tarindex]   |=  (pos - Base64) >> 2;
-+                               target[tarindex+1]  = ((pos - Base64) & 0x03)
-+                                                       << 6;
-+                       }
-+                       tarindex++;
-+                       state = 3;
-+                       break;
-+               case 3:
-+                       if (target) {
-+                               if ((size_t)tarindex >= targsize)
-+                                       return (-1);
-+                               target[tarindex] |= (pos - Base64);
-+                       }
-+                       tarindex++;
-+                       state = 0;
-+                       break;
-+               default:
-+                       abort();
-+               }
-+       }
-+
-+       /*
-+        * We are done decoding Base-64 chars.  Let's see if we ended
-+        * on a byte boundary, and/or with erroneous trailing characters.
-+        */
-+
-+       if (ch == Pad64) {              /* We got a pad char. */
-+               ch = *src++;            /* Skip it, get next. */
-+               switch (state) {
-+               case 0:         /* Invalid = in first position */
-+               case 1:         /* Invalid = in second position */
-+                       return (-1);
-+
-+               case 2:         /* Valid, means one byte of info */
-+                       /* Skip any number of spaces. */
-+                       for ((void)NULL; ch != '\0'; ch = *src++)
-+                               if (!isspace(ch))
-+                                       break;
-+                       /* Make sure there is another trailing = sign. */
-+                       if (ch != Pad64)
-+                               return (-1);
-+                       ch = *src++;            /* Skip the = */
-+                       /* Fall through to "single trailing =" case. */
-+                       /* FALLTHROUGH */
-+
-+               case 3:         /* Valid, means two bytes of info */
-+                       /*
-+                        * We know this char is an =.  Is there anything but
-+                        * whitespace after it?
-+                        */
-+                       for ((void)NULL; ch != '\0'; ch = *src++)
-+                               if (!isspace(ch))
-+                                       return (-1);
-+
-+                       /*
-+                        * Now make sure for cases 2 and 3 that the "extra"
-+                        * bits that slopped past the last full byte were
-+                        * zeros.  If we don't check them, they become a
-+                        * subliminal channel.
-+                        */
-+                       if (target && target[tarindex] != 0)
-+                               return (-1);
-+               }
-+       } else {
-+               /*
-+                * We ended by seeing the end of the string.  Make sure we
-+                * have no partial bytes lying around.
-+                */
-+               if (state != 0)
-+                       return (-1);
-+       }
-+
-+       return (tarindex);
-+}
-+
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch
deleted file mode 100644
index 182b1eb29e..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 62d957a1271c88ec08d67984fbe31601f0bd41a9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 15 Sep 2017 15:50:57 -0700
-Subject: [PATCH] adb: Musl fixes
-
-__nonnull is gcc specific
-include sys/types.h for size_t
-Do not redefine close() and lseek()
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- adb/adb.h                    |  2 ++
- adb/disable_verity_service.c | 13 ++++++++-----
- adb/framebuffer_service.c    |  7 ++++---
- adb/sysdeps.h                | 12 ++++++------
- 4 files changed, 20 insertions(+), 14 deletions(-)
-
---- a/adb/adb.h
-+++ b/adb/adb.h
-@@ -18,7 +18,9 @@
- #define __ADB_H
- 
- #include <limits.h>
-+#include <sys/types.h>
- 
-+#include "fdevent.h"
- #include "adb_trace.h"
- #include "transport.h"  /* readx(), writex() */
- 
---- a/adb/disable_verity_service.c
-+++ b/adb/disable_verity_service.c
-@@ -14,25 +14,32 @@
-  * limitations under the License.
-  */
- 
--#include "sysdeps.h"
- 
- #define  TRACE_TAG  TRACE_ADB
- #include "adb.h"
-+#include "sysdeps.h"
-+#include "cutils/properties.h"
-+#include "ext4_sb.h"
-+#include <fs_mgr.h>
- 
- #include <stdio.h>
- #include <stdarg.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <inttypes.h>
--
--#include "cutils/properties.h"
--#include "ext4_sb.h"
--#include <fs_mgr.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <stdbool.h>
-+
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define lseek64 lseek
-+#define off64_t off_t
-+#endif
- 
- #define FSTAB_PREFIX "/fstab."
- struct fstab *fstab;
- 
--__attribute__((__format__(printf, 2, 3))) __nonnull((2))
-+__attribute__((__format__(printf, 2, 3))) __attribute__((nonnull((2))))
- static void write_console(int fd, const char* format, ...)
- {
-     char buffer[256];
---- a/adb/framebuffer_service.c
-+++ b/adb/framebuffer_service.c
-@@ -14,6 +14,10 @@
-  * limitations under the License.
-  */
- 
-+#include "fdevent.h"
-+#include "adb.h"
-+#include "sysdeps.h"
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
-@@ -23,9 +27,6 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- 
--#include "fdevent.h"
--#include "adb.h"
--
- #include <linux/fb.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
---- a/adb/sysdeps.h
-+++ b/adb/sysdeps.h
-@@ -123,8 +123,8 @@ static __inline__ int  unix_close(int fd
- {
-     return close(fd);
- }
--#undef   close
--#define  close   ____xxx_close
-+//#undef   close
-+//#define  close   ____xxx_close
- 
- static __inline__  int  unix_read(int  fd, void*  buf, size_t  len)
- {
-@@ -369,8 +369,8 @@ static __inline__ int  adb_close(int fd)
- {
-     return close(fd);
- }
--#undef   close
--#define  close   ____xxx_close
-+//#undef   close
-+//#define  close   ____xxx_close
- 
- 
- static __inline__  int  adb_read(int  fd, void*  buf, size_t  len)
-@@ -392,8 +392,8 @@ static __inline__ int   adb_lseek(int  f
- {
-     return lseek(fd, pos, where);
- }
--#undef   lseek
--#define  lseek   ___xxx_lseek
-+//#undef   lseek
-+//#define  lseek   ___xxx_lseek
- 
- static __inline__  int    adb_unlink(const char*  path)
- {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch
deleted file mode 100644
index 64fbce4cbe..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From de393bba41c8feff932c77d6c30233945f380d42 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sat, 11 Aug 2018 13:23:37 +0000
-Subject: [PATCH] adb: usb_linux.c: fix build with glibc-2.28
-
-* include sysmacros for major, minor
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
-Upstream-Status: Pending
-
- adb/usb_linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/adb/usb_linux.c b/adb/usb_linux.c
-index f16bdd0361..c8a7732441 100644
---- a/adb/usb_linux.c
-+++ b/adb/usb_linux.c
-@@ -22,6 +22,7 @@
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/time.h>
-+#include <sys/sysmacros.h>
- #include <dirent.h>
- #include <fcntl.h>
- #include <errno.h>
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch
deleted file mode 100644
index ad21b5aaa6..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3a788e9168c9b9eac66c4fa479413f4a95c61be4 Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Mon, 30 Oct 2017 21:05:46 +0100
-Subject: [PATCH] adb: Allow adbd to be ran as root
-
----
-Upstream-Status: Pending
-
- adb/adb.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/adb/adb.c b/adb/adb.c
-index 027edd9359..e0f7ecde45 100644
---- a/adb/adb.c
-+++ b/adb/adb.c
-@@ -1271,6 +1271,7 @@ static int should_drop_privileges() {
-     int secure = 0;
-     char value[PROPERTY_VALUE_MAX];
- 
-+    return 0;
-    /* run adbd in secure mode if ro.secure is set and
-     ** we are not in the emulator
-     */
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch
deleted file mode 100644
index a4dc6e1e35..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From dd195778a9930b7967b21a3b8eb390b70253dbad Mon Sep 17 00:00:00 2001
-From: David Ng <dave@codeaurora.org>
-Date: Fri, 27 Jul 2012 17:15:03 -0700
-Subject: [PATCH] mkbootimg: Add --dt parameter to specify DT image
-
-New optional --dt parameter to specify a kernel device
-tree image.
-
-Upstream-Status: Inappropriate
----
- mkbootimg/bootimg.h   |  7 +++++--
- mkbootimg/mkbootimg.c | 21 +++++++++++++++++++++
- 2 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/mkbootimg/bootimg.h b/mkbootimg/bootimg.h
-index 9171d85a7b..308c537d6b 100644
---- a/mkbootimg/bootimg.h
-+++ b/mkbootimg/bootimg.h
-@@ -41,8 +41,8 @@ struct boot_img_hdr
- 
-     unsigned tags_addr;    /* physical addr for kernel tags */
-     unsigned page_size;    /* flash page size we assume */
--    unsigned unused[2];    /* future expansion: should be 0 */
--
-+    unsigned dt_size;      /* device tree in bytes */
-+    unsigned unused;       /* future expansion: should be 0 */
-     unsigned char name[BOOT_NAME_SIZE]; /* asciiz product name */
- 
-     unsigned char cmdline[BOOT_ARGS_SIZE];
-@@ -64,10 +64,13 @@ struct boot_img_hdr
- ** +-----------------+
- ** | second stage    | o pages
- ** +-----------------+
-+** | device tree     | p pages
-+** +-----------------+
- **
- ** n = (kernel_size + page_size - 1) / page_size
- ** m = (ramdisk_size + page_size - 1) / page_size
- ** o = (second_size + page_size - 1) / page_size
-+** p = (dt_size + page_size - 1) / page_size
- **
- ** 0. all entities are page_size aligned in flash
- ** 1. kernel and ramdisk are required (size != 0)
-diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c
-index fc92b4dc30..658052cdf2 100644
---- a/mkbootimg/mkbootimg.c
-+++ b/mkbootimg/mkbootimg.c
-@@ -65,6 +65,7 @@ int usage(void)
-             "       [ --board <boardname> ]\n"
-             "       [ --base <address> ]\n"
-             "       [ --pagesize <pagesize> ]\n"
-+            "       [ --dt <filename> ]\n"
-             "       -o|--output <filename>\n"
-             );
-     return 1;
-@@ -105,6 +106,8 @@ int main(int argc, char **argv)
-     char *cmdline = "";
-     char *bootimg = 0;
-     char *board = "";
-+    char *dt_fn = 0;
-+    void *dt_data = 0;
-     unsigned pagesize = 2048;
-     int fd;
-     SHA_CTX ctx;
-@@ -158,6 +161,8 @@ int main(int argc, char **argv)
-                 fprintf(stderr,"error: unsupported page size %d\n", pagesize);
-                 return -1;
-             }
-+        } else if(!strcmp(arg, "--dt")) {
-+            dt_fn = val;
-         } else {
-             return usage();
-         }
-@@ -232,6 +237,14 @@ int main(int argc, char **argv)
-         }
-     }
- 
-+    if(dt_fn) {
-+        dt_data = load_file(dt_fn, &hdr.dt_size);
-+        if (dt_data == 0) {
-+            fprintf(stderr,"error: could not load device tree image '%s'\n", dt_fn);
-+            return 1;
-+        }
-+    }
-+
-     /* put a hash of the contents in the header so boot images can be
-      * differentiated based on their first 2k.
-      */
-@@ -242,6 +255,10 @@ int main(int argc, char **argv)
-     SHA_update(&ctx, &hdr.ramdisk_size, sizeof(hdr.ramdisk_size));
-     SHA_update(&ctx, second_data, hdr.second_size);
-     SHA_update(&ctx, &hdr.second_size, sizeof(hdr.second_size));
-+    if(dt_data) {
-+        SHA_update(&ctx, dt_data, hdr.dt_size);
-+        SHA_update(&ctx, &hdr.dt_size, sizeof(hdr.dt_size));
-+    }
-     sha = SHA_final(&ctx);
-     memcpy(hdr.id, sha,
-            SHA_DIGEST_SIZE > sizeof(hdr.id) ? sizeof(hdr.id) : SHA_DIGEST_SIZE);
-@@ -266,6 +283,10 @@ int main(int argc, char **argv)
-         if(write_padding(fd, pagesize, hdr.second_size)) goto fail;
-     }
- 
-+    if(dt_data) {
-+        if(write(fd, dt_data, hdr.dt_size) != (ssize_t) hdr.dt_size) goto fail;
-+        if(write_padding(fd, pagesize, hdr.dt_size)) goto fail;
-+    }
-     return 0;
- 
- fail:
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch
deleted file mode 100644
index 2c607ff67c..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ef743c9c3c7452ae904a5c343ee2b759ab3a87cb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@ubuntu.com>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] Use linux/capability.h on linux systems too
-
-Upstream-Status: Inappropriate
----
- include/private/android_filesystem_config.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
-index 2f528b95c8..3e0b00928e 100644
---- a/include/private/android_filesystem_config.h
-+++ b/include/private/android_filesystem_config.h
-@@ -27,7 +27,7 @@
- #include <sys/types.h>
- #include <stdint.h>
- 
--#ifdef HAVE_ANDROID_OS
-+#if defined(HAVE_ANDROID_OS) || defined(__linux__)
- #include <linux/capability.h>
- #else
- #include "android_filesystem_capability.h"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch
deleted file mode 100644
index 5b18f461a3..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 9eff8799831961c0edf6e37e5d4cbf43baa7c748 Mon Sep 17 00:00:00 2001
-From: Fathi Boudra <fabo@debian.org>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] Remove bionic specific calls
-
-Upstream-Status: Inappropriate
----
- include/cutils/properties.h | 1 -
- libcutils/properties.c      | 2 +-
- liblog/logd_write.c         | 5 +++++
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/include/cutils/properties.h b/include/cutils/properties.h
-index 798db8b36f..7d01f28d6e 100644
---- a/include/cutils/properties.h
-+++ b/include/cutils/properties.h
-@@ -19,7 +19,6 @@
- 
- #include <sys/cdefs.h>
- #include <stddef.h>
--#include <sys/system_properties.h>
- #include <stdint.h>
- 
- #ifdef __cplusplus
-diff --git a/libcutils/properties.c b/libcutils/properties.c
-index b283658aa4..4151e7882c 100644
---- a/libcutils/properties.c
-+++ b/libcutils/properties.c
-@@ -104,10 +104,10 @@ int32_t property_get_int32(const char *key, int32_t default_value) {
-     return (int32_t)property_get_imax(key, INT32_MIN, INT32_MAX, default_value);
- }
- 
-+#undef HAVE_LIBC_SYSTEM_PROPERTIES
- #ifdef HAVE_LIBC_SYSTEM_PROPERTIES
- 
- #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
--#include <sys/_system_properties.h>
- 
- int property_set(const char *key, const char *value)
- {
-diff --git a/liblog/logd_write.c b/liblog/logd_write.c
-index b2668cedb7..f5a44fe901 100644
---- a/liblog/logd_write.c
-+++ b/liblog/logd_write.c
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/syscall.h>
- #include <sys/types.h>
- #if (FAKE_LOG_DEVICE == 0)
- #include <sys/socket.h>
-@@ -205,7 +206,11 @@ static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec, size_t nr)
-     realtime_ts.tv_nsec = ts.tv_nsec;
- 
-     log_id_buf = log_id;
-+#ifdef __BIONIC__
-     tid = gettid();
-+#else
-+    tid = (pid_t) syscall(__NR_gettid);
-+#endif
- 
-     newVec[0].iov_base   = (unsigned char *) &log_id_buf;
-     newVec[0].iov_len    = sizeof_log_id_t;
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch
deleted file mode 100644
index b0feb65921..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cd4525d760c6f88c9bf85f7bf488da79cd0d3264 Mon Sep 17 00:00:00 2001
-From: Fathi Boudra <fabo@debian.org>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] Fix implicit declaration of stlcat/strlcopy functions
-
-Upstream-Status: Inappropriate
----
- adb/adb.c                | 1 +
- fs_mgr/fs_mgr_fstab.c    | 2 +-
- include/cutils/sockets.h | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/adb/adb.c b/adb/adb.c
-index e0f7ecde45..aaefd9b401 100644
---- a/adb/adb.c
-+++ b/adb/adb.c
-@@ -41,6 +41,7 @@
- #include <sys/prctl.h>
- #include <getopt.h>
- #include <selinux/selinux.h>
-+#include <grp.h>
- #else
- #include "usb_vendors.h"
- #endif
-diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c
-index edd9591164..9ddb4643b5 100644
---- a/fs_mgr/fs_mgr_fstab.c
-+++ b/fs_mgr/fs_mgr_fstab.c
-@@ -17,7 +17,7 @@
- #include <ctype.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <string.h>
-+#include <bsd/string.h>
- #include <sys/mount.h>
- 
- #include "fs_mgr_priv.h"
-diff --git a/include/cutils/sockets.h b/include/cutils/sockets.h
-index daf43ec944..d3270c69e7 100644
---- a/include/cutils/sockets.h
-+++ b/include/cutils/sockets.h
-@@ -19,7 +19,7 @@
- 
- #include <errno.h>
- #include <stdlib.h>
--#include <string.h>
-+#include <bsd/string.h>
- #include <stdbool.h>
- 
- #ifdef HAVE_WINSOCK
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch
deleted file mode 100644
index 5138556d63..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From 48ddf4fb999931942c359350fb31cd557514e1c6 Mon Sep 17 00:00:00 2001
-From: Chenxi Mao <maochenxi@eswin.com>
-Date: Mon, 20 Apr 2020 15:27:22 +0800
-Subject: [PATCH 1/1] adb: Support riscv64
-
----
-Upstream-Status: Pending
-
- include/cutils/atomic-inline.h  |   2 +
- include/cutils/atomic-riscv64.h | 156 ++++++++++++++++++++++++++++++++
- 2 files changed, 158 insertions(+)
- create mode 100644 include/cutils/atomic-riscv64.h
-
-diff --git a/include/cutils/atomic-inline.h b/include/cutils/atomic-inline.h
-index a31e913579..b5dc38209c 100644
---- a/include/cutils/atomic-inline.h
-+++ b/include/cutils/atomic-inline.h
-@@ -55,6 +55,8 @@ extern "C" {
- #include <cutils/atomic-mips64.h>
- #elif defined(__mips__)
- #include <cutils/atomic-mips.h>
-+#elif defined(__riscv) && __riscv_xlen == 64
-+#include <cutils/atomic-riscv64.h>
- #else
- #error atomic operations are unsupported
- #endif
-diff --git a/include/cutils/atomic-riscv64.h b/include/cutils/atomic-riscv64.h
-new file mode 100644
-index 0000000000..2664db5a86
---- /dev/null
-+++ b/include/cutils/atomic-riscv64.h
-@@ -0,0 +1,156 @@
-+/*
-+ * Copyright (C) 2014 The Android Open Source Project
-+ * 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 ANDROID_CUTILS_ATOMIC_RISCV64_H
-+#define ANDROID_CUTILS_ATOMIC_RISCV64_H
-+
-+#include <stdint.h>
-+
-+#ifndef ANDROID_ATOMIC_INLINE
-+#define ANDROID_ATOMIC_INLINE inline __attribute__((always_inline))
-+#endif
-+
-+/*
-+   TODOAArch64: Revisit the below functions and check for potential
-+   optimizations using assembly code or otherwise.
-+*/
-+
-+extern ANDROID_ATOMIC_INLINE
-+void android_compiler_barrier(void)
-+{
-+    __asm__ __volatile__ ("" : : : "memory");
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+void android_memory_barrier(void)
-+{
-+    __asm__ __volatile__ ("fence rw,rw" : : : "memory");
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_acquire_load(volatile const int32_t *ptr)
-+{
-+    int32_t value = *ptr;
-+    android_memory_barrier();
-+    return value;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_release_load(volatile const int32_t *ptr)
-+{
-+    android_memory_barrier();
-+    return *ptr;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+void android_atomic_acquire_store(int32_t value, volatile int32_t *ptr)
-+{
-+    *ptr = value;
-+    android_memory_barrier();
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+void android_atomic_release_store(int32_t value, volatile int32_t *ptr)
-+{
-+    android_memory_barrier();
-+    *ptr = value;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int android_atomic_cas(int32_t old_value, int32_t new_value,
-+                       volatile int32_t *ptr)
-+{
-+    return __sync_val_compare_and_swap(ptr, old_value, new_value) != old_value;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int android_atomic_acquire_cas(int32_t old_value, int32_t new_value,
-+                               volatile int32_t *ptr)
-+{
-+    int status = android_atomic_cas(old_value, new_value, ptr);
-+    android_memory_barrier();
-+    return status;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int android_atomic_release_cas(int32_t old_value, int32_t new_value,
-+                               volatile int32_t *ptr)
-+{
-+    android_memory_barrier();
-+    return android_atomic_cas(old_value, new_value, ptr);
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_add(int32_t increment, volatile int32_t *ptr)
-+{
-+    int32_t prev, status;
-+    android_memory_barrier();
-+    do {
-+        prev = *ptr;
-+        status = android_atomic_cas(prev, prev + increment, ptr);
-+    } while (__builtin_expect(status != 0, 0));
-+    return prev;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_inc(volatile int32_t *addr)
-+{
-+    return android_atomic_add(1, addr);
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_dec(volatile int32_t *addr)
-+{
-+    return android_atomic_add(-1, addr);
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_and(int32_t value, volatile int32_t *ptr)
-+{
-+    int32_t prev, status;
-+    android_memory_barrier();
-+    do {
-+        prev = *ptr;
-+        status = android_atomic_cas(prev, prev & value, ptr);
-+    } while (__builtin_expect(status != 0, 0));
-+    return prev;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_or(int32_t value, volatile int32_t *ptr)
-+{
-+    int32_t prev, status;
-+    android_memory_barrier();
-+    do {
-+        prev = *ptr;
-+        status = android_atomic_cas(prev, prev | value, ptr);
-+    } while (__builtin_expect(status != 0, 0));
-+    return prev;
-+}
-+
-+#endif /* ANDROID_CUTILS_ATOMIC_RISCV_H */
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch
deleted file mode 100644
index cf23f3c251..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-From dae9a11f3a158357966399aef97c48b5f16934d9 Mon Sep 17 00:00:00 2001
-From: Jiacheng Liu <jiacheng.liu@mediatek.com>
-Date: Sat, 24 Jul 2021 11:01:18 +0800
-Subject: [PATCH] android-tools: adb: add u3 ss descriptor support
-
-Porting u3 Superspeed descriptor support to open-embedded android-tools package.
-This patch origins from the the patch in android project [1], but has been
-modified for backporting to android-tools_5.1.1.r37.
-
-[1] https://android.googlesource.com/platform/system/core/+/d6ee9f26a5163af4121f4380264fcbd4e6851a17%5E%21
-
-Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com>
-Signed-off-by: Jiacheng Liu <jiacheng.liu@mediatek.com>
----
-Upstream-Status: Pending
-
- adb/usb_linux_client.c | 275 +++++++++++++++++++++++++++++++----------
- 1 file changed, 207 insertions(+), 68 deletions(-)
-
-diff --git a/adb/usb_linux_client.c b/adb/usb_linux_client.c
-index 6e8b5bb..884e85e 100644
---- a/adb/usb_linux_client.c
-+++ b/adb/usb_linux_client.c
-@@ -31,8 +31,10 @@
- #define   TRACE_TAG  TRACE_USB
- #include "adb.h"
- 
-+#define USB_EXT_PROP_UNICODE    1
- #define MAX_PACKET_SIZE_FS     64
- #define MAX_PACKET_SIZE_HS     512
-+#define MAX_PACKET_SIZE_SS     1024
- 
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- # define cpu_to_le16(x) (x)
-@@ -62,74 +64,185 @@ struct usb_handle
-     int bulk_in;  /* "in" from the host's perspective => sink for adbd */
- };
- 
--static const struct {
--    struct usb_functionfs_descs_head header;
--    struct {
--        struct usb_interface_descriptor intf;
--        struct usb_endpoint_descriptor_no_audio source;
--        struct usb_endpoint_descriptor_no_audio sink;
--    } __attribute__((packed)) fs_descs, hs_descs;
--} __attribute__((packed)) descriptors = {
--    .header = {
--        .magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC),
--        .length = cpu_to_le32(sizeof(descriptors)),
--        .fs_count = 3,
--        .hs_count = 3,
-+struct func_desc {
-+    struct usb_interface_descriptor intf;
-+    struct usb_endpoint_descriptor_no_audio source;
-+    struct usb_endpoint_descriptor_no_audio sink;
-+} __attribute__((packed));
-+
-+struct ss_func_desc {
-+    struct usb_interface_descriptor intf;
-+    struct usb_endpoint_descriptor_no_audio source;
-+    struct usb_ss_ep_comp_descriptor source_comp;
-+    struct usb_endpoint_descriptor_no_audio sink;
-+    struct usb_ss_ep_comp_descriptor sink_comp;
-+} __attribute__((packed));
-+
-+struct desc_v1 {
-+    struct usb_functionfs_descs_head_v1 {
-+        __le32 magic;
-+        __le32 length;
-+        __le32 fs_count;
-+        __le32 hs_count;
-+    } __attribute__((packed)) header;
-+    struct func_desc fs_descs, hs_descs;
-+} __attribute__((packed));
-+
-+struct usb_os_desc_ext_prop {
-+    uint32_t dwSize;
-+    uint32_t dwPropertyDataType;
-+
-+    // Property name and value are transmitted as UTF-16, but the kernel only
-+    // accepts ASCII values and performs the conversion for us.
-+    uint16_t wPropertyNameLength;
-+    char bPropertyName[20];
-+
-+    uint32_t dwPropertyDataLength;
-+    char bProperty[39];
-+} __attribute__((packed)) os_desc_guid = {
-+    .dwSize = sizeof(struct usb_os_desc_ext_prop),
-+    .dwPropertyDataType = cpu_to_le32(USB_EXT_PROP_UNICODE),
-+    .wPropertyNameLength = cpu_to_le16(20),
-+    .bPropertyName = "DeviceInterfaceGUID",
-+    .dwPropertyDataLength = cpu_to_le32(39),
-+    .bProperty = "{F72FE0D4-CBCB-407D-8814-9ED673D0DD6B}",
-+};
-+
-+struct usb_ext_prop_values {
-+    struct usb_os_desc_ext_prop guid;
-+} __attribute__((packed));
-+
-+struct desc_v2 {
-+    struct usb_functionfs_descs_head_v2 header;
-+    // The rest of the structure depends on the flags in the header.
-+    __le32 fs_count;
-+    __le32 hs_count;
-+    __le32 ss_count;
-+    __le32 os_count;
-+    struct func_desc fs_descs, hs_descs;
-+    struct ss_func_desc ss_descs;
-+    struct usb_os_desc_header os_header;
-+    struct usb_ext_compat_desc os_desc;
-+    struct usb_os_desc_header os_prop_header;
-+    struct usb_ext_prop_values os_prop_values;
-+} __attribute__((packed));
-+
-+static struct func_desc fs_descriptors = {
-+    .intf = {
-+        .bLength = sizeof(fs_descriptors.intf),
-+        .bDescriptorType = USB_DT_INTERFACE,
-+        .bInterfaceNumber = 0,
-+        .bNumEndpoints = 2,
-+        .bInterfaceClass = ADB_CLASS,
-+        .bInterfaceSubClass = ADB_SUBCLASS,
-+        .bInterfaceProtocol = ADB_PROTOCOL,
-+        .iInterface = 1, /* first string from the provided table */
-+    },
-+    .source = {
-+        .bLength = sizeof(fs_descriptors.source),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 1 | USB_DIR_OUT,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_FS,
-+    },
-+    .sink = {
-+        .bLength = sizeof(fs_descriptors.sink),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 2 | USB_DIR_IN,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_FS,
-+    },
-+};
-+
-+static struct func_desc hs_descriptors = {
-+    .intf = {
-+        .bLength = sizeof(hs_descriptors.intf),
-+        .bDescriptorType = USB_DT_INTERFACE,
-+        .bInterfaceNumber = 0,
-+        .bNumEndpoints = 2,
-+        .bInterfaceClass = ADB_CLASS,
-+        .bInterfaceSubClass = ADB_SUBCLASS,
-+        .bInterfaceProtocol = ADB_PROTOCOL,
-+        .iInterface = 1, /* first string from the provided table */
-+    },
-+    .source = {
-+        .bLength = sizeof(hs_descriptors.source),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 1 | USB_DIR_OUT,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_HS,
-+    },
-+    .sink = {
-+        .bLength = sizeof(hs_descriptors.sink),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 2 | USB_DIR_IN,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_HS,
-+    },
-+};
-+
-+static struct ss_func_desc ss_descriptors = {
-+    .intf = {
-+        .bLength = sizeof(ss_descriptors.intf),
-+        .bDescriptorType = USB_DT_INTERFACE,
-+        .bInterfaceNumber = 0,
-+        .bNumEndpoints = 2,
-+        .bInterfaceClass = ADB_CLASS,
-+        .bInterfaceSubClass = ADB_SUBCLASS,
-+        .bInterfaceProtocol = ADB_PROTOCOL,
-+        .iInterface = 1, /* first string from the provided table */
-+    },
-+    .source = {
-+        .bLength = sizeof(ss_descriptors.source),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 1 | USB_DIR_OUT,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_SS,
-+    },
-+    .source_comp = {
-+        .bLength = sizeof(ss_descriptors.source_comp),
-+        .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
-+        .bMaxBurst = 4,
-     },
--    .fs_descs = {
--        .intf = {
--            .bLength = sizeof(descriptors.fs_descs.intf),
--            .bDescriptorType = USB_DT_INTERFACE,
--            .bInterfaceNumber = 0,
--            .bNumEndpoints = 2,
--            .bInterfaceClass = ADB_CLASS,
--            .bInterfaceSubClass = ADB_SUBCLASS,
--            .bInterfaceProtocol = ADB_PROTOCOL,
--            .iInterface = 1, /* first string from the provided table */
--        },
--        .source = {
--            .bLength = sizeof(descriptors.fs_descs.source),
--            .bDescriptorType = USB_DT_ENDPOINT,
--            .bEndpointAddress = 1 | USB_DIR_OUT,
--            .bmAttributes = USB_ENDPOINT_XFER_BULK,
--            .wMaxPacketSize = MAX_PACKET_SIZE_FS,
--        },
--        .sink = {
--            .bLength = sizeof(descriptors.fs_descs.sink),
--            .bDescriptorType = USB_DT_ENDPOINT,
--            .bEndpointAddress = 2 | USB_DIR_IN,
--            .bmAttributes = USB_ENDPOINT_XFER_BULK,
--            .wMaxPacketSize = MAX_PACKET_SIZE_FS,
--        },
-+    .sink = {
-+        .bLength = sizeof(ss_descriptors.sink),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 2 | USB_DIR_IN,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_SS,
-     },
--    .hs_descs = {
--        .intf = {
--            .bLength = sizeof(descriptors.hs_descs.intf),
--            .bDescriptorType = USB_DT_INTERFACE,
--            .bInterfaceNumber = 0,
--            .bNumEndpoints = 2,
--            .bInterfaceClass = ADB_CLASS,
--            .bInterfaceSubClass = ADB_SUBCLASS,
--            .bInterfaceProtocol = ADB_PROTOCOL,
--            .iInterface = 1, /* first string from the provided table */
--        },
--        .source = {
--            .bLength = sizeof(descriptors.hs_descs.source),
--            .bDescriptorType = USB_DT_ENDPOINT,
--            .bEndpointAddress = 1 | USB_DIR_OUT,
--            .bmAttributes = USB_ENDPOINT_XFER_BULK,
--            .wMaxPacketSize = MAX_PACKET_SIZE_HS,
--        },
--        .sink = {
--            .bLength = sizeof(descriptors.hs_descs.sink),
--            .bDescriptorType = USB_DT_ENDPOINT,
--            .bEndpointAddress = 2 | USB_DIR_IN,
--            .bmAttributes = USB_ENDPOINT_XFER_BULK,
--            .wMaxPacketSize = MAX_PACKET_SIZE_HS,
--        },
-+    .sink_comp = {
-+        .bLength = sizeof(ss_descriptors.sink_comp),
-+        .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
-+        .bMaxBurst = 4,
-     },
- };
- 
-+struct usb_ext_compat_desc os_desc_compat = {
-+    .bFirstInterfaceNumber = 0,
-+    .Reserved1 = cpu_to_le32(1),
-+    .CompatibleID = { 'W', 'I', 'N', 'U', 'S', 'B', '\0', '\0'},
-+    .SubCompatibleID = {0},
-+    .Reserved2 = {0},
-+};
-+
-+static struct usb_os_desc_header os_desc_header = {
-+    .interface = cpu_to_le32(0),
-+    .dwLength = cpu_to_le32(sizeof(os_desc_header) + sizeof(os_desc_compat)),
-+    .bcdVersion = cpu_to_le32(1),
-+    .wIndex = cpu_to_le32(4),
-+    .bCount = cpu_to_le32(1),
-+    .Reserved = cpu_to_le32(0),
-+};
-+
-+static struct usb_os_desc_header os_prop_header = {
-+    .interface = cpu_to_le32(0),
-+    .dwLength = cpu_to_le32(sizeof(os_desc_header) + sizeof(struct usb_ext_prop_values)),
-+    .bcdVersion = cpu_to_le32(1),
-+    .wIndex = cpu_to_le32(5),
-+    .wCount = cpu_to_le16(1),
-+};
-+
- #define STR_INTERFACE_ "ADB Interface"
- 
- static const struct {
-@@ -151,8 +264,6 @@ static const struct {
-     },
- };
- 
--
--
- static void *usb_adb_open_thread(void *x)
- {
-     struct usb_handle *usb = (struct usb_handle *)x;
-@@ -270,6 +381,24 @@ static void usb_adb_init()
- static void init_functionfs(struct usb_handle *h)
- {
-     ssize_t ret;
-+    struct desc_v1 v1_descriptor = {};
-+    struct desc_v2 v2_descriptor = {};
-+
-+    v2_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2);
-+    v2_descriptor.header.length = cpu_to_le32(sizeof(v2_descriptor));
-+    v2_descriptor.header.flags = FUNCTIONFS_HAS_FS_DESC | FUNCTIONFS_HAS_HS_DESC |
-+                                 FUNCTIONFS_HAS_SS_DESC | FUNCTIONFS_HAS_MS_OS_DESC;
-+    v2_descriptor.fs_count = 3;
-+    v2_descriptor.hs_count = 3;
-+    v2_descriptor.ss_count = 5;
-+    v2_descriptor.os_count = 2;
-+    v2_descriptor.fs_descs = fs_descriptors;
-+    v2_descriptor.hs_descs = hs_descriptors;
-+    v2_descriptor.ss_descs = ss_descriptors;
-+    v2_descriptor.os_header = os_desc_header;
-+    v2_descriptor.os_desc = os_desc_compat;
-+    v2_descriptor.os_prop_header = os_prop_header;
-+    v2_descriptor.os_prop_values.guid = os_desc_guid;
- 
-     if (h->control < 0) { // might have already done this before
-         D("OPENING %s\n", USB_FFS_ADB_EP0);
-@@ -279,10 +408,20 @@ static void init_functionfs(struct usb_handle *h)
-             goto err;
-         }
- 
--        ret = adb_write(h->control, &descriptors, sizeof(descriptors));
-+        ret = adb_write(h->control, &v2_descriptor, sizeof(v2_descriptor));
-         if (ret < 0) {
--            D("[ %s: write descriptors failed: errno=%d ]\n", USB_FFS_ADB_EP0, errno);
--            goto err;
-+            D("[ %s: write v2_descriptor failed: errno=%d ]\n", USB_FFS_ADB_EP0, errno);
-+            v1_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC);
-+            v1_descriptor.header.length = cpu_to_le32(sizeof(v1_descriptor));
-+            v1_descriptor.header.fs_count = 3;
-+            v1_descriptor.header.hs_count = 3;
-+            v1_descriptor.fs_descs = fs_descriptors;
-+            v1_descriptor.hs_descs = hs_descriptors;
-+           ret = adb_write(h->control, &v1_descriptor, sizeof(v1_descriptor));
-+           if (ret < 0) {
-+               D("[ %s: failed to write USB descriptors]\n", USB_FFS_ADB_EP0);
-+               goto err;
-+           }
-         }
- 
-         ret = adb_write(h->control, &strings, sizeof(strings));
--- 
-2.18.0
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch
deleted file mode 100644
index 5009c73a05..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7b74d23ed955206a789a96bdc3288593e702afac Mon Sep 17 00:00:00 2001
-From: Sean Anderson <sean.anderson@seco.com>
-Date: Thu, 30 Dec 2021 15:16:08 -0500
-Subject: [PATCH] libsparse: Split off most of sparse_file_read_normal into a
- helper function
-
-This carves out the core of sparse_file_read_normal and splits it off so
-it can be reused in the next patch. No functional change intended.
-
-Change-Id: Id00491fd7e5bb6fa28c517a0bb32b8b506539d4d
-Upstream-Status: Backport [95657f3e5976d96073f7bbfe3a49192509999d1d]
-Signed-off-by: Sean Anderson <sean.anderson@seco.com>
----
- libsparse/sparse_read.c | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/libsparse/sparse_read.c b/libsparse/sparse_read.c
-index 8e188e9a4..ee4abd86a 100644
---- a/libsparse/sparse_read.c
-+++ b/libsparse/sparse_read.c
-@@ -353,13 +353,11 @@ static int sparse_file_read_sparse(struct sparse_file *s, int fd, bool crc)
-        return 0;
- }
- 
--static int sparse_file_read_normal(struct sparse_file *s, int fd)
-+static int do_sparse_file_read_normal(struct sparse_file *s, int fd, uint32_t* buf, int64_t offset,
-+                                     int64_t remain)
- {
-        int ret;
--       uint32_t *buf = malloc(s->block_size);
--       unsigned int block = 0;
--       int64_t remain = s->len;
--       int64_t offset = 0;
-+       unsigned int block = offset / s->block_size;
-        unsigned int to_read;
-        unsigned int i;
-        bool sparse_block;
-@@ -403,6 +401,19 @@ static int sparse_file_read_normal(struct sparse_file *s, int fd)
-        return 0;
- }
- 
-+static int sparse_file_read_normal(struct sparse_file* s, int fd)
-+{
-+       int ret;
-+       uint32_t* buf = (uint32_t*)malloc(s->block_size);
-+
-+       if (!buf)
-+               return -ENOMEM;
-+
-+       ret = do_sparse_file_read_normal(s, fd, buf, 0, s->len);
-+       free(buf);
-+       return ret;
-+}
-+
- int sparse_file_read(struct sparse_file *s, int fd, bool sparse, bool crc)
- {
-        if (crc && !sparse) {
--- 
-2.35.1.1320.gc452695387.dirty
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch
deleted file mode 100644
index e5221d2b4c..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 41574b628ec4229c24dfe289af7b6978edcca4ed Mon Sep 17 00:00:00 2001
-From: Sean Anderson <sean.anderson@seco.com>
-Date: Thu, 30 Dec 2021 15:19:41 -0500
-Subject: [PATCH] libsparse: Add "hole" mode to sparse_file_read
-
-This adds support for filesystem-level sparse files. These files have
-holes which are not stored in the filesystem and when read are full of
-zeros. While these zeros may be significant in some types of files,
-other types of files may not care about the contents of holes. For
-example, most filesystem creation tools write to all the blocks they
-care about. Those blocks not written to will remain holes, and can be
-safely represented by "don't care" chunks. Using "don't care" chunks
-instead of fill chunks can result in a substantial reduction of the time
-it takes to program a sparse image.
-
-To accomplish this, we extend the existing "sparse" boolean parameter to
-be an enum of mode types. This enum represents the strategy we take when
-reading in a file. For the most part the implementation is
-straightforward. We use lseek to determine where the holes in the file
-are, and then use do_sparse_file_read_normal to create chunks for the
-data section. Note that every file has an implicit hole at its end.
-
-Change-Id: I0cfbf08886fca9a91cb753ec8734c84fcbe52c9f
-Upstream-Status: Backport [f96466b05543b984ef7315d830bab4a409228d35]
-Signed-off-by: Sean Anderson <sean.anderson@seco.com>
----
- libsparse/img2simg.c              |  2 +-
- libsparse/include/sparse/sparse.h | 32 +++++++++++---
- libsparse/sparse_read.c           | 71 +++++++++++++++++++++++++++++--
- 3 files changed, 93 insertions(+), 12 deletions(-)
-
-diff --git a/libsparse/img2simg.c b/libsparse/img2simg.c
-index a0db36f45..2e171b613 100644
---- a/libsparse/img2simg.c
-+++ b/libsparse/img2simg.c
-@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
-        }
- 
-        sparse_file_verbose(s);
--       ret = sparse_file_read(s, in, false, false);
-+       ret = sparse_file_read(s, in, SPARSE_READ_MODE_NORMAL, false);
-        if (ret) {
-                fprintf(stderr, "Failed to read file\n");
-                exit(-1);
-diff --git a/libsparse/include/sparse/sparse.h b/libsparse/include/sparse/sparse.h
-index 8b757d22a..b68aa21a8 100644
---- a/libsparse/include/sparse/sparse.h
-+++ b/libsparse/include/sparse/sparse.h
-@@ -196,23 +196,41 @@ int64_t sparse_file_len(struct sparse_file *s, bool sparse, bool crc);
- int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc,
-                int (*write)(void *priv, const void *data, int len), void *priv);
- 
-+/**
-+ * enum sparse_read_mode - The method to use when reading in files
-+ * @SPARSE_READ_MODE_NORMAL: The input is a regular file. Constant chunks of
-+ *                           data (including holes) will be be converted to
-+ *                           fill chunks.
-+ * @SPARSE_READ_MODE_SPARSE: The input is an Android sparse file.
-+ * @SPARSE_READ_MODE_HOLE: The input is a regular file. Holes will be converted
-+ *                         to "don't care" chunks. Other constant chunks will
-+ *                         be converted to fill chunks.
-+ */
-+enum sparse_read_mode {
-+       SPARSE_READ_MODE_NORMAL = false,
-+       SPARSE_READ_MODE_SPARSE = true,
-+       SPARSE_READ_MODE_HOLE,
-+};
-+
- /**
-  * sparse_file_read - read a file into a sparse file cookie
-  *
-  * @s - sparse file cookie
-  * @fd - file descriptor to read from
-- * @sparse - read a file in the Android sparse file format
-+ * @mode - mode to use when reading the input file
-  * @crc - verify the crc of a file in the Android sparse file format
-  *
-- * Reads a file into a sparse file cookie.  If sparse is true, the file is
-- * assumed to be in the Android sparse file format.  If sparse is false, the
-- * file will be sparsed by looking for block aligned chunks of all zeros or
-- * another 32 bit value.  If crc is true, the crc of the sparse file will be
-- * verified.
-+ * Reads a file into a sparse file cookie. If @mode is
-+ * %SPARSE_READ_MODE_SPARSE, the file is assumed to be in the Android sparse
-+ * file format. If @mode is %SPARSE_READ_MODE_NORMAL, the file will be sparsed
-+ * by looking for block aligned chunks of all zeros or another 32 bit value. If
-+ * @mode is %SPARSE_READ_MODE_HOLE, the file will be sparsed like
-+ * %SPARSE_READ_MODE_NORMAL, but holes in the file will be converted to "don't
-+ * care" chunks. If crc is true, the crc of the sparse file will be verified.
-  *
-  * Returns 0 on success, negative errno on error.
-  */
--int sparse_file_read(struct sparse_file *s, int fd, bool sparse, bool crc);
-+int sparse_file_read(struct sparse_file *s, int fd, enum sparse_read_mode mode, bool crc);
- 
- /**
-  * sparse_file_import - import an existing sparse file
-diff --git a/libsparse/sparse_read.c b/libsparse/sparse_read.c
-index ee4abd86a..81f48cc13 100644
---- a/libsparse/sparse_read.c
-+++ b/libsparse/sparse_read.c
-@@ -414,16 +414,79 @@ static int sparse_file_read_normal(struct sparse_file* s, int fd)
-        return ret;
- }
- 
--int sparse_file_read(struct sparse_file *s, int fd, bool sparse, bool crc)
-+#ifdef __linux__
-+static int sparse_file_read_hole(struct sparse_file* s, int fd)
- {
--       if (crc && !sparse) {
-+       int ret;
-+       uint32_t* buf = (uint32_t*)malloc(s->block_size);
-+       int64_t end = 0;
-+       int64_t start = 0;
-+
-+       if (!buf) {
-+               return -ENOMEM;
-+       }
-+
-+       do {
-+               start = lseek(fd, end, SEEK_DATA);
-+               if (start < 0) {
-+                       if (errno == ENXIO)
-+                               /* The rest of the file is a hole */
-+                               break;
-+
-+                       error("could not seek to data");
-+                       free(buf);
-+                       return -errno;
-+               } else if (start > s->len) {
-+                       break;
-+               }
-+
-+               end = lseek(fd, start, SEEK_HOLE);
-+               if (end < 0) {
-+                       error("could not seek to end");
-+                       free(buf);
-+                       return -errno;
-+               }
-+               end = min(end, s->len);
-+
-+               start = ALIGN_DOWN(start, s->block_size);
-+               end = ALIGN(end, s->block_size);
-+               if (lseek(fd, start, SEEK_SET) < 0) {
-+                       free(buf);
-+                       return -errno;
-+               }
-+
-+               ret = do_sparse_file_read_normal(s, fd, buf, start, end - start);
-+               if (ret) {
-+                       free(buf);
-+                       return ret;
-+               }
-+       } while (end < s->len);
-+
-+       free(buf);
-+       return 0;
-+}
-+#else
-+static int sparse_file_read_hole(struct sparse_file* s __unused, int fd __unused)
-+{
-+       return -ENOTSUP;
-+}
-+#endif
-+
-+int sparse_file_read(struct sparse_file *s, int fd, enum sparse_read_mode mode, bool crc)
-+{
-+       if (crc && mode != SPARSE_READ_MODE_SPARSE) {
-                return -EINVAL;
-        }
- 
--       if (sparse) {
-+       switch (mode) {
-+       case SPARSE_READ_MODE_SPARSE:
-                return sparse_file_read_sparse(s, fd, crc);
--       } else {
-+       case SPARSE_READ_MODE_NORMAL:
-                return sparse_file_read_normal(s, fd);
-+       case SPARSE_READ_MODE_HOLE:
-+               return sparse_file_read_hole(s, fd);
-+       default:
-+               return -EINVAL;
-        }
- }
- 
--- 
-2.35.1.1320.gc452695387.dirty
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch
deleted file mode 100644
index 9d19f58095..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 00cce57eff1a0de3b93efa5da225e9eb33d19659 Mon Sep 17 00:00:00 2001
-From: Sean Anderson <sean.anderson@seco.com>
-Date: Thu, 30 Dec 2021 15:34:28 -0500
-Subject: [PATCH] img2simg: Add support for converting holes to "don't care"
- chunks
-
-This adds support for converting files with holes to "don't care"
-chunks. This can result in a substantial reduction in the time it takes
-to program an image if it has many holes.
-
-Generally, constants compared to argc have been reduced by one, since we
-no longer have the program name as the first argument.
-
-Change-Id: I00750edc07d6415dcc07ae0351e9397b0222b7ba
-Upstream-Status: Backport [6150b00b6025918da8c28e5c2f929ecdf480a9d6]
-Signed-off-by: Sean Anderson <sean.anderson@seco.com>
----
- libsparse/img2simg.c | 41 ++++++++++++++++++++++++++++++-----------
- 1 file changed, 30 insertions(+), 11 deletions(-)
-
-diff --git a/libsparse/img2simg.c b/libsparse/img2simg.c
-index 2e171b613..c985d5449 100644
---- a/libsparse/img2simg.c
-+++ b/libsparse/img2simg.c
-@@ -40,25 +40,42 @@
- 
- void usage()
- {
--    fprintf(stderr, "Usage: img2simg <raw_image_file> <sparse_image_file> [<block_size>]\n");
-+    fprintf(stderr, "Usage: img2simg [-s] <raw_image_file> <sparse_image_file> [<block_size>]\n");
- }
- 
- int main(int argc, char *argv[])
- {
-+       char *arg_in;
-+       char *arg_out;
-+       enum sparse_read_mode mode = SPARSE_READ_MODE_NORMAL;
-+       int extra;
-        int in;
-+       int opt;
-        int out;
-        int ret;
-        struct sparse_file *s;
-        unsigned int block_size = 4096;
-        off64_t len;
- 
--       if (argc < 3 || argc > 4) {
-+       while ((opt = getopt(argc, argv, "s")) != -1) {
-+               switch (opt) {
-+               case 's':
-+                       mode = SPARSE_READ_MODE_HOLE;
-+                       break;
-+               default:
-+                       usage();
-+                       exit(-1);
-+               }
-+       }
-+
-+       extra = argc - optind;
-+       if (extra < 2 || extra > 3) {
-                usage();
-                exit(-1);
-        }
- 
--       if (argc == 4) {
--               block_size = atoi(argv[3]);
-+       if (extra == 3) {
-+               block_size = atoi(argv[optind + 2]);
-        }
- 
-        if (block_size < 1024 || block_size % 4 != 0) {
-@@ -66,22 +83,24 @@ int main(int argc, char *argv[])
-                exit(-1);
-        }
- 
--       if (strcmp(argv[1], "-") == 0) {
-+       arg_in = argv[optind];
-+       if (strcmp(arg_in, "-") == 0) {
-                in = STDIN_FILENO;
-        } else {
--               in = open(argv[1], O_RDONLY | O_BINARY);
-+               in = open(arg_in, O_RDONLY | O_BINARY);
-                if (in < 0) {
--                       fprintf(stderr, "Cannot open input file %s\n", argv[1]);
-+                       fprintf(stderr, "Cannot open input file %s\n", arg_in);
-                        exit(-1);
-                }
-        }
- 
--       if (strcmp(argv[2], "-") == 0) {
-+       arg_out = argv[optind + 1];
-+       if (strcmp(arg_out, "-") == 0) {
-                out = STDOUT_FILENO;
-        } else {
--               out = open(argv[2], O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
-+               out = open(arg_out, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
-                if (out < 0) {
--                       fprintf(stderr, "Cannot open output file %s\n", argv[2]);
-+                       fprintf(stderr, "Cannot open output file %s\n", arg_out);
-                        exit(-1);
-                }
-        }
-@@ -96,7 +115,7 @@ int main(int argc, char *argv[])
-        }
- 
-        sparse_file_verbose(s);
--       ret = sparse_file_read(s, in, SPARSE_READ_MODE_NORMAL, false);
-+       ret = sparse_file_read(s, in, mode, false);
-        if (ret) {
-                fprintf(stderr, "Failed to read file\n");
-                exit(-1);
--- 
-2.35.1.1320.gc452695387.dirty
-
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
deleted file mode 100644
index ddb41ea4b0..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: adb: Make compatible with openssl 1.1
- OpenSSL version 1.1 brought some API changes which broke the build here,
- fix that by accessing rsa->n (and e) directly, using RSA_get0_key instead.
-Author: Chirayu Desai <chirayudesai1@gmail.com
-Last-Update: 2016-11-10
----
-Upstream-Status: Pending
-
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
-Upstream-Status: Pending
-
- system/core/adb/adb_auth_host.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/adb/adb_auth_host.c
-+++ 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();
-+    const BIGNUM* n;
-     BIGNUM* n0inv = BN_new();
-+    const BIGNUM* e;
- 
-     if (RSA_size(rsa) != RSANUMBYTES) {
-         ret = 0;
-@@ -82,7 +83,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
-     }
- 
-     BN_set_bit(r32, 32);
--    BN_copy(n, rsa->n);
-+    RSA_get0_key(rsa, &n, &e, NULL);
-     BN_set_bit(r, RSANUMWORDS * 32);
-     BN_mod_sqr(rr, r, n, ctx);
-     BN_div(NULL, rem, n, r32, ctx);
-@@ -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);
-     }
--    pkey->exponent = BN_get_word(rsa->e);
-+    pkey->exponent = BN_get_word(e);
- 
- 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/core/b64_pton_function_decl.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/b64_pton_function_decl.patch
deleted file mode 100644
index 80410f1d2b..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/b64_pton_function_decl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Add protoype declaration for  b64_pton
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/adb/adb_auth_client.c
-+++ b/adb/adb_auth_client.c
-@@ -29,6 +29,7 @@
- 
- #define TRACE_TAG TRACE_AUTH
- 
-+extern int b64_pton(const char* src, uint8_t* target, size_t targsize);
- 
- struct adb_public_key {
-     struct listnode node;
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-notifying-systemd.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-notifying-systemd.patch
new file mode 100644
index 0000000000..a5caf39c80
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-notifying-systemd.patch
@@ -0,0 +1,41 @@
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Fri, 30 Sep 2022 16:54:02 +0200
+Subject: adb: daemon: allow notifying systemd when ready
+
+When using `systemd` on Linux, we should allow `adbd` to notify
+`systemd` once it has started and configured its USB/network interface.
+This allows us to (for example) wait for the daemon to bind to the
+FunctionFS endpoints, then activate the USB gadget.
+
+Forwarded: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2238429
+Upstream-Status: Inappropriate [Debian-specific]
+---
+ packages/modules/adb/daemon/main.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/packages/modules/adb/daemon/main.cpp b/packages/modules/adb/daemon/main.cpp
+index d1b999b..deba593 100644
+--- a/packages/modules/adb/daemon/main.cpp
++++ b/packages/modules/adb/daemon/main.cpp
+@@ -49,6 +49,10 @@
+ #include "selinux/android.h"
+ #endif
+ 
++#if defined(__linux__)
++#include <systemd/sd-daemon.h>
++#endif
++
+ #include "adb.h"
+ #include "adb_auth.h"
+ #include "adb_listeners.h"
+@@ -302,6 +306,10 @@ int adbd_main(int server_port) {
+     init_jdwp();
+     D("adbd_main(): post init_jdwp()");
+ 
++#if defined(__linux__)
++    sd_notify(1, "READY=1");
++#endif
++
+     D("Event loop starting");
+     fdevent_loop();
+ 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-usb-on-linux.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-usb-on-linux.patch
new file mode 100644
index 0000000000..76e2427fc2
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-usb-on-linux.patch
@@ -0,0 +1,28 @@
+From: Julien Massot <julien.massot@collabora.com>
+Date: Mon, 5 Sep 2022 16:00:12 +0200
+Subject: adb: daemon: allow binding to USB on Linux systems
+
+Linux systems are also capable of using FunctionFS for USB gadget
+configurations. This requires creating a specific gadget configuration
+using ConfigFS (including an `ffs.adb` function) and mounting
+FunctionFS to `/dev/usb-ffs/adb`.
+
+Forwarded: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2238428
+Upstream-Status: Inappropriate [Debian-specific]
+---
+ packages/modules/adb/daemon/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/modules/adb/daemon/main.cpp b/packages/modules/adb/daemon/main.cpp
+index 188272a..6c949c1 100644
+--- a/packages/modules/adb/daemon/main.cpp
++++ b/packages/modules/adb/daemon/main.cpp
+@@ -251,7 +251,7 @@ int adbd_main(int server_port) {
+ 
+     bool is_usb = false;
+ 
+-#if defined(__ANDROID__)
++#if defined(__linux__)
+     if (access(USB_FFS_ADB_EP0, F_OK) == 0) {
+         // Listen on USB.
+         usb_init();
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-don-t-require-authorization-on-Linux.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-don-t-require-authorization-on-Linux.patch
new file mode 100644
index 0000000000..5d3ed124bc
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-don-t-require-authorization-on-Linux.patch
@@ -0,0 +1,27 @@
+From 2427e520751b13a6e0a409f427f1ec9b23e63447 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Wed, 3 May 2023 18:36:06 +0200
+Subject: [PATCH] adb: daemon: don't require authorization on Linux
+
+Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Upstream-Status: Inappropriate [Debian-specific]
+---
+ packages/modules/adb/daemon/main.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/packages/modules/adb/daemon/main.cpp b/packages/modules/adb/daemon/main.cpp
+index 188272ae3..02a57f4e2 100644
+--- a/packages/modules/adb/daemon/main.cpp
++++ b/packages/modules/adb/daemon/main.cpp
+@@ -224,6 +224,8 @@ int adbd_main(int server_port) {
+         auth_required = android::base::GetBoolProperty("ro.adb.secure", false);
+ #endif
+     }
++#else
++    auth_required = false;
+ #endif
+ 
+     // Our external storage path may be different than apps, since
+-- 
+2.39.2
+
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-usb-drop-property-monitor.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-usb-drop-property-monitor.patch
new file mode 100644
index 0000000000..0f1d3f7a6f
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-usb-drop-property-monitor.patch
@@ -0,0 +1,57 @@
+From ba56ee6f092601932f9146eeb4f8b057da157be2 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Tue, 2 May 2023 17:16:22 +0200
+Subject: [PATCH] adb: daemon: usb: drop property monitor
+
+This is an Android-only feature not available on Linux.
+Upstream-Status: Inappropriate [Debian-specific]
+---
+ packages/modules/adb/daemon/usb.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/packages/modules/adb/daemon/usb.cpp b/packages/modules/adb/daemon/usb.cpp
+index ec22f6661..e904a7629 100644
+--- a/packages/modules/adb/daemon/usb.cpp
++++ b/packages/modules/adb/daemon/usb.cpp
+@@ -48,7 +48,9 @@
+ 
+ #include "adb_unique_fd.h"
+ #include "adb_utils.h"
++#if defined(__ANDROID__)
+ #include "daemon/property_monitor.h"
++#endif
+ #include "daemon/usb_ffs.h"
+ #include "sysdeps/chrono.h"
+ #include "transfer_id.h"
+@@ -744,6 +746,7 @@ struct UsbFfsConnection : public Connection {
+ static void usb_ffs_open_thread() {
+     adb_thread_setname("usb ffs open");
+ 
++#if defined(__ANDROID__)
+     // When the device is acting as a USB host, we'll be unable to bind to the USB gadget on kernels
+     // that don't carry a downstream patch to enable that behavior.
+     //
+@@ -757,6 +760,7 @@ static void usb_ffs_open_thread() {
+         // Return false (i.e. break out of PropertyMonitor::Run) when the property != 1.
+         return android::base::ParseBool(value) == android::base::ParseBoolResult::kTrue;
+     });
++#endif
+ 
+     while (true) {
+         unique_fd control;
+@@ -767,11 +771,13 @@ static void usb_ffs_open_thread() {
+             continue;
+         }
+ 
++#if defined(__ANDROID__)
+         if (android::base::GetBoolProperty(kPropertyUsbDisabled, false)) {
+             LOG(INFO) << "pausing USB due to " << kPropertyUsbDisabled;
+             prop_mon.Run();
+             LOG(INFO) << "resuming USB";
+         }
++#endif
+ 
+         atransport* transport = new atransport();
+         transport->serial = "UsbFfs";
+-- 
+2.39.2
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-dev-typos.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-dev-typos.patch
new file mode 100644
index 0000000000..2ac7d66bd4
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-dev-typos.patch
@@ -0,0 +1,16 @@
+Description: Fix typos
+Author: Kai-Chung Yan (殷啟聰)
+Last-Update: 2016-10-01
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/development/tools/etc1tool/etc1tool.cpp
++++ b/development/tools/etc1tool/etc1tool.cpp
+@@ -56,7 +56,7 @@
+             "\t\t                             image to difffile. (Only valid when encoding).\n");
+     fprintf(stderr,
+             "\tIf outfile is not specified, an outfile path is constructed from infile,\n");
+-    fprintf(stderr, "\twith the apropriate suffix (.pkm or .png).\n");
++    fprintf(stderr, "\twith the appropriate suffix (.pkm or .png).\n");
+     exit(1);
+ }
+ 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-Nullable.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-Nullable.patch
new file mode 100644
index 0000000000..e9a9a91bfb
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-Nullable.patch
@@ -0,0 +1,14 @@
+Description: Bring Clang's _Nullable keyword to GCC
+ This patch is for gcc only, no need for clang.
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/libnativehelper/file_descriptor_jni.c
++++ b/libnativehelper/file_descriptor_jni.c
+@@ -22,6 +22,7 @@
+ #include "ALog-priv.h"
+ 
+ #include "JniConstants.h"
++#define _Nullable
+ 
+ static void EnsureArgumentIsFileDescriptor(JNIEnv* env, jobject instance) {
+     ALOG_ALWAYS_FATAL_IF(instance == NULL, "FileDescriptor is NULL");
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-stdatomic.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-stdatomic.patch
new file mode 100644
index 0000000000..ed670eacf4
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-stdatomic.patch
@@ -0,0 +1,68 @@
+Description: Fix incompatibility between <stdatomic.h> and <atomic>
+ This 2 headers combined will cause errors for both GCC and Clang. This patch
+ makes sure only one of them is present at any time.
+ .
+ This patch is for gcc only, no need for clang.
+Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932
+Bug: https://reviews.llvm.org/D45470
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/core/libcutils/include/cutils/atomic.h
++++ b/system/core/libcutils/include/cutils/atomic.h
+@@ -19,7 +19,23 @@
+ 
+ #include <stdint.h>
+ #include <sys/types.h>
++#ifdef __cplusplus
++#include <atomic>
++using std::atomic_compare_exchange_strong_explicit;
++using std::atomic_fetch_add_explicit;
++using std::atomic_fetch_or_explicit;
++using std::atomic_fetch_sub_explicit;
++using std::atomic_int_least32_t;
++using std::atomic_load_explicit;
++using std::atomic_store_explicit;
++using std::atomic_thread_fence;
++using std::memory_order::memory_order_acquire;
++using std::memory_order::memory_order_relaxed;
++using std::memory_order::memory_order_release;
++using std::memory_order::memory_order_seq_cst;
++#else
+ #include <stdatomic.h>
++#endif
+ 
+ #ifndef ANDROID_ATOMIC_INLINE
+ #define ANDROID_ATOMIC_INLINE static inline
+--- a/system/core/libcutils/include/cutils/trace.h
++++ b/system/core/libcutils/include/cutils/trace.h
+@@ -18,7 +18,14 @@
+ #define _LIBS_CUTILS_TRACE_H
+ 
+ #include <inttypes.h>
++#ifdef __cplusplus
++#include <atomic>
++using std::atomic_bool;
++using std::atomic_load_explicit;
++using std::memory_order_acquire;
++#else
+ #include <stdatomic.h>
++#endif
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
+--- a/system/logging/liblog/logger.h
++++ b/system/logging/liblog/logger.h
+@@ -16,7 +16,13 @@
+ 
+ #pragma once
+ 
++#ifdef __cplusplus
++#include <atomic>
++using std::atomic_int;
++using std::atomic_uintptr_t;
++#else
+ #include <stdatomic.h>
++#endif
+ #include <sys/cdefs.h>
+ 
+ #include <log/log.h>
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-workaround__builtin_available.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-workaround__builtin_available.patch
new file mode 100644
index 0000000000..60ca08cc24
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-workaround__builtin_available.patch
@@ -0,0 +1,148 @@
+Description: Workaround Clang's __builtin_available keyword
+ This patch is for gcc only, no need for clang.
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/libbase/logging.cpp
++++ b/system/libbase/logging.cpp
+@@ -209,8 +209,9 @@ static std::recursive_mutex& TagLock() {
+ static std::string* gDefaultTag;
+ 
+ void SetDefaultTag(const std::string& tag) {
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     __android_log_set_default_tag(tag.c_str());
++#if 0
+   } else {
+     std::lock_guard<std::recursive_mutex> lock(TagLock());
+     if (gDefaultTag != nullptr) {
+@@ -221,6 +222,7 @@ void SetDefaultTag(const std::string& tag) {
+       gDefaultTag = new std::string(tag);
+     }
+   }
++#endif
+ }
+ 
+ static bool gInitialized = false;
+@@ -314,13 +316,15 @@ static void LogdLogChunk(LogId id, LogSeverity severity, const char* tag, const
+   int32_t lg_id = LogIdTolog_id_t(id);
+   int32_t priority = LogSeverityToPriority(severity);
+ 
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     __android_log_message log_message = {sizeof(__android_log_message),     lg_id, priority, tag,
+                                          static_cast<const char*>(nullptr), 0,     message};
+     __android_log_logd_logger(&log_message);
++#if 0
+   } else {
+     __android_log_buf_print(lg_id, priority, tag, "%s", message);
+   }
++#endif
+ }
+ 
+ LogdLogger::LogdLogger(LogId default_log_id) : default_log_id_(default_log_id) {}
+@@ -396,7 +400,7 @@ LogFunction SetLogger(LogFunction&& logger) {
+   LogFunction old_logger = std::move(Logger());
+   Logger() = std::move(logger);
+ 
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     __android_log_set_logger([](const struct __android_log_message* log_message) {
+       auto log_id = log_id_tToLogId(log_message->buffer_id);
+       auto severity = PriorityToLogSeverity(log_message->priority);
+@@ -404,7 +408,7 @@ LogFunction SetLogger(LogFunction&& logger) {
+       Logger()(log_id, severity, log_message->tag, log_message->file, log_message->line,
+                log_message->message);
+     });
+-  }
++//  }
+   return old_logger;
+ }
+ 
+@@ -412,9 +416,9 @@ AbortFunction SetAborter(AbortFunction&& aborter) {
+   AbortFunction old_aborter = std::move(Aborter());
+   Aborter() = std::move(aborter);
+ 
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     __android_log_set_aborter([](const char* abort_message) { Aborter()(abort_message); });
+-  }
++//  }
+   return old_aborter;
+ }
+ 
+@@ -500,11 +504,13 @@ LogMessage::~LogMessage() {
+ 
+   // Abort if necessary.
+   if (data_->GetSeverity() == FATAL) {
+-    if (__builtin_available(android 30, *)) {
++//    if (__builtin_available(android 30, *)) {
+       __android_log_call_aborter(msg.c_str());
++#if 0
+     } else {
+       Aborter()(msg.c_str());
+     }
++#endif
+   }
+ }
+ 
+@@ -515,10 +521,11 @@ std::ostream& LogMessage::stream() {
+ void LogMessage::LogLine(const char* file, unsigned int line, LogSeverity severity, const char* tag,
+                          const char* message) {
+   int32_t priority = LogSeverityToPriority(severity);
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     __android_log_message log_message = {
+         sizeof(__android_log_message), LOG_ID_DEFAULT, priority, tag, file, line, message};
+     __android_log_write_log_message(&log_message);
++#if 0
+   } else {
+     if (tag == nullptr) {
+       std::lock_guard<std::recursive_mutex> lock(TagLock());
+@@ -531,37 +538,44 @@ void LogMessage::LogLine(const char* file, unsigned int line, LogSeverity severi
+       Logger()(DEFAULT, severity, tag, file, line, message);
+     }
+   }
++#endif
+ }
+ 
+ LogSeverity GetMinimumLogSeverity() {
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     return PriorityToLogSeverity(__android_log_get_minimum_priority());
++#if 0
+   } else {
+     return gMinimumLogSeverity;
+   }
++#endif
+ }
+ 
+ bool ShouldLog(LogSeverity severity, const char* tag) {
+   // Even though we're not using the R liblog functions in this function, if we're running on Q,
+   // we need to fall back to using gMinimumLogSeverity, since __android_log_is_loggable() will not
+   // take into consideration the value from SetMinimumLogSeverity().
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     int32_t priority = LogSeverityToPriority(severity);
+     return __android_log_is_loggable(priority, tag, ANDROID_LOG_INFO);
++#if 0
+   } else {
+     return severity >= gMinimumLogSeverity;
+   }
++#endif
+ }
+ 
+ LogSeverity SetMinimumLogSeverity(LogSeverity new_severity) {
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     int32_t priority = LogSeverityToPriority(new_severity);
+     return PriorityToLogSeverity(__android_log_set_minimum_priority(priority));
++#if 0
+   } else {
+     LogSeverity old_severity = gMinimumLogSeverity;
+     gMinimumLogSeverity = new_severity;
+     return old_severity;
+   }
++#endif
+ }
+ 
+ ScopedLogSeverity::ScopedLogSeverity(LogSeverity new_severity) {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Added-missing-headers.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Added-missing-headers.patch
new file mode 100644
index 0000000000..38ff305870
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Added-missing-headers.patch
@@ -0,0 +1,15 @@
+Description: Added missing headers causing compile errors
+Author: Umang Parmar <umangjparmar@gmail.com>
+Forwarded: not-needed
+
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/packages/modules/adb/pairing_connection/pairing_server.cpp
++++ b/packages/modules/adb/pairing_connection/pairing_server.cpp
+@@ -20,6 +20,7 @@
+ #include <sys/eventfd.h>
+ 
+ #include <atomic>
++#include <condition_variable>
+ #include <deque>
+ #include <iomanip>
+ #include <mutex>
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Drop-gki-dependency-from-mkbootimg.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Drop-gki-dependency-from-mkbootimg.patch
new file mode 100644
index 0000000000..6b940df707
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Drop-gki-dependency-from-mkbootimg.patch
@@ -0,0 +1,114 @@
+Description: Drop gki dependency from mkbootimg
+ `mkbootimg` is currently unusable due to a missing `gki` python
+ module. This module is only needed for signing GKI boot images, which
+ is deprecated as the argument group description implies.
+ This patch disables this (deprecated) signature feature entirely as
+ it's unlikely Debian users will actually need it.
+Author: Arnaud Ferraris <aferraris@debian.org>
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/tools/mkbootimg/mkbootimg.py
++++ b/system/tools/mkbootimg/mkbootimg.py
+@@ -28,8 +28,6 @@ import os
+ import re
+ import tempfile
+ 
+-from gki.generate_gki_certificate import generate_gki_certificate
+-
+ # Constant and structure definition is in
+ # system/tools/mkbootimg/include/bootimg/bootimg.h
+ BOOT_MAGIC = 'ANDROID!'
+@@ -105,12 +103,6 @@ def get_recovery_dtbo_offset(args):
+     return dtbo_offset
+ 
+ 
+-def should_add_legacy_gki_boot_signature(args):
+-    if args.gki_signing_key and args.gki_signing_algorithm:
+-        return True
+-    return False
+-
+-
+ def write_header_v3_and_above(args):
+     if args.header_version > 3:
+         boot_header_size = BOOT_IMAGE_HEADER_V4_SIZE
+@@ -134,8 +126,6 @@ def write_header_v3_and_above(args):
+     if args.header_version >= 4:
+         # The signature used to verify boot image v4.
+         boot_signature_size = 0
+-        if should_add_legacy_gki_boot_signature(args):
+-            boot_signature_size = BOOT_IMAGE_V4_SIGNATURE_SIZE
+         args.output.write(pack('I', boot_signature_size))
+     pad_file(args.output, BOOT_IMAGE_HEADER_V3_PAGESIZE)
+ 
+@@ -549,19 +539,6 @@ def parse_cmdline():
+     parser.add_argument('--vendor_bootconfig', type=FileType('rb'),
+                         help='path to the vendor bootconfig file')
+ 
+-    gki_2_0_signing_args = parser.add_argument_group(
+-        '[DEPRECATED] GKI 2.0 signing arguments')
+-    gki_2_0_signing_args.add_argument(
+-        '--gki_signing_algorithm', help='GKI signing algorithm to use')
+-    gki_2_0_signing_args.add_argument(
+-        '--gki_signing_key', help='path to RSA private key file')
+-    gki_2_0_signing_args.add_argument(
+-        '--gki_signing_signature_args', default='',
+-        help='other hash arguments passed to avbtool')
+-    gki_2_0_signing_args.add_argument(
+-        '--gki_signing_avbtool_path', default='avbtool',
+-        help='path to avbtool for boot signature generation')
+-
+     args, extra_args = parser.parse_known_args()
+     if args.vendor_boot is not None and args.header_version > 3:
+         extra_args = parse_vendor_ramdisk_args(args, extra_args)
+@@ -577,42 +554,6 @@ def parse_cmdline():
+     return args
+ 
+ 
+-def add_boot_image_signature(args, pagesize):
+-    """Adds the boot image signature.
+-
+-    Note that the signature will only be verified in VTS to ensure a
+-    generic boot.img is used. It will not be used by the device
+-    bootloader at boot time. The bootloader should only verify
+-    the boot vbmeta at the end of the boot partition (or in the top-level
+-    vbmeta partition) via the Android Verified Boot process, when the
+-    device boots.
+-    """
+-    # Flush the buffer for signature calculation.
+-    args.output.flush()
+-
+-    # Outputs the signed vbmeta to a separate file, then append to boot.img
+-    # as the boot signature.
+-    with tempfile.TemporaryDirectory() as temp_out_dir:
+-        boot_signature_output = os.path.join(temp_out_dir, 'boot_signature')
+-        generate_gki_certificate(
+-            image=args.output.name, avbtool=args.gki_signing_avbtool_path,
+-            name='boot', algorithm=args.gki_signing_algorithm,
+-            key=args.gki_signing_key, salt='d00df00d',
+-            additional_avb_args=args.gki_signing_signature_args.split(),
+-            output=boot_signature_output,
+-        )
+-        with open(boot_signature_output, 'rb') as boot_signature:
+-            boot_signature_bytes = boot_signature.read()
+-            if len(boot_signature_bytes) > BOOT_IMAGE_V4_SIGNATURE_SIZE:
+-                raise ValueError(
+-                    f'boot sigature size is > {BOOT_IMAGE_V4_SIGNATURE_SIZE}')
+-            boot_signature_bytes += b'\x00' * (
+-                BOOT_IMAGE_V4_SIGNATURE_SIZE - len(boot_signature_bytes))
+-            assert len(boot_signature_bytes) == BOOT_IMAGE_V4_SIGNATURE_SIZE
+-            args.output.write(boot_signature_bytes)
+-            pad_file(args.output, pagesize)
+-
+-
+ def write_data(args, pagesize):
+     write_padded_file(args.output, args.kernel, pagesize)
+     write_padded_file(args.output, args.ramdisk, pagesize)
+@@ -622,8 +563,6 @@ def write_data(args, pagesize):
+         write_padded_file(args.output, args.recovery_dtbo, pagesize)
+     if args.header_version == 2:
+         write_padded_file(args.output, args.dtb, pagesize)
+-    if args.header_version >= 4 and should_add_legacy_gki_boot_signature(args):
+-        add_boot_image_signature(args, pagesize)
+ 
+ 
+ def write_vendor_boot_data(args):
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Implement-const_iterator-operator.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Implement-const_iterator-operator.patch
new file mode 100644
index 0000000000..4679edd537
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Implement-const_iterator-operator.patch
@@ -0,0 +1,37 @@
+Description: Implement const_iterator::operator--
+Forwarded: not-needed
+
+Needed for
+android-platform-frameworks-base/libs/androidfw/LoadedArsc.cpp
+when compiling against libstdc++.
+Upstream-Status: Inappropriate [Debian-specific]
+---
+--- a/system/incremental_delivery/incfs/util/include/util/map_ptr.h
++++ b/system/incremental_delivery/incfs/util/include/util/map_ptr.h
+@@ -180,6 +180,11 @@ public:
+             return *this;
+         }
+ 
++        const const_iterator& operator--() {
++            safe_ptr_--;
++            return *this;
++        }
++
+         const_iterator& operator+=(int n) {
+             safe_ptr_ = safe_ptr_ + n;
+             return *this;
+@@ -321,6 +326,14 @@ public:
+         return temp;
+     }
+ 
++    template <typename T1 = T, NotVoid<T1> = 0>
++    const map_ptr<T1> operator--(int) {
++        map_ptr<T1> temp = *this;
++        LIBINCFS_MAP_PTR_DEBUG_CODE(verified_ = false);
++        --ptr_;
++        return temp;
++    }
++
+     template <typename S, typename T1 = T, NotVoid<T1> = 0>
+     map_ptr<T1> operator+(const S n) const {
+         return map_ptr<T1>(map_, ptr_ + n, verified_block_);
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-add-missing-headers.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-add-missing-headers.patch
new file mode 100644
index 0000000000..b0bac72320
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-add-missing-headers.patch
@@ -0,0 +1,13 @@
+Description: add missing headers
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/core/fastboot/fastboot_driver_interface.h
++++ b/system/core/fastboot/fastboot_driver_interface.h
+@@ -17,6 +17,7 @@
+ 
+ #include <string>
+ 
++#include <stdint.h>
+ #include "android-base/unique_fd.h"
+ 
+ class Transport;
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-hard-code-build-number.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-hard-code-build-number.patch
new file mode 100644
index 0000000000..7555ba6406
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-hard-code-build-number.patch
@@ -0,0 +1,57 @@
+Description: just hard code rather than deal with circular deps
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/packages/modules/adb/adb.cpp
++++ b/packages/modules/adb/adb.cpp
+@@ -47,9 +47,6 @@
+ #include <android-base/utf8.h>
+ #include <diagnose_usb.h>
+ 
+-#include <build/version.h>
+-#include <platform_tools_version.h>
+-
+ #include "adb_auth.h"
+ #include "adb_io.h"
+ #include "adb_listeners.h"
+@@ -100,7 +97,7 @@
+             "Installed as %s\n"
+             "Running on %s\n",
+             ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, PLATFORM_TOOLS_VERSION,
+-            android::build::GetBuildNumber().c_str(), android::base::GetExecutablePath().c_str(),
++            "debian", android::base::GetExecutablePath().c_str(),
+             GetOSVersion().c_str());
+ }
+ 
+@@ -1339,7 +1339,7 @@ HostRequestResult handle_host_request(std::string_view service, TransportType ty
+         status.set_mdns_backend_forced(getenv("ADB_MDNS_OPENSCREEN") != nullptr);
+ 
+         status.set_version(std::string(PLATFORM_TOOLS_VERSION));
+-        status.set_build(android::build::GetBuildNumber());
++        status.set_build("debian");
+         status.set_executable_absolute_path(android::base::GetExecutablePath());
+         status.set_log_absolute_path(GetLogFilePath());
+         status.set_os(GetOSVersion());
+--- a/system/core/fastboot/fastboot.cpp
++++ b/system/core/fastboot/fastboot.cpp
+@@ -64,11 +64,9 @@
+ #include <android-base/stringprintf.h>
+ #include <android-base/strings.h>
+ #include <android-base/unique_fd.h>
+-#include <build/version.h>
+ #include <libavb/libavb.h>
+ #include <liblp/liblp.h>
+ #include <liblp/super_layout_builder.h>
+-#include <platform_tools_version.h>
+ #include <sparse/sparse.h>
+ #include <ziparchive/zip_archive.h>
+ 
+@@ -1962,8 +1960,7 @@
+                 setvbuf(stdout, nullptr, _IONBF, 0);
+                 setvbuf(stderr, nullptr, _IONBF, 0);
+             } else if (name == "version") {
+-                fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION,
+-                        android::build::GetBuildNumber().c_str());
++                fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, "debian");
+                 fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str());
+                 return 0;
+             } else {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-libusb-header-path.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-libusb-header-path.patch
new file mode 100644
index 0000000000..9a15ec1a19
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-libusb-header-path.patch
@@ -0,0 +1,17 @@
+Description: libusb.h comes from different location
+Author: Umang Parmar <umangjparmar@gmail.com>
+Forwarded: not-needed
+Last-Update: 2018-05-26
+
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/packages/modules/adb/client/usb_libusb.cpp
++++ b/packages/modules/adb/client/usb_libusb.cpp
+@@ -36,7 +36,7 @@
+ #include <unordered_map>
+ #include <vector>
+ 
+-#include <libusb/libusb.h>
++#include <libusb-1.0/libusb.h>
+ 
+ #include <android-base/file.h>
+ #include <android-base/logging.h>
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-move-log-file-to-proper-dir.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-move-log-file-to-proper-dir.patch
new file mode 100644
index 0000000000..201ec62bca
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-move-log-file-to-proper-dir.patch
@@ -0,0 +1,19 @@
+Description: Update log file directory.
+Author: Umang Parmar <umangjparmar@gmail.com>
+Last Updated: 2018-05-17
+
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/packages/modules/adb/adb_utils.cpp
++++ b/packages/modules/adb/adb_utils.cpp
+@@ -343,6 +343,11 @@
+ 
+     return temp_path_utf8 + log_name;
+ #else
++    std::string log_dir = android::base::StringPrintf("/run/user/%u/adb.log", getuid());
++    struct stat st = {0};
++    if (stat(log_dir.c_str(), &st) == 0) {
++      return log_dir;
++    }
+     const char* tmp_dir = getenv("TMPDIR");
+     if (tmp_dir == nullptr) tmp_dir = "/tmp";
+     return android::base::StringPrintf("%s/adb.%u.log", tmp_dir, getuid());
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-stub-out-fastdeploy.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-stub-out-fastdeploy.patch
new file mode 100644
index 0000000000..fb16cff79a
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-stub-out-fastdeploy.patch
@@ -0,0 +1,99 @@
+Description: Defer packaging fastdeploy with adb for 29.x.x tags.
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/packages/modules/adb/client/adb_install.cpp
++++ b/packages/modules/adb/client/adb_install.cpp
+@@ -185,14 +185,6 @@
+     }
+ 
+     if (use_fastdeploy) {
+-        auto metadata = extract_metadata(file);
+-        if (metadata.has_value()) {
+-            // pass all but 1st (command) and last (apk path) parameters through to pm for
+-            // session creation
+-            std::vector<const char*> pm_args{argv + 1, argv + argc - 1};
+-            auto patchFd = install_patch(pm_args.size(), pm_args.data());
+-            return stream_patch(file, std::move(metadata.value()), std::move(patchFd));
+-        }
+     }
+ 
+     struct stat sb;
+@@ -280,16 +272,6 @@
+     argv[last_apk] = apk_dest.c_str(); /* destination name, not source location */
+ 
+     if (use_fastdeploy) {
+-        auto metadata = extract_metadata(apk_file[0]);
+-        if (metadata.has_value()) {
+-            auto patchFd = apply_patch_on_device(apk_dest.c_str());
+-            int status = stream_patch(apk_file[0], std::move(metadata.value()), std::move(patchFd));
+-
+-            result = pm_command(argc, argv);
+-            delete_device_file(apk_dest);
+-
+-            return status;
+-        }
+     }
+ 
+     if (do_sync_push(apk_file, apk_dest.c_str(), false, CompressionType::Any, false, false)) {
+@@ -457,7 +439,6 @@
+         std::vector<const char*> argv, bool* use_fastdeploy,
+         FastDeploy_AgentUpdateStrategy* agent_update_strategy) {
+     *use_fastdeploy = false;
+-    *agent_update_strategy = FastDeploy_AgentUpdateDifferentVersion;
+ 
+     std::vector<const char*> passthrough;
+     for (auto&& arg : argv) {
+@@ -466,11 +447,8 @@
+         } else if (arg == "--no-fastdeploy"sv) {
+             *use_fastdeploy = false;
+         } else if (arg == "--force-agent"sv) {
+-            *agent_update_strategy = FastDeploy_AgentUpdateAlways;
+         } else if (arg == "--date-check-agent"sv) {
+-            *agent_update_strategy = FastDeploy_AgentUpdateNewerTimeStamp;
+         } else if (arg == "--version-check-agent"sv) {
+-            *agent_update_strategy = FastDeploy_AgentUpdateDifferentVersion;
+         } else {
+             passthrough.push_back(arg);
+         }
+@@ -484,12 +462,11 @@
+     bool incremental_wait = false;
+ 
+     bool use_fastdeploy = false;
+-    FastDeploy_AgentUpdateStrategy agent_update_strategy = FastDeploy_AgentUpdateDifferentVersion;
+ 
+     auto unused_argv = parse_install_mode({argv, argv + argc}, &install_mode, &incremental_request,
+                                           &incremental_wait);
+     auto passthrough_argv =
+-            parse_fast_deploy_mode(std::move(unused_argv), &use_fastdeploy, &agent_update_strategy);
++            parse_fast_deploy_mode(std::move(unused_argv), &use_fastdeploy, nullptr);
+ 
+     auto [primary_mode, fallback_mode] =
+             calculate_install_mode(install_mode, use_fastdeploy, incremental_request);
+@@ -499,14 +476,11 @@
+         error_exit("Attempting to use streaming install on unsupported device");
+     }
+ 
+-    if (use_fastdeploy && get_device_api_level() < kFastDeployMinApi) {
+-        fprintf(stderr,
+-                "Fast Deploy is only compatible with devices of API version %d or higher, "
+-                "ignoring.\n",
+-                kFastDeployMinApi);
++    if (use_fastdeploy) {
++        printf("Fast Deploy is unavailable in this build of adb, "
++               "ignoring.\n");
+         use_fastdeploy = false;
+     }
+-    fastdeploy_set_agent_update_strategy(agent_update_strategy);
+ 
+     if (passthrough_argv.size() < 2) {
+         error_exit("install requires an apk argument");
+--- a/packages/modules/adb/client/commandline.cpp
++++ b/packages/modules/adb/client/commandline.cpp
+@@ -63,7 +63,6 @@
+ #include "bugreport.h"
+ #include "client/file_sync_client.h"
+ #include "commandline.h"
+-#include "fastdeploy.h"
+ #include "incremental_server.h"
+ #include "services.h"
+ #include "shell_protocol.h"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-throw-exception-on-unknown-os.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-throw-exception-on-unknown-os.patch
new file mode 100644
index 0000000000..2e254e0d46
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-throw-exception-on-unknown-os.patch
@@ -0,0 +1,17 @@
+Description: Turn #error into exceptions
+ So the library can be built on non-Linux platforms too, although can't
+ guarauntee its functionality regarding that piece of code.
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/libbase/file.cpp
++++ b/system/libbase/file.cpp
+@@ -461,7 +461,8 @@
+ #elif defined(__EMSCRIPTEN__)
+   abort();
+ #else
+-#error unknown OS
++#include <stdexcept>
++  throw std::runtime_error(std::string("Unknown OS!"));
+ #endif
+ }
+ 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-unwindstack-porting.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-unwindstack-porting.patch
new file mode 100644
index 0000000000..8bcfa8fe27
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-unwindstack-porting.patch
@@ -0,0 +1,14 @@
+Description: unwindstack porting
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/unwinding/libunwindstack/include/unwindstack/RegsGetLocal.h
++++ b/system/unwinding/libunwindstack/include/unwindstack/RegsGetLocal.h
+@@ -123,7 +123,7 @@
+       : "t1", "memory");
+ }
+ 
+-#elif defined(__i386__) || defined(__x86_64__)
++#else
+ 
+ // Do not change this, some libraries depend on this function existing on
+ // these architectures.
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk b/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk
deleted file mode 100644
index c18aa9c4d2..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-# Makefile for ext4_utils
-
-SRCDIR ?= $(S)
-
-VPATH += $(SRCDIR)/system/extras/ext4_utils
-make_ext4fs_SRC_FILES += make_ext4fs_main.c
-make_ext4fs_SRC_FILES += canned_fs_config.c
-make_ext4fs_OBJS := $(make_ext4fs_SRC_FILES:.c=.o)
-
-ext2simg_SRC_FILES += ext2simg.c
-ext2simg_OBJS := $(ext2simg_SRC_FILES:.c=.o)
-
-ext4fixup_SRC_FILES += ext4fixup_main.c
-ext4fixup_OBJS := $(ext4fixup_SRC_FILES:.c=.o)
-
-libext4_utils_SRC_FILES += make_ext4fs.c
-libext4_utils_SRC_FILES += ext4fixup.c
-libext4_utils_SRC_FILES += ext4_utils.c
-libext4_utils_SRC_FILES += allocate.c
-libext4_utils_SRC_FILES += contents.c
-libext4_utils_SRC_FILES += extent.c
-libext4_utils_SRC_FILES += indirect.c
-libext4_utils_SRC_FILES += uuid.c
-libext4_utils_SRC_FILES += sha1.c
-libext4_utils_SRC_FILES += wipe.c
-libext4_utils_SRC_FILES += crc16.c
-libext4_utils_SRC_FILES += ext4_sb.c
-libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libsparse
-simg2img_SRC_FILES += simg2img.c
-simg2img_SRC_FILES += sparse_crc32.c
-simg2img_OBJS := $(simg2img_SRC_FILES:.c=.o)
-
-img2simg_SRC_FILES += img2simg.c
-img2simg_OBJS := $(img2simg_SRC_FILES:.c=.o)
-
-simg2simg_SRC_FILES += simg2simg.c
-simg2simg_SRC_FILES += sparse_crc32.c
-simg2simg_OBJS := $(simg2simg_SRC_FILES:.c=.o)
-
-libsparse_SRC_FILES += backed_block.c
-libsparse_SRC_FILES += output_file.c
-libsparse_SRC_FILES += sparse.c
-libsparse_SRC_FILES += sparse_crc32.c
-libsparse_SRC_FILES += sparse_err.c
-libsparse_SRC_FILES += sparse_read.c
-libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/external/libselinux/src
-libselinux_SRC_FILES += callbacks.c
-libselinux_SRC_FILES += check_context.c
-libselinux_SRC_FILES += freecon.c
-libselinux_SRC_FILES += init.c
-libselinux_SRC_FILES += label.c
-libselinux_SRC_FILES += label_file.c
-libselinux_SRC_FILES += label_android_property.c
-libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o)
-
-CFLAGS += -DANDROID
-CFLAGS += -DHOST
-CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils
-CFLAGS += -I$(SRCDIR)/system/core/include
-CFLAGS += -I$(SRCDIR)/system/core/libsparse/include
-CFLAGS += -I$(SRCDIR)/external/libselinux/include
-CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h
-
-all: make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg
-
-make_ext4fs: libext4_utils.a libsparse.a libselinux.a $(make_ext4fs_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(make_ext4fs_OBJS) \
-                libext4_utils.a libsparse.a libselinux.a -lz -lpcre
-
-ext2simg: libext4_utils.a libselinux.a libsparse.a $(ext2simg_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(ext2simg_OBJS) \
-                libext4_utils.a libselinux.a libsparse.a -lz -lpcre
-
-ext4fixup: libext4_utils.a libsparse.a $(ext4fixup_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(ext4fixup_OBJS) libext4_utils.a libsparse.a -lz
-
-simg2img: libsparse.a $(simg2img_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(simg2img_OBJS) libsparse.a -lz
-
-img2simg: libsparse.a $(img2simg_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(img2simg_OBJS) libsparse.a -lz
-
-simg2simg: libsparse.a $(simg2simg_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(simg2simg_OBJS) libsparse.a -lz
-
-libext4_utils.a: $(libext4_utils_OBJS)
-        $(AR) rcs $@ $(libext4_utils_OBJS)
-
-libsparse.a: $(libsparse_OBJS)
-        $(AR) rcs $@ $(libsparse_OBJS)
-
-libselinux.a: $(libselinux_OBJS)
-        $(AR) rcs $@ $(libselinux_OBJS)
-
-clean:
-        $(RM) $(make_ext4fs_OBJS) $(ext2simg_OBJS) $(ext4fixup_OBJS) \
-                $(simg2img_OBJS) $(img2simg_OBJS) $(simg2simg_OBJS) \
-                $(libext4_utils_OBJS) $(libsparse_OBJS) $(libselinux_OBJS) \
-                make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg *.a
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0001-ext4_utils-remove-selinux-extensions.patch b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0001-ext4_utils-remove-selinux-extensions.patch
deleted file mode 100644
index 4a19a5d65a..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0001-ext4_utils-remove-selinux-extensions.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 354604da9d152f1931e91991d3f34197fc8fc759 Mon Sep 17 00:00:00 2001
-From: Sergio Schvezov <sergio.schvezov@canonical.com>
-Date: Tue, 2 Oct 2018 16:36:54 +0000
-Subject: [PATCH] ext4_utils: remove selinux extensions
-
-* drop useless includes of Android SELINUX extensions
-* avoids having to clone another module
-* this should be sent upstream
-
-Upstream-Status: Inappropriate
----
- ext4_utils/make_ext4fs.c      | 1 -
- ext4_utils/make_ext4fs_main.c | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
-index 2f89ae8a0..732afbed7 100644
---- a/ext4_utils/make_ext4fs.c
-+++ b/ext4_utils/make_ext4fs.c
-@@ -62,7 +62,6 @@
- 
- #include <selinux/selinux.h>
- #include <selinux/label.h>
--#include <selinux/android.h>
- 
- #define O_BINARY 0
- 
-diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c
-index a6c5f6160..f8e7b9da9 100644
---- a/ext4_utils/make_ext4fs_main.c
-+++ b/ext4_utils/make_ext4fs_main.c
-@@ -32,7 +32,6 @@
- #ifndef USE_MINGW
- #include <selinux/selinux.h>
- #include <selinux/label.h>
--#include <selinux/android.h>
- #else
- struct selabel_handle;
- #endif
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch
deleted file mode 100644
index 3b50ffbf36..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From b9254539811ce912bfd16dd1d185eba7a10cceff Mon Sep 17 00:00:00 2001
-From: Markus Mayer <mmayer@mmayer.net>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] ext4_utils: add -o argument to preserve ownership
-
-See also https://android-review.googlesource.com/#/c/100312/
-
-Upstream-Status: Inappropriate
----
- ext4_utils/make_ext4fs.c      |  6 ++++++
- ext4_utils/make_ext4fs_main.c | 10 ++++++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
-index 732afbed7..2cbf04399 100644
---- a/ext4_utils/make_ext4fs.c
-+++ b/ext4_utils/make_ext4fs.c
-@@ -67,6 +67,8 @@
- 
- #endif
- 
-+int preserve_owner = 0;
-+
- /* TODO: Not implemented:
-    Allocating blocks in the same block group as the file inode
-    Hash or binary tree directories
-@@ -185,6 +187,10 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path
-                } else {
-                        dentries[i].mtime = fixed_time;
-                }
-+               if (preserve_owner) {
-+                       dentries[i].uid = stat.st_uid;
-+                       dentries[i].gid = stat.st_gid;
-+               }
-                uint64_t capabilities;
-                if (fs_config_func != NULL) {
- #ifdef ANDROID
-diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c
-index f8e7b9da9..e82d43277 100644
---- a/ext4_utils/make_ext4fs_main.c
-+++ b/ext4_utils/make_ext4fs_main.c
-@@ -47,13 +47,15 @@ struct selabel_handle;
- extern struct fs_info info;
- 
- 
-+extern int preserve_owner;
-+
- static void usage(char *path)
- {
-        fprintf(stderr, "%s [ -l <len> ] [ -j <journal size> ] [ -b <block_size> ]\n", basename(path));
-        fprintf(stderr, "    [ -g <blocks per group> ] [ -i <inodes> ] [ -I <inode size> ]\n");
-        fprintf(stderr, "    [ -L <label> ] [ -f ] [ -a <android mountpoint> ]\n");
-        fprintf(stderr, "    [ -S file_contexts ] [ -C fs_config ] [ -T timestamp ]\n");
--       fprintf(stderr, "    [ -z | -s ] [ -w ] [ -c ] [ -J ] [ -v ] [ -B <block_list_file> ]\n");
-+       fprintf(stderr, "    [ -z | -s ] [ -w ] [ -c ] [ -J ] [ -o ] [ -v ] [ -B <block_list_file> ]\n");
-        fprintf(stderr, "    <filename> [<directory>]\n");
- }
- 
-@@ -79,7 +81,7 @@ int main(int argc, char **argv)
-        struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } };
- #endif
- 
--       while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:S:T:C:B:fwzJsctv")) != -1) {
-+       while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:S:T:C:B:fwzJsctov")) != -1) {
-                switch (opt) {
-                case 'l':
-                        info.len = parse_num(optarg);
-@@ -142,6 +144,10 @@ int main(int argc, char **argv)
-                        }
- #endif
-                        break;
-+               case 'o':
-+                       preserve_owner = 1;
-+                       printf("Warning: Enabling 'preserve ownership', this is an unofficial feature!\n");
-+                       break;
-                case 'v':
-                        verbose = 1;
-                        break;
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
deleted file mode 100644
index b77c0ebc13..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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/fastboot.mk b/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk
deleted file mode 100644
index b9ba95f38a..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-# Makefile for fastboot
-
-SRCDIR ?= $(S)
-
-VPATH += $(SRCDIR)/system/core/fastboot
-fastboot_SRC_FILES += protocol.c
-fastboot_SRC_FILES += engine.c
-fastboot_SRC_FILES += bootimg.c
-fastboot_SRC_FILES += fastboot.c
-fastboot_SRC_FILES += util.c
-fastboot_SRC_FILES += fs.c
-fastboot_SRC_FILES += usb_linux.c
-fastboot_SRC_FILES += util_linux.c
-fastboot_OBJS := $(fastboot_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libzipfile
-libzipfile_SRC_FILES += centraldir.c
-libzipfile_SRC_FILES += zipfile.c
-libzipfile_OBJS := $(libzipfile_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/extras/ext4_utils
-libext4_utils_SRC_FILES += make_ext4fs.c
-libext4_utils_SRC_FILES += ext4fixup.c
-libext4_utils_SRC_FILES += ext4_utils.c
-libext4_utils_SRC_FILES += allocate.c
-libext4_utils_SRC_FILES += contents.c
-libext4_utils_SRC_FILES += extent.c
-libext4_utils_SRC_FILES += indirect.c
-libext4_utils_SRC_FILES += uuid.c
-libext4_utils_SRC_FILES += sha1.c
-libext4_utils_SRC_FILES += wipe.c
-libext4_utils_SRC_FILES += crc16.c
-libext4_utils_SRC_FILES += ext4_sb.c
-libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libsparse
-libsparse_SRC_FILES += backed_block.c
-libsparse_SRC_FILES += output_file.c
-libsparse_SRC_FILES += sparse.c
-libsparse_SRC_FILES += sparse_crc32.c
-libsparse_SRC_FILES += sparse_err.c
-libsparse_SRC_FILES += sparse_read.c
-libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/external/libselinux/src
-libselinux_SRC_FILES += callbacks.c
-libselinux_SRC_FILES += check_context.c
-libselinux_SRC_FILES += freecon.c
-libselinux_SRC_FILES += init.c
-libselinux_SRC_FILES += label.c
-libselinux_SRC_FILES += label_file.c
-libselinux_SRC_FILES += label_android_property.c
-libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o)
-
-CFLAGS += -std=gnu11
-CFLAGS += -DANDROID
-# CFLAGS += -DUSE_F2FS
-CFLAGS += -DHOST
-CFLAGS += -I$(SRCDIR)/system/core/fastboot
-CFLAGS += -I$(SRCDIR)/system/core/include
-CFLAGS += -I$(SRCDIR)/system/core/mkbootimg
-CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils
-CFLAGS += -I$(SRCDIR)/system/extras/f2fs_utils
-CFLAGS += -I$(SRCDIR)/system/core/libsparse/include
-CFLAGS += -I$(SRCDIR)/external/libselinux/include
-CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h
-
-LIBS += libzipfile.a libext4_utils.a libsparse.a libselinux.a -lz -lpcre
-
-all: fastboot
-
-fastboot: libzipfile.a libext4_utils.a libsparse.a libselinux.a $(fastboot_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(fastboot_OBJS) $(LIBS)
-
-libzipfile.a: $(libzipfile_OBJS)
-        $(AR) rcs $@ $(libzipfile_OBJS)
-
-libext4_utils.a: $(libext4_utils_OBJS)
-        $(AR) rcs $@ $(libext4_utils_OBJS)
-
-libsparse.a: $(libsparse_OBJS)
-        $(AR) rcs $@ $(libsparse_OBJS)
-
-libselinux.a: $(libselinux_OBJS)
-        $(AR) rcs $@ $(libselinux_OBJS)
-
-clean:
-        $(RM) $(fastboot_OBJS) $(libzipfile_OBJS) $(libext4_utils_OBJS) \
-                $(libsparse_OBJS) $(libselinux_OBJS) fastboot *.a
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/gitignore b/meta-oe/recipes-devtools/android-tools/android-tools/gitignore
deleted file mode 100644
index b034c10a1e..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/gitignore
+++ /dev/null
@@ -1,59 +0,0 @@
-*
-!.gitignore
-!*.indirectionsymlink
-!*.[ch]
-!*.mk
-!*.patch
-!*.service
-!NOTICE
-!MODULE_LICENSE_*
-!/system/
-!/system/core/
-!/system/core/adb/
-!/system/core/fastboot/
-!/system/core/fs_mgr/
-!/system/core/fs_mgr/include/
-!/system/core/include/
-!/system/core/include/android/
-!/system/core/include/cutils/
-!/system/core/include/log/
-!/system/core/include/mincrypt/
-!/system/core/include/private/
-!/system/core/include/utils/
-!/system/core/include/zipfile/
-!/system/core/liblog/
-!/system/core/liblog/tests/
-!/system/core/libcutils/
-!/system/core/libmincrypt/
-!/system/core/libzipfile/
-!/system/core/libsparse/
-!/system/core/libsparse/include/
-!/system/core/libsparse/include/sparse/
-!/system/core/libsparse/simg_dump.py
-!/system/core/mkbootimg/
-!/system/extras/
-!/system/extras/ext4_utils/
-!/system/extras/ext4_utils/mkuserimg.sh
-!/system/extras/ext4_utils/test_ext4fixup
-!/system/extras/f2fs_utils/
-!/hardware/
-!/hardware/libhardware/
-!/hardware/libhardware/include/
-!/hardware/libhardware/include/hardware/
-!/external/
-!/external/libselinux/
-!/external/libselinux/include/
-!/external/libselinux/include/selinux/
-!/external/libselinux/src/
-!/external/f2fs-tools/
-!/external/f2fs-tools/include/
-!/external/f2fs-tools/lib/
-!/external/f2fs-tools/mkfs/
-!/build/
-!/build/core/
-!/build/core/version_defaults.mk
-!/build/core/combo/
-!/build/core/combo/include/
-!/build/core/combo/include/arch/
-!/build/core/combo/include/arch/linux-*/
-!/build/core/combo/include/arch/linux-*/AndroidConfig.h
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-Remove-bionic-specific-calls.patch b/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-Remove-bionic-specific-calls.patch
deleted file mode 100644
index 9de2593df8..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-Remove-bionic-specific-calls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36654a4484117e5f4d63a810c0d94bc9c7ee3a83 Mon Sep 17 00:00:00 2001
-From: Fathi Boudra <fabo@debian.org>
-Date: Tue, 2 Oct 2018 16:36:54 +0000
-Subject: [PATCH] Remove bionic specific calls
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/procattr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/procattr.c b/src/procattr.c
-index f350808..761cf8e 100644
---- a/src/procattr.c
-+++ b/src/procattr.c
-@@ -8,7 +8,7 @@
- #include "selinux_internal.h"
- #include "policy.h"
- 
--#ifdef HOST
-+#ifndef __BIONIC__
- static pid_t gettid(void)
- {
-        return syscall(__NR_gettid);
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch b/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch
deleted file mode 100644
index 8b5e4cf999..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f4f9d24860e1b5cd4f6a014f3fda7cd33ebe5be7 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Sat, 27 Jul 2019 08:20:20 -0700
-Subject: [PATCH] libselinux: Do not define gettid() if glibc >= 2.30 is used
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since version 2.30 glibc implements gettid() system call wrapper, see
-https://sourceware.org/bugzilla/show_bug.cgi?id=6399
-
-Fixes:
-cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I../include -D_GNU_SOURCE  -DNO_ANDROID_BACKEND   -c -o procattr.o procattr.c
-procattr.c:28:14: error: static declaration of ‘gettid’ follows non-static declaration
-   28 | static pid_t gettid(void)
-      |              ^~~~~~
-In file included from /usr/include/unistd.h:1170,
-                 from procattr.c:2:
-/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here
-   34 | extern __pid_t gettid (void) __THROW;
-      |                ^~~~~~
-
-Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
-Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- src/procattr.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
---- a/src/procattr.c
-+++ b/src/procattr.c
-@@ -8,12 +8,16 @@
- #include "selinux_internal.h"
- #include "policy.h"
- 
--#ifndef __BIONIC__
-+/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and
-+ * has a definition for it */
-+#if defined(__GLIBC_)
-+#if !__GLIBC_PREREQ(2,30)
- static pid_t gettid(void)
- {
-        return syscall(__NR_gettid);
- }
- #endif
-+#endif
- 
- static int getprocattrcon(char ** context,
-                          pid_t pid, const char *attr)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk b/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk
deleted file mode 100644
index 519f609fd2..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Makefile for mkbootimg
-
-SRCDIR ?= $(S)
-
-VPATH += $(SRCDIR)/system/core/mkbootimg
-mkbootimg_SRC_FILES += mkbootimg.c
-mkbootimg_OBJS := $(mkbootimg_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libmincrypt
-libmincrypt_SRC_FILES := dsa_sig.c p256.c p256_ec.c p256_ecdsa.c rsa.c sha.c sha256.c
-libmincrypt_OBJS := $(libmincrypt_SRC_FILES:.c=.o)
-
-CFLAGS += -DANDROID
-CFLAGS += -I$(SRCDIR)/system/core/mkbootimg
-CFLAGS += -I$(SRCDIR)/system/core/include
-CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h
-
-LIBS += libmincrypt.a
-
-all: mkbootimg
-
-mkbootimg: libmincrypt.a $(mkbootimg_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(mkbootimg_OBJS) $(LIBS)
-
-libmincrypt.a: $(libmincrypt_OBJS)
-        $(AR) rcs $@ $(libmincrypt_OBJS)
-
-clean:
-        $(RM) $(mkbootimg_OBJS) $(libmincrypt_OBJS) mkbootimg *.a
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_35.0.2.bb b/meta-oe/recipes-devtools/android-tools/android-tools_35.0.2.bb
new file mode 100644
index 0000000000..3a277cd4b5
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_35.0.2.bb
@@ -0,0 +1,237 @@
+DESCRIPTION = "Various utilities from Android"
+SECTION = "console/utils"
+LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-2-Clause & BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \
+    file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \
+    file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \
+    file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
+"
+
+DEPENDS = " \
+    android-libboringssl \
+    brotli \
+    libcap \
+    7zip \
+    protobuf \
+    protobuf-native \
+    libusb \
+    squashfs-tools \
+    zlib \
+"
+
+# The debian/ patches are copied from android-platform-tools/debian/patches and
+# applied in the order defined by debian/patches/series. Listing them as
+# first-class SRC_URI entries (rather than running quilt inside do_patch) makes
+# the recipe work correctly with devtool.
+SRC_URI = "https://deb.debian.org/debian/pool/main/a/android-platform-tools/android-platform-tools_35.0.2.orig.tar.xz;name=orig;subdir=android-platform-tools-${PV} \
+           https://deb.debian.org/debian/pool/main/a/android-platform-tools/android-platform-tools_35.0.2-1~exp6.debian.tar.xz;name=debian;subdir=android-platform-tools-${PV} \
+           file://android-tools-adbd.service \
+           file://debian/deb-gcc-stdatomic.patch \
+           file://debian/deb-gcc-workaround__builtin_available.patch \
+           file://debian/deb-gcc-Nullable.patch \
+           file://debian/deb-sys-unwindstack-porting.patch \
+           file://debian/deb-sys-move-log-file-to-proper-dir.patch \
+           file://debian/deb-sys-Added-missing-headers.patch \
+           file://debian/deb-sys-libusb-header-path.patch \
+           file://debian/deb-sys-throw-exception-on-unknown-os.patch \
+           file://debian/deb-sys-hard-code-build-number.patch \
+           file://debian/deb-sys-stub-out-fastdeploy.patch \
+           file://debian/deb-sys-Implement-const_iterator-operator.patch \
+           file://debian/deb-sys-Drop-gki-dependency-from-mkbootimg.patch \
+           file://debian/deb-sys-add-missing-headers.patch \
+           file://debian/deb-dev-typos.patch \
+           file://debian/deb-adbd-adbd-allow-usb-on-linux.patch \
+           file://debian/deb-adbd-adbd-allow-notifying-systemd.patch \
+           file://debian/deb-adbd-adbd-usb-drop-property-monitor.patch \
+           file://debian/deb-adbd-adbd-don-t-require-authorization-on-Linux.patch \
+           file://0001-libbacktrace.mk-Link-against-staged-lib7z.patch \
+           file://0002-debian-makefiles-yocto-compat.patch \
+           file://0003-gcc-nullability-and-thread-annotation-compat.patch \
+           file://0004-fastboot-super_flash_helper-include-climits.patch \
+           file://0005-adb-host-usb-compat.patch \
+           file://0006-adbd-enable-root-and-remount-support.patch \
+           file://0007-libcutils-guard-Android-private-header-with-addition.patch \
+           file://0008-adb-GCC-compatibility-fixes-for-usb_linux-and-sysdep.patch \
+           file://0009-libbase-include-stdint.h-in-hex.cpp.patch \
+           file://0010-adbd-make-systemd-sd_notify-conditional-on-HAVE_SYSTEMD.patch \
+           "
+
+SRC_URI[orig.md5sum] = "352376965cdef7bd7505d8fefdd43d50"
+SRC_URI[orig.sha256sum] = "ec1d317608db3328bfbddf7152c8d7f185c7c87b2175081416344434546a43da"
+SRC_URI[debian.md5sum] = "1de890bd272da9e8cd35bc9579802f1f"
+SRC_URI[debian.sha256sum] = "f03a89b82ea8dfbe3cb77d5326eedf0d15984f5896885e8c5df64cf421819579"
+
+S = "${UNPACKDIR}/android-platform-tools-${PV}"
+B = "${UNPACKDIR}/${BPN}"
+
+# http://errors.yoctoproject.org/Errors/Details/1debian881/
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"
+
+COMPATIBLE_HOST:powerpc = "(null)"
+COMPATIBLE_HOST:powerpc64 = "(null)"
+COMPATIBLE_HOST:powerpc64le = "(null)"
+
+inherit systemd
+
+SYSTEMD_PACKAGES = "${PN}-adbd"
+SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service"
+
+CFLAGS:append = " -fPIC -std=gnu2x"
+CXXFLAGS:append = " -fPIC -std=gnu++20 -D_Nonnull= -D_Nullable= -I${STAGING_INCDIR}/boringssl"
+LDFLAGS:append = " -fPIC -L${STAGING_LIBDIR}/android"
+
+
+CC:append:class-native = " -I${STAGING_INCDIR}"
+CC:append:class-nativesdk = " -I${STAGING_INCDIR}"
+
+PREREQUISITE_core = ""
+PREREQUISITE_core:class-target = "liblog libbase libcutils libcrypto_utils libadb"
+PREREQUISITE_core:class-native = "liblog libbase libcutils libziparchive libsparse libcrypto_utils libadb"
+
+TOOLS_TO_BUILD = ""
+TOOLS_TO_BUILD:class-target = "adbd"
+TOOLS_TO_BUILD:class-native = "adb fastboot img2simg simg2img"
+
+BUILD_SYSROOT = "${RECIPE_SYSROOT}"
+BUILD_SYSROOT:class-native = "${RECIPE_SYSROOT_NATIVE}"
+
+do_compile() {
+    case "${HOST_ARCH}" in
+    arm)
+        export android_arch=linux-arm
+        cpu=arm
+        deb_host_arch=arm
+        ;;
+    aarch64)
+        export android_arch=linux-arm64
+        cpu=arm64
+        deb_host_arch=arm64
+        ;;
+    riscv64)
+        export android_arch=linux-riscv64
+        cpu=riscv64
+        deb_host_arch=riscv64
+        ;;
+    mips|mipsel)
+        export android_arch=linux-mips
+        cpu=mips
+        deb_host_arch=mips
+        ;;
+    mips64|mips64el)
+        export android_arch=linux-mips64
+        cpu=mips64
+        deb_host_arch=mips64
+        ;;
+    powerpc|powerpc64)
+        export android_arch=linux-ppc
+        cpu=ppc
+        deb_host_arch=ppc64
+        ;;
+    i586|i686)
+        export android_arch=linux-x86
+        cpu=x86
+        deb_host_arch=i386
+        ;;
+    x86_64)
+        export android_arch=linux-x86
+        cpu=x86_64
+        deb_host_arch=amd64
+        ;;
+    *)
+        bbfatal "Unsupported HOST_ARCH=${HOST_ARCH}"
+        ;;
+    esac
+
+    export SRCDIR=${S}
+    export DEB_HOST_ARCH=${deb_host_arch}
+    export DEB_HOST_MULTIARCH=
+    export SYSROOT=${BUILD_SYSROOT}
+
+    if echo " ${TOOLS_TO_BUILD} " | grep -Eq " (adb|fastboot) "; then
+        # Native host tools should use the host system's ELF interpreter, not
+        # Yocto's uninative loader under /workdir.
+        export LDFLAGS="$(printf '%s\n' "${LDFLAGS}" | \
+            sed -E 's@-Wl,--dynamic-linker=[^[:space:]]+@@g; s@[[:space:]]+@ @g; s@^[[:space:]]+@@; s@[[:space:]]+$@@')"
+    fi
+
+    # Debian's make fragments expect generated protobuf sources to already be
+    # present under packages/modules/adb/proto, but the orig tarball only ships
+    # the .proto inputs.
+    for proto in adb_host adb_known_hosts app_processes key_type pairing; do
+        ${STAGING_BINDIR_NATIVE}/protoc \
+            --proto_path=${S}/packages/modules/adb/proto \
+            --cpp_out=${S}/packages/modules/adb/proto \
+            ${S}/packages/modules/adb/proto/${proto}.proto
+    done
+
+    if [ -d ${S}/packages/modules/adb/fastdeploy/proto ]; then
+        for proto in ${S}/packages/modules/adb/fastdeploy/proto/*.proto; do
+            [ -e "$proto" ] || continue
+            ${STAGING_BINDIR_NATIVE}/protoc \
+                --proto_path=${S}/packages/modules/adb \
+                --cpp_out=${S}/packages/modules/adb \
+                "$proto"
+        done
+    fi
+
+    # Debian's make fragments write archives and binaries under debian/out/*
+    # but do not consistently create parent directories before invoking ar.
+    install -d ${S}/debian/out/system/extras
+
+    # Debian replaces Android's Soong build system with hand-written GNU make
+    # fragments under debian/system/ and debian/external/.
+    for tool in ${PREREQUISITE_core}; do
+        oe_runmake -f ${S}/debian/system/${tool}.mk -C ${S}
+    done
+
+    if echo " ${TOOLS_TO_BUILD} " | grep -q " fastboot "; then
+        # Debian's fastboot.mk links against the ext4_utils static archive from
+        # debian/out/system/extras, so build that helper archive first.
+        oe_runmake -f ${S}/debian/system/extras/libext4_utils.mk -C ${S}
+    fi
+
+    for tool in ${TOOLS_TO_BUILD}; do
+        oe_runmake -f ${S}/debian/system/${tool}.mk -C ${S} \
+            ${@'HAVE_SYSTEMD=1' if bb.utils.contains('PACKAGECONFIG', 'systemd', True, False, d) else ''}
+    done
+}
+
+do_install() {
+    for tool in ${TOOLS_TO_BUILD}; do
+        install -D -p -m0755 ${S}/debian/out/system/${tool} ${D}${bindir}/${tool}
+    done
+
+    if echo " ${TOOLS_TO_BUILD} " | grep -q " adbd "; then
+        install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \
+          ${D}${systemd_unitdir}/system/android-tools-adbd.service
+    fi
+
+    install -d ${D}${libdir}/android/
+    install -m0755 ${S}/debian/out/system/lib*.so.* ${D}${libdir}/android/
+}
+
+PACKAGES =+ "${PN}-adbd"
+RDEPENDS:${PN}:class-target = "android-tools-conf-configfs 7zip android-libboringssl"
+RDEPENDS:${PN}-adbd += "${PN}"
+PRIVATE_LIBS:${PN} = "liblog.so.0 libbase.so.0 libcutils.so.0"
+
+inherit useradd
+USERADD_PACKAGES = "${PN}-adbd"
+USERADD_PARAM:${PN}-adbd = "--system --no-create-home --shell /bin/false --user-group adb"
+
+FILES:${PN} += " \
+    ${libdir}/android \
+    ${libdir}/android/* \
+"
+
+FILES:${PN}-adbd = " \
+    ${bindir}/adbd \
+    ${systemd_unitdir}/system/android-tools-adbd.service \
+"
+
+BBCLASSEXTEND = "native"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = ",,systemd"
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
deleted file mode 100644
index c04a1ef8c4..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ /dev/null
@@ -1,189 +0,0 @@
-DESCRIPTION = "Different utilities from Android"
-SECTION = "console/utils"
-LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-2-Clause & BSD-3-Clause"
-LIC_FILES_CHKSUM = " \
-    file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \
-    file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \
-    file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \
-    file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
-"
-DEPENDS = "libbsd libpcre zlib libcap"
-DEPENDS:append:class-target = " openssl"
-
-ANDROID_MIRROR = "android.googlesource.com"
-
-# matches with android-5.1.1_r37
-SRCREV_core = "2314b110bdebdbfd2d94c502282f9e57c849897e"
-SRCREV_extras = "3ecbe8d841df96127d7855661293e5ab6ba6c205"
-SRCREV_libhardware = "be55eb1f4d840c82ffaf7c47460df17ff5bc4d9b"
-SRCREV_libselinux = "07e9e1339ad1ba608acfba9dce2d0f474b252feb"
-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=${BB_GIT_DEFAULT_DESTSUFFIX}/system/core \
-    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=${BB_GIT_DEFAULT_DESTSUFFIX}/hardware/libhardware \
-    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=${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 \
-    file://core/0004-adb-Fix-build-on-big-endian-systems.patch;patchdir=system/core \
-    file://core/0005-adb-add-base64-implementation.patch;patchdir=system/core \
-    file://core/0006-adb-Musl-fixes.patch;patchdir=system/core \
-    file://core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch;patchdir=system/core \
-    file://core/0008-adb-Allow-adbd-to-be-ran-as-root.patch;patchdir=system/core \
-    file://core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch;patchdir=system/core \
-    file://core/0010-Use-linux-capability.h-on-linux-systems-too.patch;patchdir=system/core \
-    file://core/0011-Remove-bionic-specific-calls.patch;patchdir=system/core \
-    file://core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch;patchdir=system/core \
-    file://core/adb_libssl_11.diff;patchdir=system/core \
-    file://core/b64_pton_function_decl.patch;patchdir=system/core \
-    file://core/0013-adb-Support-riscv64.patch;patchdir=system/core \
-    file://core/0014-add-u3-ss-descriptor-support-for-adb.patch;patchdir=system/core \
-    file://core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch;patchdir=system/core \
-    file://core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch;patchdir=system/core \
-    file://core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch;patchdir=system/core \
-    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 \
-    file://build/0001-Riscv-Add-risc-v-Android-config-header.patch;patchdir=build \
-    file://gitignore \
-    file://adb.mk;subdir=${BPN} \
-    file://adbd.mk;subdir=${BPN} \
-    file://ext4_utils.mk;subdir=${BPN} \
-    file://fastboot.mk;subdir=${BPN} \
-    file://mkbootimg.mk;subdir=${BPN} \
-"
-
-
-B = "${WORKDIR}/${BPN}"
-
-# http://errors.yoctoproject.org/Errors/Details/133881/
-ARM_INSTRUCTION_SET:armv4 = "arm"
-ARM_INSTRUCTION_SET:armv5 = "arm"
-
-COMPATIBLE_HOST:powerpc = "(null)"
-COMPATIBLE_HOST:powerpc64 = "(null)"
-COMPATIBLE_HOST:powerpc64le = "(null)"
-
-inherit systemd
-
-SYSTEMD_PACKAGES = "${PN}-adbd"
-SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service"
-
-# Find libbsd headers during native builds
-CC:append:class-native = " -I${STAGING_INCDIR}"
-CC:append:class-nativesdk = " -I${STAGING_INCDIR}"
-
-TOOLS = "adb fastboot ext4_utils mkbootimg adbd"
-
-# Adb needs sys/capability.h, which is not available for native*
-TOOLS:class-native = "fastboot ext4_utils mkbootimg"
-TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg"
-
-do_compile() {
-    cp ${UNPACKDIR}/gitignore ${S}/.gitignore
-
-    # Setting both variables below causing our makefiles to not work with
-    # implicit make rules
-    CFLAGS="-ffile-prefix-map=${S}=${TARGET_DBGSRC_DIR}"
-    unset CPPFLAGS
-
-    export SRCDIR=${S}
-
-    case "${HOST_ARCH}" in
-      arm)
-        export android_arch=linux-arm
-      ;;
-      aarch64)
-        export android_arch=linux-arm64
-      ;;
-      riscv64)
-        export android_arch=linux-riscv64
-      ;;
-      mips|mipsel)
-        export android_arch=linux-mips
-      ;;
-      mips64|mips64el)
-        export android_arch=linux-mips64
-      ;;
-      powerpc|powerpc64)
-        export android_arch=linux-ppc
-      ;;
-      i586|i686|x86_64)
-        export android_arch=linux-x86
-      ;;
-    esac
-
-    for tool in ${TOOLS}; do
-      mkdir -p ${B}/${tool}
-      oe_runmake -f ${UNPACKDIR}/${BPN}/${tool}.mk -C ${B}/${tool}
-    done
-}
-
-do_install() {
-    if echo ${TOOLS} | grep -q "ext4_utils" ; then
-        install -D -p -m0755 ${S}/system/core/libsparse/simg_dump.py ${D}${bindir}/simg_dump
-        install -D -p -m0755 ${S}/system/extras/ext4_utils/mkuserimg.sh ${D}${bindir}/mkuserimg
-
-        install -m0755 ${B}/ext4_utils/ext2simg ${D}${bindir}
-        install -m0755 ${B}/ext4_utils/ext4fixup ${D}${bindir}
-        install -m0755 ${B}/ext4_utils/img2simg ${D}${bindir}
-        install -m0755 ${B}/ext4_utils/make_ext4fs ${D}${bindir}
-        install -m0755 ${B}/ext4_utils/simg2img ${D}${bindir}
-        install -m0755 ${B}/ext4_utils/simg2simg ${D}${bindir}
-    fi
-
-    if echo ${TOOLS} | grep -q "adb\>" ; then
-        install -d ${D}${bindir}
-        install -m0755 ${B}/adb/adb ${D}${bindir}
-    fi
-
-    if echo ${TOOLS} | grep -q "adbd" ; then
-        install -d ${D}${bindir}
-        install -m0755 ${B}/adbd/adbd ${D}${bindir}
-    fi
-
-    # Outside the if statement to avoid errors during do_package
-    install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \
-      ${D}${systemd_unitdir}/system/android-tools-adbd.service
-
-    if echo ${TOOLS} | grep -q "fastboot" ; then
-        install -d ${D}${bindir}
-        install -m0755 ${B}/fastboot/fastboot ${D}${bindir}
-    fi
-
-    if echo ${TOOLS} | grep -q "mkbootimg" ; then
-        install -d ${D}${bindir}
-        install -m0755 ${B}/mkbootimg/mkbootimg ${D}${bindir}
-    fi
-}
-
-PACKAGES =+ "${PN}-fstools ${PN}-adbd"
-
-RDEPENDS:${PN}-adbd = "${PN}-conf"
-RDEPENDS:${PN}-fstools = "bash"
-
-FILES:${PN}-adbd = "\
-    ${bindir}/adbd \
-    ${systemd_unitdir}/system/android-tools-adbd.service \
-"
-
-FILES:${PN}-fstools = "\
-    ${bindir}/ext2simg \
-    ${bindir}/ext4fixup \
-    ${bindir}/img2simg \
-    ${bindir}/make_ext4fs \
-    ${bindir}/simg2img \
-    ${bindir}/simg2simg \
-    ${bindir}/simg_dump \
-    ${bindir}/mkuserimg \
-"
-
-BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/b4/b4_0.14.3.bb b/meta-oe/recipes-devtools/b4/b4_0.15.2.bb
index a922f999e2..002f6ccfeb 100644
--- a/meta-oe/recipes-devtools/b4/b4_0.14.3.bb
+++ b/meta-oe/recipes-devtools/b4/b4_0.15.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit pypi python_pep517 python_setuptools_build_meta
 
-SRC_URI[sha256sum] = "31a4927b8dfbb5c97edfc9569cda3b6737bbfd8430881e8cc48a0b088ced6147"
+SRC_URI[sha256sum] = "b815f2aed2288718cfe2a14c76421a00bc4f0918ea32b45dd1645c999fdda69d"
 
 RDEPENDS:${PN} += " \
     python3-mailbox \
diff --git a/meta-oe/recipes-devtools/canvenient/canvenient_1.01.bb b/meta-oe/recipes-devtools/canvenient/canvenient_1.01.bb
new file mode 100644
index 0000000000..8ae41f0a83
--- /dev/null
+++ b/meta-oe/recipes-devtools/canvenient/canvenient_1.01.bb
@@ -0,0 +1,41 @@
+
+SUMMARY = "CANvenient is an abstraction layer for multiple CAN APIs \
+          on Windows and Linux. \
+          "
+DESCRIPTION = "CANvenient is an abstraction layer for multiple CAN APIs on \
+              Windows and Linux. It provides a unified interface for CAN \
+              communication, allowing developers to write code that is \
+              portable across different platforms and CAN hardware. \
+              "
+HOMEPAGE = "https://canopenterm.de/canvenient"
+BUGTRACKER = "https://github.com/CANopenTerm/CANvenient/issues"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=bd2edc721b4a0289efe949bdbe7dda79"
+
+DEPENDS = "libsocketcan"
+
+SRC_URI = "git://github.com/CANopenTerm/CANvenient.git;protocol=https;branch=main;tag=v${PV}"
+
+SRCREV  = "b8b37e3915caf5bce93f38c2c6cca71356dcfcab"
+
+inherit cmake ptest
+
+
+do_install:append() {
+    install -d ${D}${includedir}
+    install -d ${D}${libdir}
+
+    install -m 0644 ${S}/include/CANvenient.h ${D}${includedir}/
+    install -m 0755 ${B}/libCANvenient.so.1.0.1 ${D}${libdir}/
+
+    ln -sf libCANvenient.so.1.0.1 ${D}${libdir}/libCANvenient.so.1
+    ln -sf libCANvenient.so.1.0.1 ${D}${libdir}/libCANvenient.so
+}
+
+FILES:${PN} += "${libdir}/libCANvenient.so ${libdir}/libCANvenient.so.*"
+FILES:${PN}-dev += "${includedir}"
+
+SOLIBS = ".so"
+
+RDEPENDS:${PN} = "libsocketcan"
diff --git a/meta-oe/recipes-devtools/cloc/cloc_1.98.bb b/meta-oe/recipes-devtools/cloc/cloc_2.08.bb
index 6d349c1e58..106c72974d 100644
--- a/meta-oe/recipes-devtools/cloc/cloc_1.98.bb
+++ b/meta-oe/recipes-devtools/cloc/cloc_2.08.bb
@@ -5,7 +5,7 @@ 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"
+SRC_URI[sha256sum] = "ce3c86d1edb448728278079eff6d99687477b3c1fe84b2f1a4dc14cfb2f811dc"
 
 UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb b/meta-oe/recipes-devtools/cpuid/cpuid_20260503.bb
index 36614ca19d..c0e27bdc20 100644
--- a/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb
+++ b/meta-oe/recipes-devtools/cpuid/cpuid_20260503.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \
            file://0001-Makefile-update-the-hardcode-path-to-bindir-mandir.patch \
            "
-SRC_URI[sha256sum] = "b1c83045efc26076307751e0662d580277f5f9bf89cf027231a7812003c3a4e8"
+SRC_URI[sha256sum] = "8ee10fb48d4aa20c484a75d6852883710286ed2975c314bda6d0b0383908cbfe"
 
 COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.2.20260308.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.2.20260607.0.bb
index 51ad8cff8e..0d0604239a 100644
--- a/meta-oe/recipes-devtools/ctags/ctags_6.2.20260308.0.bb
+++ b/meta-oe/recipes-devtools/ctags/ctags_6.2.20260607.0.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 inherit autotools-brokensep pkgconfig manpages
 
-SRCREV = "db5c5e00f09e62d27108025de24bcec919eac83b"
+SRCREV = "0361a1da51a9cb680732451ab0c35c41bc914bda"
 SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https;tag=p${PV}"
 
 
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.142.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.144.bb
index 1478ebb1e4..543d7405a4 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.142.bb
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.144.bb
@@ -11,7 +11,7 @@ SRC_URI  = "\
     file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \
 "
 
-SRC_URI[sha256sum] = "334b188c2bab5c1aa6f858a044274631d342f07f5ddec1bad870d728f02fd652"
+SRC_URI[sha256sum] = "3e1bafd4bb813cf4d6c17a0adca449ca07603263a8ea40a67257d2d60c186f9a"
 
 S = "${UNPACKDIR}/debootstrap"
 
diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb b/meta-oe/recipes-devtools/dmalloc/dmalloc_5.6.5.bb
index 79252f94ae..cda6ae8082 100644
--- a/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb
+++ b/meta-oe/recipes-devtools/dmalloc/dmalloc_5.6.5.bb
@@ -28,7 +28,7 @@ SRC_URI = "http://dmalloc.com/releases/dmalloc-${PV}.tgz \
            file://0001-undefined-strdup-macro.patch \
 "
 
-SRC_URI[sha256sum] = "d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a"
+SRC_URI[sha256sum] = "480e3414ab6cedca837721c756b7d64b01a84d2d0e837378d98444e2f63a7c01"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.16.1.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.17.0.bb
index 3d0cfaed80..70537fab15 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.16.1.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.17.0.bb
@@ -10,7 +10,7 @@ SRC_URI = "\
     git://github.com/doxygen/doxygen.git;branch=master;protocol=https \
 "
 
-SRCREV = "669aeeefca743c148e2d935b3d3c69535c7491e6"
+SRCREV = "65a43c0aba45cc23b3ca11b6b5334d4eea931726"
 
 
 UPSTREAM_CHECK_GITTAGREGEX = "Release_(?P<pver>\d+(\_\d+)+)"
diff --git a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.11.bb
index c6db2ef38c..5865202841 100644
--- a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb
+++ b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.11.bb
@@ -1,12 +1,12 @@
 SUMMARY = "EditorConfig helps maintain consistent coding styles across various editors and IDEs."
-HOMEPAGE = "https://https://editorconfig.org"
+HOMEPAGE = "https://editorconfig.org"
 SECTION = "libs"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=38f617473e9f7373b5e79baf437accf8"
 
-SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master;tag=v${PV}"
 
-SRCREV = "e082c947e7f7b14240195d55c060a6e1eda1b0a1"
+SRCREV = "0ba157eff167c1b2d1bc0c3e13975b7a73fb9d25"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
index c51a49ba01..289330ee04 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
@@ -25,7 +25,7 @@ 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"
+SYSROOT_PREPROCESS_FUNCS:append:class-target = " rm_flatc_cmaketarget_for_target"
 
 FILES:${PN}-compiler = "${bindir}"
 
diff --git a/meta-oe/recipes-devtools/geany/geany_2.0.bb b/meta-oe/recipes-devtools/geany/geany_2.1.bb
index 4b51195e08..7130c6e6fd 100644
--- a/meta-oe/recipes-devtools/geany/geany_2.0.bb
+++ b/meta-oe/recipes-devtools/geany/geany_2.1.bb
@@ -13,7 +13,7 @@ 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] = "565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92"
+SRC_URI[sha256sum] = "6b96a8844463300c10b9692a0a5edad8236eec9e84342f575f83d4fc89331228"
 
 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
deleted file mode 100644
index dc87ed60b9..0000000000
--- a/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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.2.bb b/meta-oe/recipes-devtools/giflib/giflib_6.1.3.bb
index aa47f93095..7940023b6d 100644
--- a/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb
+++ b/meta-oe/recipes-devtools/giflib/giflib_6.1.3.bb
@@ -1,7 +1,7 @@
 SUMMARY = "shared library for GIF images"
 SECTION = "libs"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b427970b2f3a9142a4e432c78c4680f4"
 
 CVE_PRODUCT = "giflib_project:giflib"
 
@@ -9,11 +9,10 @@ DEPENDS = "xmlto-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz \
            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"
+SRC_URI[sha256sum] = "b65b66b99f0424b93525f987386f22fc5efb9da2bfc92ad4a532249aaffbab0e"
 
 do_install() {
     # using autotools's default will end up in /usr/local
@@ -27,3 +26,5 @@ FILES:${PN}-utils = "${bindir}"
 BBCLASSEXTEND = "native"
 
 RDEPENDS:${PN}-utils = "perl"
+
+CVE_STATUS[CVE-2026-23868] = "fixed-version: fixed since v6.1.2"
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.78.1.bb b/meta-oe/recipes-devtools/grpc/grpc_1.80.0.bb
index 6739c659d3..14ead4ccf9 100644
--- a/meta-oe/recipes-devtools/grpc/grpc_1.78.1.bb
+++ b/meta-oe/recipes-devtools/grpc/grpc_1.80.0.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/grpc/grpc"
 SECTION = "libs"
 LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0 & MIT & BSD-2-Clause"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906 \
+    file://LICENSE;md5=fe8c552b7748e45c00ac55ac0257f6c9 \
     file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \
     file://third_party/xxhash/LICENSE;md5=cdfe7764d5685d8e08b3df302885d7f3 \
 "
@@ -23,8 +23,8 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler"
 # Both dependencies are mutually exclusive
 # RDEPENDS:${PN}-dev += "${PN}-compiler"
 
-SRCREV = "5b6492ea90b2b867a6adad1b10a6edda28e860d1"
-BRANCH = "v1.78.x"
+SRCREV = "f5e2d6e856176c2f6b7691032adfefe21e5f64c1"
+BRANCH = "v1.80.x"
 SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH};tag=v${PV} \
            file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \
            "
diff --git a/meta-oe/recipes-devtools/gst-editing-services/gst-editing-services_1.22.7.bb b/meta-oe/recipes-devtools/gst-editing-services/gst-editing-services_1.22.12.bb
index 50d45ef57b..2d65ef6622 100644
--- a/meta-oe/recipes-devtools/gst-editing-services/gst-editing-services_1.22.7.bb
+++ b/meta-oe/recipes-devtools/gst-editing-services/gst-editing-services_1.22.12.bb
@@ -18,7 +18,7 @@ inherit meson pkgconfig upstream-version-is-even gobject-introspection features_
 EXTRA_OEMESON = "-Dvalidate=disabled"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-${PV}.tar.xz"
-SRC_URI[sha256sum] = "fec56a2c37a253cd048d288d4c7eda6eff191022b09db975e07a2c105d1b521e"
+SRC_URI[sha256sum] = "792339135ce713088663cc5d44e0aea8217793e88fabfd11571e7abf4a429f2c"
 
 PACKAGES += "gst-validate-launcher libges"
 
diff --git a/meta-oe/recipes-devtools/include-what-you-use/include-what-you-use_0.25.bb b/meta-oe/recipes-devtools/include-what-you-use/include-what-you-use_0.26.bb
index 138f7fc2bc..57ade99a1d 100644
--- a/meta-oe/recipes-devtools/include-what-you-use/include-what-you-use_0.25.bb
+++ b/meta-oe/recipes-devtools/include-what-you-use/include-what-you-use_0.26.bb
@@ -10,9 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=3bb66a14534286912cd6f26649b5c60a \
 
 DEPENDS = "clang"
 
-PV .= "+git"
-SRCREV = "791e69ea4662cb3e74e8128fd5fd69bd7f4ea6b3"
-SRC_URI = "git://github.com/include-what-you-use/include-what-you-use.git;protocol=https;branch=clang_21"
+SRCREV = "01a091d16b3dedb808db21f32ed3e761737a3691"
+SRC_URI = "git://github.com/include-what-you-use/include-what-you-use.git;protocol=https;branch=clang_22;tag=${PV}"
 
 inherit cmake python3native
 
diff --git a/meta-oe/recipes-devtools/isocline/isocline_1.1.0.bb b/meta-oe/recipes-devtools/isocline/isocline_1.1.0.bb
new file mode 100644
index 0000000000..c50ac01c49
--- /dev/null
+++ b/meta-oe/recipes-devtools/isocline/isocline_1.1.0.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Isocline is a portable GNU readline alternative."
+DESCRIPTION = "Isocline is a pure C library that can be used \
+              as an alternative to the GNU readline library. \
+              "
+HOMEPAGE = "https://github.com/daanx/isocline"
+BUGTRACKER = "https://github.com/daanx/isocline/issues"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8d05469c537534c7405c82c81a526bcd"
+
+SRC_URI = "git://github.com/daanx/isocline.git;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "d55a58139badbe83d61c5d89954fa5bddcabe6d7"
+
+
+inherit cmake
+
+CFLAGS += "-fPIC"
+
+do_install() {
+    install -d ${D}${libdir}
+    install -m 0644 ${B}/libisocline.a ${D}${libdir}/
+    install -d ${D}${includedir}
+    cp ${S}/include/isocline.h ${D}${includedir}/
+}
+
+FILES:${PN}-dev = "${libdir}/libisocline.a"
+FILES:${PN}-dev = "${includedir}/isocline.h"
+FILES:${PN}-dbg += "${libdir}/.debug/libisocline.a"
diff --git a/meta-oe/recipes-devtools/jemalloc/files/1a15fe33a48c52bfe26ea83e49f0d317a47da3ea.patch b/meta-oe/recipes-devtools/jemalloc/files/1a15fe33a48c52bfe26ea83e49f0d317a47da3ea.patch
new file mode 100644
index 0000000000..a4fad4af61
--- /dev/null
+++ b/meta-oe/recipes-devtools/jemalloc/files/1a15fe33a48c52bfe26ea83e49f0d317a47da3ea.patch
@@ -0,0 +1,158 @@
+From 1a15fe33a48c52bfe26ea83e49f0d317a47da3ea Mon Sep 17 00:00:00 2001
+From: lexprfuncall <cshapiro@meta.com>
+Date: Mon, 27 Apr 2026 11:50:27 -0700
+Subject: [PATCH] Replace std::__throw_bad_alloc call with standard C++ (#2900)
+
+* Replace std::__throw_bad_alloc call with standard C++
+
+Since December of 2025, std::__throw_bad_alloc is no longer visible
+through #include <new> causing jemalloc build failures with gcc 16.
+As far as I can tell, all std::__throw_bad_alloc did was arrange to
+raise a std::bad_alloc exception if exceptions are enabled.  I am not
+sure whether its usage was truly meaningful in jemalloc since the call
+is wrapped in a try catch and any usage of try catch is considered an
+error when compiling with -fno-exceptions on gcc, at least.
+
+This change adds a check to configure.ac that determines whether
+exceptions are enabled by compiling a simple try catch that raises a
+std::bad_alloc exception.  If that test succeeds, the macro
+JEMALLOC_HAVE_CXX_EXCEPTIONS is defined, and jemalloc will raise an
+exception.  Otherwise, we call std::terminate() to abort.
+
+This was tested on FreeBSD with the gcc16 port with and without exceptions
+enabled.
+
+* Replace std::set_new_handler calls with std::get_new_handler
+
+Previously, std::set_new_handler was used as a workaround for
+compilers with only partial support for C++11.  Now that C++14 is a
+requirement to enable C++ support, we can assume std::get_new_handler
+is available.
+
+Upstream-Status: Backport [https://github.com/jemalloc/jemalloc/commit/1a15fe33a48c52bfe26ea83e49f0d317a47da3ea]
+---
+ Makefile.in                                   |  6 +++--
+ configure.ac                                  | 23 +++++++++++++++++
+ .../internal/jemalloc_internal_defs.h.in      |  3 +++
+ src/jemalloc_cpp.cpp                          | 25 ++++++++++---------
+ 4 files changed, 43 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a93048d7b8..1f9d14f1f2 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -337,9 +337,11 @@ TESTS_INTEGRATION += \
+ endif
+ ifeq (@enable_cxx@, 1)
+ CPP_SRCS := $(srcroot)src/jemalloc_cpp.cpp
+-TESTS_INTEGRATION_CPP := $(srcroot)test/integration/cpp/basic.cpp \
+-       $(srcroot)test/integration/cpp/infallible_new_true.cpp \
++TESTS_INTEGRATION_CPP := $(srcroot)test/integration/cpp/basic.cpp
++ifeq (@enable_cxx_exceptions@, 1)
++TESTS_INTEGRATION_CPP += $(srcroot)test/integration/cpp/infallible_new_true.cpp \
+        $(srcroot)test/integration/cpp/infallible_new_false.cpp
++endif
+ else
+ CPP_SRCS :=
+ TESTS_INTEGRATION_CPP :=
+diff --git a/configure.ac b/configure.ac
+index 321a729012..d151829832 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -374,7 +374,30 @@ fi
+ if test "x$enable_cxx" = "x1"; then
+   AC_DEFINE([JEMALLOC_ENABLE_CXX], [ ], [ ])
+ fi
++if test "x$enable_cxx" = "x1"; then
++  dnl Now check whether the C++ compiler has exceptions enabled.
++  AC_LANG_PUSH([C++])
++  SAVED_CXXFLAGS="${CXXFLAGS}"
++  CXXFLAGS="${CXXFLAGS} ${EXTRA_CXXFLAGS}"
++  JE_COMPILABLE([C++ exception support], [
++#include <new>
++], [
++       try {
++               throw std::bad_alloc();
++       } catch (const std::bad_alloc &) {
++       }
++], [je_cv_cxx_exceptions])
++  CXXFLAGS="${SAVED_CXXFLAGS}"
++  AC_LANG_POP([C++])
++  if test "x${je_cv_cxx_exceptions}" = "xyes" ; then
++    AC_DEFINE([JEMALLOC_HAVE_CXX_EXCEPTIONS], [ ], [ ])
++    enable_cxx_exceptions="1"
++  else
++    enable_cxx_exceptions="0"
++  fi
++fi
+ AC_SUBST([enable_cxx])
++AC_SUBST([enable_cxx_exceptions])
+ AC_SUBST([CONFIGURE_CXXFLAGS])
+ AC_SUBST([SPECIFIED_CXXFLAGS])
+ AC_SUBST([EXTRA_CXXFLAGS])
+diff --git a/include/jemalloc/internal/jemalloc_internal_defs.h.in b/include/jemalloc/internal/jemalloc_internal_defs.h.in
+index 31ae2e8ed2..54d4da2032 100644
+--- a/include/jemalloc/internal/jemalloc_internal_defs.h.in
++++ b/include/jemalloc/internal/jemalloc_internal_defs.h.in
+@@ -465,6 +465,9 @@
+ /* Is C++ support being built? */
+ #undef JEMALLOC_ENABLE_CXX
+ 
++/* Are C++ exceptions enabled? */
++#undef JEMALLOC_HAVE_CXX_EXCEPTIONS
++
+ /* Performs additional size checks when defined. */
+ #undef JEMALLOC_OPT_SIZE_CHECKS
+ 
+diff --git a/src/jemalloc_cpp.cpp b/src/jemalloc_cpp.cpp
+index 4e838d3b51..ac109bb28e 100644
+--- a/src/jemalloc_cpp.cpp
++++ b/src/jemalloc_cpp.cpp
+@@ -1,4 +1,4 @@
+-#include <mutex>
++#include <exception>
+ #include <new>
+ // NOLINTBEGIN(misc-use-anonymous-namespace)
+ 
+@@ -78,29 +78,30 @@ handleOOM(std::size_t size, bool nothrow) {
+        void *ptr = nullptr;
+ 
+        while (ptr == nullptr) {
+-               std::new_handler handler;
+-               // GCC-4.8 and clang 4.0 do not have std::get_new_handler.
+-               {
+-                       static std::mutex           mtx;
+-                       std::lock_guard<std::mutex> lock(mtx);
+-
+-                       handler = std::set_new_handler(nullptr);
+-                       std::set_new_handler(handler);
+-               }
++               std::new_handler handler = std::get_new_handler();
+                if (handler == nullptr)
+                        break;
+ 
++#ifdef JEMALLOC_HAVE_CXX_EXCEPTIONS
+                try {
+                        handler();
+                } catch (const std::bad_alloc &) {
+                        break;
+                }
++#else
++               handler();
++#endif
+ 
+                ptr = je_malloc(size);
+        }
+ 
+-       if (ptr == nullptr && !nothrow)
+-               std::__throw_bad_alloc();
++       if (ptr == nullptr && !nothrow) {
++#ifdef JEMALLOC_HAVE_CXX_EXCEPTIONS
++               throw std::bad_alloc();
++#else
++               std::terminate();
++#endif
++       }
+        return ptr;
+ }
+ 
diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.1.bb
index aa1f417604..f3a310029f 100644
--- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
+++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.1.bb
@@ -13,13 +13,12 @@ SECTION = "libs"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea061f8731d5e6a5761dfad951ef5f5f"
 
-SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=dev;protocol=https \
+SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=master;protocol=https;tag=${PV} \
+           file://1a15fe33a48c52bfe26ea83e49f0d317a47da3ea.patch \
            file://run-ptest \
            "
-SRCREV = "630434bb0ac619f7beec927569782d924c459385"
-PV_LONG := "${PV}-171-g${SRCREV}"
-PV .= "+git"
-
+SRCREV = "81034ce1f1373e37dc865038e1bc8eeecf559ce8"
+PV_LONG := "${PV}-0-g${SRCREV}"
 
 inherit autotools ptest
 
@@ -29,6 +28,8 @@ 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_LONG} --enable-xmalloc"
+# Enable jemalloc debug build flag if DEBUG_BUILD is enabled
+EXTRA_OECONF:append = " ${@oe.utils.vartrue('DEBUG_BUILD', '--enable-debug=yes', '', d)}"
 
 do_install:append() {
         sed -i -e 's@${STAGING_DIR_HOST}@@g' \
diff --git a/meta-oe/recipes-devtools/jq/jq/0001-Support-building-with-disable-maintainer-mode-and-so.patch b/meta-oe/recipes-devtools/jq/jq/0001-Support-building-with-disable-maintainer-mode-and-so.patch
new file mode 100644
index 0000000000..12a64a75ed
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/0001-Support-building-with-disable-maintainer-mode-and-so.patch
@@ -0,0 +1,44 @@
+From 27f417f4812e688a59fc5186b7768cec004cd6e5 Mon Sep 17 00:00:00 2001
+From: Peter Kjellerstedt <peter.kjellerstedt@gmail.com>
+Date: Wed, 8 Apr 2026 05:58:49 +0200
+Subject: [PATCH] Support building with --disable-maintainer-mode and source !=
+ build dir (#3518)
+
+If --disable-maintainer-mode is enabled, then the rules for generating
+parser.[ch] and lexer.[ch] did nothing. This worked fine if the source
+and build directories are the same as the pre-generated parser.c and
+lexer.c files would suffice. However, if the build directory is not the
+same as the source directory, then the rest of the Make rules expect
+parser.[ch] and lexer.[ch] to have been created in the build directory
+if their source files (parser.y and lexer.l) are newer than the target
+files, which can happen in case the source is fetched using Git.
+
+Avoid the problem by copying the files to the build directory if needed.
+
+Co-authored-by: Peter Kjellerstedt <pkj@axis.com>
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/27f417f4812e688a59fc5186b7768cec004cd6e5]
+---
+ Makefile.am | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 96d6038..acb9443 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -41,9 +41,14 @@ src/lexer.h: src/lexer.c
+ else
+ BUILT_SOURCES = src/builtin.inc src/config_opts.inc src/version.h
+ .y.c:
+-       $(AM_V_YACC) echo "NOT building parser.c!"
++       $(AM_V_YACC) [ "$(<D)" = "$(@D)" ] || cp $(<D)/$(@F) $@
++       $(AM_V_YACC) [ "$(<D)" = "$(@D)" ] || cp $(<D)/$(*F).h $*.h
++       $(AM_V_YACC) touch $@ $*.h
++
+ .l.c:
+-       $(AM_V_LEX) echo "NOT building lexer.c!"
++       $(AM_V_LEX) [ "$(<D)" = "$(@D)" ] || cp $(<D)/$(@F) $@
++       $(AM_V_LEX) [ "$(<D)" = "$(@D)" ] || cp $(<D)/$(*F).h $*.h
++       $(AM_V_LEX) touch $@ $*.h
+ endif
+ 
+ # Tell YACC (Bison) autoconf macros that you want a header file created.
diff --git a/meta-oe/recipes-devtools/jq/jq/CVE-2026-32316.patch b/meta-oe/recipes-devtools/jq/jq/CVE-2026-32316.patch
new file mode 100644
index 0000000000..1277b356d8
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/CVE-2026-32316.patch
@@ -0,0 +1,53 @@
+From 321e62b356df2d4ed47aba4f3818e447ec4d77fc Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Thu, 12 Mar 2026 20:28:43 +0900
+Subject: [PATCH] Fix heap buffer overflow in `jvp_string_append` and
+ `jvp_string_copy_replace_bad`
+
+In `jvp_string_append`, the allocation size `(currlen + len) * 2` could
+overflow `uint32_t` when `currlen + len` exceeds `INT_MAX`, causing a small
+allocation followed by a large `memcpy`.
+
+In `jvp_string_copy_replace_bad`, the output buffer size calculation
+`length * 3 + 1` could overflow `uint32_t`, again resulting in a small
+allocation followed by a large write.
+
+Add overflow checks to both functions to return an error for strings
+that would exceed `INT_MAX` in length. Fixes CVE-2026-32316.
+
+CVE: CVE-2026-32316
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/e47e56d226519635768e6aab2f38f0ab037c09e5]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/jv.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/jv.c b/src/jv.c
+index e4529a4..74be05a 100644
+--- a/src/jv.c
++++ b/src/jv.c
+@@ -1114,7 +1114,12 @@ static jv jvp_string_copy_replace_bad(const char* data, uint32_t length) {
+   const char* end = data + length;
+   const char* i = data;
+ 
+-  uint32_t maxlength = length * 3 + 1; // worst case: all bad bytes, each becomes a 3-byte U+FFFD
++  // worst case: all bad bytes, each becomes a 3-byte U+FFFD
++  uint64_t maxlength = (uint64_t)length * 3 + 1;
++  if (maxlength >= INT_MAX) {
++    return jv_invalid_with_msg(jv_string("String too long"));
++  }
++
+   jvp_string* s = jvp_string_alloc(maxlength);
+   char* out = s->data;
+   int c = 0;
+@@ -1174,6 +1179,10 @@ static uint32_t jvp_string_remaining_space(jvp_string* s) {
+ static jv jvp_string_append(jv string, const char* data, uint32_t len) {
+   jvp_string* s = jvp_string_ptr(string);
+   uint32_t currlen = jvp_string_length(s);
++  if ((uint64_t)currlen + len >= INT_MAX) {
++    jv_free(string);
++    return jv_invalid_with_msg(jv_string("String too long"));
++  }
+ 
+   if (jvp_refcnt_unshared(string.u.ptr) &&
+       jvp_string_remaining_space(s) >= len) {
diff --git a/meta-oe/recipes-devtools/jq/jq/CVE-2026-33947.patch b/meta-oe/recipes-devtools/jq/jq/CVE-2026-33947.patch
new file mode 100644
index 0000000000..69a8381f06
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/CVE-2026-33947.patch
@@ -0,0 +1,104 @@
+From 5fd935884a6f5b3d8ecdcacfc5d3982140f3a478 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 13 Apr 2026 11:23:40 +0900
+Subject: [PATCH] Limit path depth to prevent stack overflow
+
+Deeply nested path arrays can cause unbounded recursion in
+`jv_setpath`, `jv_getpath`, and `jv_delpaths`, leading to
+stack overflow. Add a depth limit of 10000 to match the
+existing `tojson` depth limit. This fixes CVE-2026-33947.
+
+CVE: CVE-2026-33947
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/fb59f1491058d58bdc3e8dd28f1773d1ac690a1f]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/jv_aux.c  | 21 +++++++++++++++++++++
+ tests/jq.test | 25 +++++++++++++++++++++++++
+ 2 files changed, 46 insertions(+)
+
+diff --git a/src/jv_aux.c b/src/jv_aux.c
+index bc1405f..594a21f 100644
+--- a/src/jv_aux.c
++++ b/src/jv_aux.c
+@@ -375,6 +375,10 @@ static jv jv_dels(jv t, jv keys) {
+   return t;
+ }
+ 
++#ifndef MAX_PATH_DEPTH
++#define MAX_PATH_DEPTH (10000)
++#endif
++
+ jv jv_setpath(jv root, jv path, jv value) {
+   if (jv_get_kind(path) != JV_KIND_ARRAY) {
+     jv_free(value);
+@@ -382,6 +386,12 @@ jv jv_setpath(jv root, jv path, jv value) {
+     jv_free(path);
+     return jv_invalid_with_msg(jv_string("Path must be specified as an array"));
+   }
++  if (jv_array_length(jv_copy(path)) > MAX_PATH_DEPTH) {
++    jv_free(value);
++    jv_free(root);
++    jv_free(path);
++    return jv_invalid_with_msg(jv_string("Path too deep"));
++  }
+   if (!jv_is_valid(root)){
+     jv_free(value);
+     jv_free(path);
+@@ -434,6 +444,11 @@ jv jv_getpath(jv root, jv path) {
+     jv_free(path);
+     return jv_invalid_with_msg(jv_string("Path must be specified as an array"));
+   }
++  if (jv_array_length(jv_copy(path)) > MAX_PATH_DEPTH) {
++    jv_free(root);
++    jv_free(path);
++    return jv_invalid_with_msg(jv_string("Path too deep"));
++  }
+   if (!jv_is_valid(root)) {
+     jv_free(path);
+     return root;
+@@ -511,6 +526,12 @@ jv jv_delpaths(jv object, jv paths) {
+       jv_free(elem);
+       return err;
+     }
++    if (jv_array_length(jv_copy(elem)) > MAX_PATH_DEPTH) {
++      jv_free(object);
++      jv_free(paths);
++      jv_free(elem);
++      return jv_invalid_with_msg(jv_string("Path too deep"));
++    }
+     jv_free(elem);
+   }
+   if (jv_array_length(jv_copy(paths)) == 0) {
+diff --git a/tests/jq.test b/tests/jq.test
+index 4ecf72f..6186d8b 100644
+--- a/tests/jq.test
++++ b/tests/jq.test
+@@ -2507,3 +2507,28 @@ strflocaltime("" | ., @uri)
+ 0
+ ""
+ ""
++
++# regression test for CVE-2026-33947
++setpath([range(10000) | 0]; 0) | flatten
++null
++[0]
++
++try setpath([range(10001) | 0]; 0) catch .
++null
++"Path too deep"
++
++getpath([range(10000) | 0])
++null
++null
++
++try getpath([range(10001) | 0]) catch .
++null
++"Path too deep"
++
++delpaths([[range(10000) | 0]])
++null
++null
++
++try delpaths([[range(10001) | 0]]) catch .
++null
++"Path too deep"
diff --git a/meta-oe/recipes-devtools/jq/jq/CVE-2026-33948.patch b/meta-oe/recipes-devtools/jq/jq/CVE-2026-33948.patch
new file mode 100644
index 0000000000..8625429c74
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/CVE-2026-33948.patch
@@ -0,0 +1,49 @@
+From 19a792c4cdb6b91c056eac033ac3367af6e67755 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 13 Apr 2026 08:46:11 +0900
+Subject: [PATCH] Fix NUL truncation in the JSON parser
+
+This fixes CVE-2026-33948.
+
+CVE: CVE-2026-33948
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/6374ae0bcdfe33a18eb0ae6db28493b1f34a0a5b]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/util.c   | 8 +-------
+ tests/shtest | 6 ++++++
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index bcb86da..60ec4d5 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -309,13 +309,7 @@ static int jq_util_input_read_more(jq_util_input_state *state) {
+       if (p != NULL)
+         state->current_line++;
+ 
+-      if (p == NULL && state->parser != NULL) {
+-        /*
+-         * There should be no NULs in JSON texts (but JSON text
+-         * sequences are another story).
+-         */
+-        state->buf_valid_len = strlen(state->buf);
+-      } else if (p == NULL && feof(state->current_input)) {
++      if (p == NULL && feof(state->current_input)) {
+         size_t i;
+ 
+         /*
+diff --git a/tests/shtest b/tests/shtest
+index 887a6bb..a046afe 100755
+--- a/tests/shtest
++++ b/tests/shtest
+@@ -842,4 +842,10 @@ if ! $msys && ! $mingw; then
+   fi
+ fi
+ 
++# CVE-2026-33948: No NUL truncation in the JSON parser
++if printf '{}\x00{}' | $JQ >/dev/null 2> /dev/null; then
++  printf 'Error expected but jq exited successfully\n' 1>&2
++  exit 1
++fi
++
+ exit 0
diff --git a/meta-oe/recipes-devtools/jq/jq/CVE-2026-39979.patch b/meta-oe/recipes-devtools/jq/jq/CVE-2026-39979.patch
new file mode 100644
index 0000000000..40c57a46a0
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/CVE-2026-39979.patch
@@ -0,0 +1,31 @@
+From ac09f274b6c029a23e3dffc38afac819b5daacc4 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 13 Apr 2026 11:04:52 +0900
+Subject: [PATCH] Fix out-of-bounds read in jv_parse_sized()
+
+This fixes CVE-2026-39979.
+
+Co-authored-by: Mattias Wadman <mattias.wadman@gmail.com>
+
+CVE: CVE-2026-39979
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/2f09060afab23fe9390cce7cb860b10416e1bf5f]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/jv_parse.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/jv_parse.c b/src/jv_parse.c
+index ffcf51f..e6b8aa9 100644
+--- a/src/jv_parse.c
++++ b/src/jv_parse.c
+@@ -892,8 +892,9 @@ jv jv_parse_sized_custom_flags(const char* string, int length, int flags) {
+ 
+   if (!jv_is_valid(value) && jv_invalid_has_msg(jv_copy(value))) {
+     jv msg = jv_invalid_get_msg(value);
+-    value = jv_invalid_with_msg(jv_string_fmt("%s (while parsing '%s')",
++    value = jv_invalid_with_msg(jv_string_fmt("%s (while parsing '%.*s')",
+                                               jv_string_value(msg),
++                                              length,
+                                               string));
+     jv_free(msg);
+   }
diff --git a/meta-oe/recipes-devtools/jq/jq/CVE-2026-47770.patch b/meta-oe/recipes-devtools/jq/jq/CVE-2026-47770.patch
new file mode 100644
index 0000000000..1d6664e842
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/CVE-2026-47770.patch
@@ -0,0 +1,484 @@
+From 63ae676bc6e97635d8246c78f5947ec47eb85a26 Mon Sep 17 00:00:00 2001
+From: Yu-Fu Fu <yufu@yfu.tw>
+Date: Fri, 22 May 2026 04:07:16 -0700
+Subject: [PATCH] Guard deep structural equality and comparison recursion
+ (#3539)
+
+jv_equal and jv_cmp overflows the C stack on deeply nested
+input. Cap recursion at 10000 with -1 / INT_MIN sentinels;
+operators that compose user expressions surface this as
+"Equality check too deep" / "Comparison too deep".
+
+Fixes CVE-2026-47770.
+
+Signed-off-by: Anton Skorup <antonsk@axis.com>
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/7122866869960b55cea3646bc91334ef55787831]
+---
+ src/builtin.c |  36 +++++++++++++++--
+ src/jv.c      |  46 +++++++++++++++++-----
+ src/jv_aux.c  | 105 ++++++++++++++++++++++++++++++++++++++++++--------
+ tests/jq.test |  40 +++++++++++++++++++
+ 4 files changed, 198 insertions(+), 29 deletions(-)
+
+diff --git a/src/builtin.c b/src/builtin.c
+index ac56f9f..ac25f90 100644
+--- a/src/builtin.c
++++ b/src/builtin.c
+@@ -295,7 +295,15 @@ jv binop_minus(jv a, jv b) {
+     jv_array_foreach(a, i, x) {
+       int include = 1;
+       jv_array_foreach(b, j, y) {
+-        if (jv_equal(jv_copy(x), y)) {
++        int equal = jv_equal(jv_copy(x), y);
++        if (equal < 0) {
++          jv_free(out);
++          jv_free(x);
++          jv_free(a);
++          jv_free(b);
++          return jv_invalid_with_msg(jv_string("Equality check too deep"));
++        }
++        if (equal) {
+           include = 0;
+           break;
+         }
+@@ -379,11 +387,17 @@ jv binop_mod(jv a, jv b) {
+ #undef dtoi
+ 
+ jv binop_equal(jv a, jv b) {
+-  return jv_bool(jv_equal(a, b));
++  int r = jv_equal(a, b);
++  if (r < 0)
++    return jv_invalid_with_msg(jv_string("Equality check too deep"));
++  return jv_bool(r);
+ }
+ 
+ jv binop_notequal(jv a, jv b) {
+-  return jv_bool(!jv_equal(a, b));
++  int r = jv_equal(a, b);
++  if (r < 0)
++    return jv_invalid_with_msg(jv_string("Equality check too deep"));
++  return jv_bool(!r);
+ }
+ 
+ enum cmp_op {
+@@ -395,6 +409,8 @@ enum cmp_op {
+ 
+ static jv order_cmp(jv a, jv b, enum cmp_op op) {
+   int r = jv_cmp(a, b);
++  if (r == INT_MIN)
++    return jv_invalid_with_msg(jv_string("Comparison too deep"));
+   return jv_bool((op == CMP_OP_LESS && r < 0) ||
+                  (op == CMP_OP_LESSEQ && r <= 0) ||
+                  (op == CMP_OP_GREATEREQ && r >= 0) ||
+@@ -845,6 +861,12 @@ static jv f_bsearch(jq_state *jq, jv input, jv target) {
+   while (start < end) {
+     int mid = start + (end - start) / 2;
+     int result = jv_cmp(jv_copy(target), jv_array_get(jv_copy(input), mid));
++    if (result == INT_MIN) {
++      jv_free(answer);
++      jv_free(input);
++      jv_free(target);
++      return jv_invalid_with_msg(jv_string("Comparison too deep"));
++    }
+     if (result == 0) {
+       answer = jv_number(mid);
+       break;
+@@ -1136,6 +1158,14 @@ static jv minmax_by(jv values, jv keys, int is_min) {
+   for (int i=1; i<jv_array_length(jv_copy(values)); i++) {
+     jv item = jv_array_get(jv_copy(keys), i);
+     int cmp = jv_cmp(jv_copy(item), jv_copy(retkey));
++    if (cmp == INT_MIN) {
++      jv_free(item);
++      jv_free(values);
++      jv_free(keys);
++      jv_free(retkey);
++      jv_free(ret);
++      return jv_invalid_with_msg(jv_string("Comparison too deep"));
++    }
+     if ((cmp < 0) == (is_min == 1)) {
+       jv_free(retkey);
+       retkey = item;
+diff --git a/src/jv.c b/src/jv.c
+index f701b46..e079d08 100644
+--- a/src/jv.c
++++ b/src/jv.c
+@@ -912,16 +912,20 @@ static jv* jvp_array_write(jv* a, int i) {
+   }
+ }
+ 
+-static int jvp_array_equal(jv a, jv b) {
++static int jvp_equal(jv a, jv b, int depth);
++
++static int jvp_array_equal(jv a, jv b, int depth) {
+   if (jvp_array_length(a) != jvp_array_length(b))
+     return 0;
+   if (jvp_array_ptr(a) == jvp_array_ptr(b) &&
+       jvp_array_offset(a) == jvp_array_offset(b))
+     return 1;
+   for (int i=0; i<jvp_array_length(a); i++) {
+-    if (!jv_equal(jv_copy(*jvp_array_read(a, i)),
+-                  jv_copy(*jvp_array_read(b, i))))
+-      return 0;
++    int r = jvp_equal(jv_copy(*jvp_array_read(a, i)),
++                      jv_copy(*jvp_array_read(b, i)),
++                      depth);
++    if (r <= 0)
++      return r;
+   }
+   return 1;
+ }
+@@ -1071,7 +1075,14 @@ jv jv_array_indexes(jv a, jv b) {
+   int alen = jv_array_length(jv_copy(a));
+   for (int ai = 0; ai < alen; ++ai) {
+     jv_array_foreach(b, bi, belem) {
+-      if (!jv_equal(jv_array_get(jv_copy(a), ai + bi), belem))
++      int equal = jv_equal(jv_array_get(jv_copy(a), ai + bi), belem);
++      if (equal < 0) {
++        jv_free(res);
++        jv_free(a);
++        jv_free(b);
++        return jv_invalid_with_msg(jv_string("Equality check too deep"));
++      }
++      if (!equal)
+         idx = -1;
+       else if (bi == 0 && idx == -1)
+         idx = ai;
+@@ -1828,7 +1839,7 @@ static int jvp_object_length(jv object) {
+   return n;
+ }
+ 
+-static int jvp_object_equal(jv o1, jv o2) {
++static int jvp_object_equal(jv o1, jv o2, int depth) {
+   int len2 = jvp_object_length(o2);
+   int len1 = 0;
+   for (int i=0; i<jvp_object_size(o1); i++) {
+@@ -1837,7 +1848,8 @@ static int jvp_object_equal(jv o1, jv o2) {
+     jv* slot2 = jvp_object_read(o2, slot->string);
+     if (!slot2) return 0;
+     // FIXME: do less refcounting here
+-    if (!jv_equal(jv_copy(slot->value), jv_copy(*slot2))) return 0;
++    int r = jvp_equal(jv_copy(slot->value), jv_copy(*slot2), depth);
++    if (r <= 0) return r;
+     len1++;
+   }
+   return len1 == len2;
+@@ -2032,7 +2044,16 @@ int jv_get_refcnt(jv j) {
+  * Higher-level operations
+  */
+ 
+-int jv_equal(jv a, jv b) {
++#ifndef MAX_EQUAL_DEPTH
++#define MAX_EQUAL_DEPTH (10000)
++#endif
++
++static int jvp_equal(jv a, jv b, int depth) {
++  if (depth > MAX_EQUAL_DEPTH) {
++    jv_free(a);
++    jv_free(b);
++    return -1;
++  }
+   int r;
+   if (jv_get_kind(a) != jv_get_kind(b)) {
+     r = 0;
+@@ -2048,13 +2069,13 @@ int jv_equal(jv a, jv b) {
+       r = jvp_number_equal(a, b);
+       break;
+     case JV_KIND_ARRAY:
+-      r = jvp_array_equal(a, b);
++      r = jvp_array_equal(a, b, depth + 1);
+       break;
+     case JV_KIND_STRING:
+       r = jvp_string_equal(a, b);
+       break;
+     case JV_KIND_OBJECT:
+-      r = jvp_object_equal(a, b);
++      r = jvp_object_equal(a, b, depth + 1);
+       break;
+     default:
+       r = 1;
+@@ -2066,6 +2087,11 @@ int jv_equal(jv a, jv b) {
+   return r;
+ }
+ 
++// Returns 1 if equal, 0 if not equal, or -1 if the comparison is too deep
++int jv_equal(jv a, jv b) {
++  return jvp_equal(a, b, 0);
++}
++
+ int jv_identical(jv a, jv b) {
+   int r;
+   if (a.kind_flags != b.kind_flags
+diff --git a/src/jv_aux.c b/src/jv_aux.c
+index 594a21f..a39f1f1 100644
+--- a/src/jv_aux.c
++++ b/src/jv_aux.c
+@@ -16,6 +16,24 @@ static double jv_number_get_value_and_consume(jv number) {
+   return value;
+ }
+ 
++#ifndef MAX_CMP_DEPTH
++#define MAX_CMP_DEPTH (10000)
++#endif
++
++struct sort_cmp_state {
++  int too_deep;
++};
++
++#ifdef _MSC_VER
++static __declspec(thread) struct sort_cmp_state sort_cmp_state;
++#else
++#ifdef HAVE___THREAD
++static __thread struct sort_cmp_state sort_cmp_state;
++#else
++static struct sort_cmp_state sort_cmp_state;
++#endif
++#endif
++
+ static jv parse_slice(jv j, jv slice, int* pstart, int* pend) {
+   // Array slices
+   jv start_jv = jv_object_get(jv_copy(slice), jv_string("start"));
+@@ -471,8 +489,7 @@ static jv delpaths_sorted(jv object, jv paths, int start) {
+     int delkey = jv_array_length(jv_array_get(jv_copy(paths), i)) == start + 1;
+     jv key = jv_array_get(jv_array_get(jv_copy(paths), i), start);
+     while (j < jv_array_length(jv_copy(paths)) &&
+-           jv_equal(jv_copy(key), jv_array_get(jv_array_get(jv_copy(paths), j), start)))
+-      j++;
++           jv_equal(jv_copy(key), jv_array_get(jv_array_get(jv_copy(paths), j), start)) == 1);
+     // if i <= entry < j, then entry starts with key
+     if (delkey) {
+       // deleting this entire key, we don't care about any more specific deletions
+@@ -606,7 +623,13 @@ jv jv_keys(jv x) {
+   }
+ }
+ 
+-int jv_cmp(jv a, jv b) {
++static int jvp_cmp(jv a, jv b, int depth) {
++  if (depth > MAX_CMP_DEPTH) {
++    jv_free(a);
++    jv_free(b);
++    return INT_MIN;
++  }
++
+   if (jv_get_kind(a) != jv_get_kind(b)) {
+     int r = (int)jv_get_kind(a) - (int)jv_get_kind(b);
+     jv_free(a);
+@@ -621,14 +644,13 @@ int jv_cmp(jv a, jv b) {
+   case JV_KIND_FALSE:
+   case JV_KIND_TRUE:
+     // there's only one of each of these values
+-    r = 0;
+     break;
+ 
+   case JV_KIND_NUMBER: {
+     if (jvp_number_is_nan(a)) {
+-      r = jv_cmp(jv_null(), jv_copy(b));
++      r = jvp_cmp(jv_null(), jv_copy(b), depth);
+     } else if (jvp_number_is_nan(b)) {
+-      r = jv_cmp(jv_copy(a), jv_null());
++      r = jvp_cmp(jv_copy(a), jv_null(), depth);
+     } else {
+       r = jvp_number_cmp(a, b);
+     }
+@@ -652,7 +674,9 @@ int jv_cmp(jv a, jv b) {
+       }
+       jv xa = jv_array_get(jv_copy(a), i);
+       jv xb = jv_array_get(jv_copy(b), i);
+-      r = jv_cmp(xa, xb);
++      r = jvp_cmp(xa, xb, depth + 1);
++      if (r == INT_MIN)
++        break;
+       i++;
+     }
+     break;
+@@ -661,13 +685,14 @@ int jv_cmp(jv a, jv b) {
+   case JV_KIND_OBJECT: {
+     jv keys_a = jv_keys(jv_copy(a));
+     jv keys_b = jv_keys(jv_copy(b));
+-    r = jv_cmp(jv_copy(keys_a), keys_b);
++    r = jvp_cmp(jv_copy(keys_a), keys_b, depth + 1);
+     if (r == 0) {
+       jv_array_foreach(keys_a, i, key) {
+         jv xa = jv_object_get(jv_copy(a), jv_copy(key));
+         jv xb = jv_object_get(jv_copy(b), key);
+-        r = jv_cmp(xa, xb);
+-        if (r) break;
++        r = jvp_cmp(xa, xb, depth + 1);
++        if (r != 0)
++          break;
+       }
+     }
+     jv_free(keys_a);
+@@ -680,6 +705,11 @@ int jv_cmp(jv a, jv b) {
+   return r;
+ }
+ 
++// Returns <0, 0, >0 if a is less than, equal to, or greater than b, or
++// INT_MIN if the comparison is too deep
++int jv_cmp(jv a, jv b) {
++  return jvp_cmp(a, b, 0);
++}
+ 
+ struct sort_entry {
+   jv object;
+@@ -687,19 +717,32 @@ struct sort_entry {
+   int index;
+ };
+ 
++static void sort_entry_array_free(struct sort_entry* entries, int start, int n) {
++  for (int i = start; i < n; i++) {
++    jv_free(entries[i].key);
++    jv_free(entries[i].object);
++  }
++  jv_mem_free(entries);
++}
++
+ static int sort_cmp(const void* pa, const void* pb) {
+   const struct sort_entry* a = pa;
+   const struct sort_entry* b = pb;
+   int r = jv_cmp(jv_copy(a->key), jv_copy(b->key));
++  if (r == INT_MIN) {
++    sort_cmp_state.too_deep = 1;
++    return 0;
++  }
+   // comparing by index if r == 0 makes the sort stable
+   return r ? r : (a->index - b->index);
+ }
+ 
+-static struct sort_entry* sort_items(jv objects, jv keys) {
++static struct sort_entry* sort_items(jv objects, jv keys, int *too_deep) {
+   assert(jv_get_kind(objects) == JV_KIND_ARRAY);
+   assert(jv_get_kind(keys) == JV_KIND_ARRAY);
+   assert(jv_array_length(jv_copy(objects)) == jv_array_length(jv_copy(keys)));
+   int n = jv_array_length(jv_copy(objects));
++  *too_deep = 0;
+   if (n == 0) {
+     jv_free(objects);
+     jv_free(keys);
+@@ -713,7 +756,13 @@ static struct sort_entry* sort_items(jv objects, jv keys) {
+   }
+   jv_free(objects);
+   jv_free(keys);
++  sort_cmp_state.too_deep = 0;
+   qsort(entries, n, sizeof(struct sort_entry), sort_cmp);
++  if (sort_cmp_state.too_deep) {
++    sort_entry_array_free(entries, 0, n);
++    *too_deep = 1;
++    return NULL;
++  }
+   return entries;
+ }
+ 
+@@ -722,7 +771,10 @@ jv jv_sort(jv objects, jv keys) {
+   assert(jv_get_kind(keys) == JV_KIND_ARRAY);
+   assert(jv_array_length(jv_copy(objects)) == jv_array_length(jv_copy(keys)));
+   int n = jv_array_length(jv_copy(objects));
+-  struct sort_entry* entries = sort_items(objects, keys);
++  int too_deep = 0;
++  struct sort_entry* entries = sort_items(objects, keys, &too_deep);
++  if (too_deep)
++    return jv_invalid_with_msg(jv_string("Comparison too deep"));
+   jv ret = jv_array();
+   for (int i=0; i<n; i++) {
+     jv_free(entries[i].key);
+@@ -737,13 +789,24 @@ jv jv_group(jv objects, jv keys) {
+   assert(jv_get_kind(keys) == JV_KIND_ARRAY);
+   assert(jv_array_length(jv_copy(objects)) == jv_array_length(jv_copy(keys)));
+   int n = jv_array_length(jv_copy(objects));
+-  struct sort_entry* entries = sort_items(objects, keys);
++  int too_deep = 0;
++  struct sort_entry* entries = sort_items(objects, keys, &too_deep);
++  if (too_deep)
++    return jv_invalid_with_msg(jv_string("Comparison too deep"));
+   jv ret = jv_array();
+   if (n > 0) {
+     jv curr_key = entries[0].key;
+     jv group = jv_array_append(jv_array(), entries[0].object);
+     for (int i = 1; i < n; i++) {
+-      if (jv_equal(jv_copy(curr_key), jv_copy(entries[i].key))) {
++      int equal = jv_equal(jv_copy(curr_key), jv_copy(entries[i].key));
++      if (equal < 0) {
++        jv_free(curr_key);
++        jv_free(group);
++        sort_entry_array_free(entries, i, n);
++        jv_free(ret);
++        return jv_invalid_with_msg(jv_string("Equality check too deep"));
++      }
++      if (equal) {
+         jv_free(entries[i].key);
+       } else {
+         jv_free(curr_key);
+@@ -765,11 +828,21 @@ jv jv_unique(jv objects, jv keys) {
+   assert(jv_get_kind(keys) == JV_KIND_ARRAY);
+   assert(jv_array_length(jv_copy(objects)) == jv_array_length(jv_copy(keys)));
+   int n = jv_array_length(jv_copy(objects));
+-  struct sort_entry* entries = sort_items(objects, keys);
++  int too_deep = 0;
++  struct sort_entry* entries = sort_items(objects, keys, &too_deep);
++  if (too_deep)
++    return jv_invalid_with_msg(jv_string("Comparison too deep"));
+   jv ret = jv_array();
+   jv curr_key = jv_invalid();
+   for (int i = 0; i < n; i++) {
+-    if (jv_equal(jv_copy(curr_key), jv_copy(entries[i].key))) {
++    int equal = jv_equal(jv_copy(curr_key), jv_copy(entries[i].key));
++    if (equal < 0) {
++      jv_free(curr_key);
++      sort_entry_array_free(entries, i, n);
++      jv_free(ret);
++      return jv_invalid_with_msg(jv_string("Equality check too deep"));
++    }
++    if (equal) {
+       jv_free(entries[i].key);
+       jv_free(entries[i].object);
+     } else {
+diff --git a/tests/jq.test b/tests/jq.test
+index 5013bce..f35ef94 100644
+--- a/tests/jq.test
++++ b/tests/jq.test
+@@ -2560,3 +2560,43 @@ null
+ try delpaths([[range(10001) | 0]]) catch .
+ null
+ "Path too deep"
++
++# regression test for CVE-2026-40612
++reduce range(10000) as $_ ([]; [.]) | contains([[]])
++null
++true
++
++try (reduce range(10001) as $_ ([]; [.]) as $x | $x | contains($x)) catch .
++null
++"Containment check too deep"
++
++# regression test for CVE-2026-43896
++reduce range(10000) as $_ ({}; {a: .}) as $x | $x * $x | length
++null
++1
++
++try (reduce range(10001) as $_ ({}; {a: .}) as $x | $x * $x) catch .
++null
++"Object merge too deep"
++
++# regression test for deep structural equality recursion
++try ((reduce range(10001) as $_ ([]; [.])) as $x | (reduce range(10001) as $_ ([]; [.])) as $y | $x == $y) catch .
++null
++"Equality check too deep"
++
++# regression tests for deep ordering comparisons
++try ((reduce range(10001) as $_ ([]; [.])) as $x | [$x, $x] | sort) catch .
++null
++"Comparison too deep"
++
++try ((reduce range(10001) as $_ ([]; [.])) as $x | [$x, $x] | unique) catch .
++null
++"Comparison too deep"
++
++try ((reduce range(10001) as $_ ({}; {a: .})) as $x | [$x, $x] | sort) catch .
++null
++"Comparison too deep"
++
++try ((reduce range(10001) as $_ ({}; {a: .})) as $x | [$x, $x] | unique) catch .
++null
++"Comparison too deep"
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-devtools/jq/jq/CVE-2026-49839.patch b/meta-oe/recipes-devtools/jq/jq/CVE-2026-49839.patch
new file mode 100644
index 0000000000..bd4bcf8e37
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/CVE-2026-49839.patch
@@ -0,0 +1,34 @@
+From 59fcd85066bea536f259b6396a7a0a939a4fb369 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 8 Jun 2026 22:14:48 +0900
+Subject: [PATCH] Fix heap-buffer-overflow in raw file loading
+
+When `jv_string_append_buf` overflows the string length limit,
+it returns an invalid `jv`; `jv_load_file` then re-entered it
+on the invalid value and overran the heap. Break out of the loop
+once the value is invalid.
+
+Fixes CVE-2026-49839.
+
+Signed-off-by: Anton Skorup <antonsk@axis.com>
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/e987df0d463d85fd70825e042a082427e8275b86]
+---
+ src/jv_file.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/jv_file.c b/src/jv_file.c
+index b10bcc0..40137c3 100644
+--- a/src/jv_file.c
++++ b/src/jv_file.c
+@@ -57,6 +57,8 @@ jv jv_load_file(const char* filename, int raw) {
+ 
+     if (raw) {
+       data = jv_string_append_buf(data, buf, n);
++      if (!jv_is_valid(data))
++        break;
+     } else {
+       jv_parser_set_buf(parser, buf, n, !feof(file));
+       jv value;
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-devtools/jq/jq_1.8.1.bb b/meta-oe/recipes-devtools/jq/jq_1.8.1.bb
index b9383c76f7..14e77c1bc6 100644
--- a/meta-oe/recipes-devtools/jq/jq_1.8.1.bb
+++ b/meta-oe/recipes-devtools/jq/jq_1.8.1.bb
@@ -8,15 +8,22 @@ SECTION = "utils"
 LICENSE = "MIT & BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cf7fcb0a1def4a7ad62c028f7d0dca47"
 
-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] = "2be64e7129cecb11d5906290eba10af694fb9e3e7f9fc208a311dc33ca837eb0"
-
-inherit autotools github-releases ptest
-
-UPSTREAM_CHECK_REGEX = "releases/tag/${BPN}-(?P<pver>\d+(\.\d+)+)"
+SRCREV = "4467af7068b1bcd7f882defff6e7ea674c5357f4"
+
+SRC_URI = "git://github.com/jqlang/jq.git;protocol=https;branch=master;tag=jq-${PV} \
+           file://run-ptest \
+           file://0001-Support-building-with-disable-maintainer-mode-and-so.patch \
+           file://CVE-2026-32316.patch \
+           file://CVE-2026-33947.patch \
+           file://CVE-2026-33948.patch \
+           file://CVE-2026-39979.patch \
+           file://CVE-2026-47770.patch \
+           file://CVE-2026-49839.patch \
+           "
+
+inherit autotools ptest
+
+UPSTREAM_CHECK_GITTAGREGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
 
 PACKAGECONFIG ?= "oniguruma"
 
diff --git a/meta-oe/recipes-devtools/jsoncpp/files/run-ptest b/meta-oe/recipes-devtools/jsoncpp/files/run-ptest
new file mode 100644
index 0000000000..2cb892b187
--- /dev/null
+++ b/meta-oe/recipes-devtools/jsoncpp/files/run-ptest
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd src
+ctest --force-new-ctest-process | sed -u 's/\*\*\*/   /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}'
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp/0001-Fix-C-11-ABI-breakage-when-compiled-with-C-17-1668-1.patch b/meta-oe/recipes-devtools/jsoncpp/jsoncpp/0001-Fix-C-11-ABI-breakage-when-compiled-with-C-17-1668-1.patch
new file mode 100644
index 0000000000..887bf14d2a
--- /dev/null
+++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp/0001-Fix-C-11-ABI-breakage-when-compiled-with-C-17-1668-1.patch
@@ -0,0 +1,368 @@
+From c67034e4b4c722579ee15fddb8e4af8f04252b08 Mon Sep 17 00:00:00 2001
+From: Jordan Bayles <bayles.jordan@gmail.com>
+Date: Thu, 9 Apr 2026 10:37:08 -0700
+Subject: [PATCH] Fix C++11 ABI breakage when compiled with C++17 #1668 (#1675)
+
+When JSONCPP_HAS_STRING_VIEW was defined, the library dropped the
+`const char*` and `const String&` overloads for `operator[]`, `get`,
+`removeMember`, and `isMember`, breaking ABI compatibility for projects
+consuming the library with C++11.
+
+This change unconditionally declares and defines the legacy overloads
+so they are always exported, restoring compatibility.
+
+This commit completely eliminates the ABI breakage that occurs across
+C++ standard boundaries when using `std::string_view`.
+
+Previously, when the library was built with C++17+, CMake would leak
+`JSONCPP_HAS_STRING_VIEW=1` as a PUBLIC definition. A C++11 consumer
+would receive this definition, attempt to parse the header, and fail
+with compiler errors because `std::string_view` is not available in
+their environment.
+
+Conversely, if the library was built in C++11 (without `string_view`
+symbols), a C++17 consumer would naturally define
+`JSONCPP_HAS_STRING_VIEW` based on `__cplusplus` inside `value.h`. The
+consumer would then call the declared `string_view` methods, resulting
+in linker errors because the methods weren't compiled into the library.
+
+By moving all `std::string_view` overloads directly into `value.h` as
+`inline` methods that delegate to the fundamental
+`const char*, const char*` methods:
+1. The consumer's compiler dictates whether the overloads are visible
+   (via `__cplusplus >= 201703L`).
+2. The consumer compiles the inline wrappers locally, removing any
+   reliance on the library's exported symbols for `std::string_view`.
+3. CMake no longer needs to pollute the consumer's environment with
+   PUBLIC compile definitions.
+
+Backported only the library/header changes. Upstream CI and example
+test additions are omitted.
+
+Upstream-Status: Backport [https://github.com/open-source-parsers/jsoncpp/commit/c67034e4b4c722579ee15fddb8e4af8f04252b08]
+Signed-off-by: Ernest Van Hoecke <ernest.vanhoecke@toradex.com>
+---
+ include/json/value.h        | 54 ++++++++++++++++++++----------
+ src/lib_json/CMakeLists.txt |  9 -----
+ src/lib_json/json_value.cpp | 66 -------------------------------------
+ 3 files changed, 36 insertions(+), 93 deletions(-)
+
+diff --git a/include/json/value.h b/include/json/value.h
+index f32f45609365..2007e6b4251d 100644
+--- a/include/json/value.h
++++ b/include/json/value.h
+@@ -357,7 +357,8 @@ public:
+   Value(const StaticString& value);
+   Value(const String& value);
+ #ifdef JSONCPP_HAS_STRING_VIEW
+-  Value(std::string_view value);
++  inline Value(std::string_view value)
++      : Value(value.data(), value.data() + value.length()) {}
+ #endif
+   Value(bool value);
+   Value(std::nullptr_t ptr) = delete;
+@@ -405,7 +406,14 @@ public:
+   /** Get string_view of string-value.
+    *  \return false if !string. (Seg-fault if str is NULL.)
+    */
+-  bool getString(std::string_view* str) const;
++  inline bool getString(std::string_view* str) const {
++    char const* begin;
++    char const* end;
++    if (!getString(&begin, &end))
++      return false;
++    *str = std::string_view(begin, static_cast<size_t>(end - begin));
++    return true;
++  }
+ #endif
+   Int asInt() const;
+   UInt asUInt() const;
+@@ -496,12 +504,19 @@ public:
+ #ifdef JSONCPP_HAS_STRING_VIEW
+   /// Access an object value by name, create a null member if it does not exist.
+   /// \param key may contain embedded nulls.
+-  Value& operator[](std::string_view key);
++  inline Value& operator[](std::string_view key) {
++    return resolveReference(key.data(), key.data() + key.length());
++  }
+   /// Access an object value by name, returns null if there is no member with
+   /// that name.
+   /// \param key may contain embedded nulls.
+-  const Value& operator[](std::string_view key) const;
+-#else
++  inline const Value& operator[](std::string_view key) const {
++    Value const* found = find(key.data(), key.data() + key.length());
++    if (!found)
++      return nullSingleton();
++    return *found;
++  }
++#endif
+   /// Access an object value by name, create a null member if it does not exist.
+   /// \note Because of our implementation, keys are limited to 2^30 -1 chars.
+   /// Exceeding that will cause an exception.
+@@ -516,7 +531,6 @@ public:
+   /// that name.
+   /// \param key may contain embedded nulls.
+   const Value& operator[](const String& key) const;
+-#endif
+   /** \brief Access an object value by name, create a null member if it does not
+    * exist.
+    *
+@@ -533,8 +547,10 @@ public:
+ #ifdef JSONCPP_HAS_STRING_VIEW
+   /// Return the member named key if it exist, defaultValue otherwise.
+   /// \note deep copy
+-  Value get(std::string_view key, const Value& defaultValue) const;
+-#else
++  inline Value get(std::string_view key, const Value& defaultValue) const {
++    return get(key.data(), key.data() + key.length(), defaultValue);
++  }
++#endif
+   /// Return the member named key if it exist, defaultValue otherwise.
+   /// \note deep copy
+   Value get(const char* key, const Value& defaultValue) const;
+@@ -542,7 +558,6 @@ public:
+   /// \note deep copy
+   /// \param key may contain embedded nulls.
+   Value get(const String& key, const Value& defaultValue) const;
+-#endif
+   /// Return the member named key if it exist, defaultValue otherwise.
+   /// \note deep copy
+   /// \note key may contain embedded nulls.
+@@ -588,13 +603,14 @@ public:
+   /// \pre type() is objectValue or nullValue
+   /// \post type() is unchanged
+ #if JSONCPP_HAS_STRING_VIEW
+-  void removeMember(std::string_view key);
+-#else
++  inline void removeMember(std::string_view key) {
++    removeMember(key.data(), key.data() + key.length(), nullptr);
++  }
++#endif
+   void removeMember(const char* key);
+   /// Same as removeMember(const char*)
+   /// \param key may contain embedded nulls.
+   void removeMember(const String& key);
+-#endif
+   /** \brief Remove the named map member.
+    *
+    *  Update 'removed' iff removed.
+@@ -602,13 +618,14 @@ public:
+    *  \return true iff removed (no exceptions)
+    */
+ #if JSONCPP_HAS_STRING_VIEW
+-  bool removeMember(std::string_view key, Value* removed);
+-#else
++  inline bool removeMember(std::string_view key, Value* removed) {
++    return removeMember(key.data(), key.data() + key.length(), removed);
++  }
++#endif
+   bool removeMember(String const& key, Value* removed);
+   /// Same as removeMember(const char* begin, const char* end, Value* removed),
+   /// but 'key' is null-terminated.
+   bool removeMember(const char* key, Value* removed);
+-#endif
+   /// Same as removeMember(String const& key, Value* removed)
+   bool removeMember(const char* begin, const char* end, Value* removed);
+   /** \brief Remove the indexed array element.
+@@ -622,15 +639,16 @@ public:
+ #ifdef JSONCPP_HAS_STRING_VIEW
+   /// Return true if the object has a member named key.
+   /// \param key may contain embedded nulls.
+-  bool isMember(std::string_view key) const;
+-#else
++  inline bool isMember(std::string_view key) const {
++    return isMember(key.data(), key.data() + key.length());
++  }
++#endif
+   /// Return true if the object has a member named key.
+   /// \note 'key' must be null-terminated.
+   bool isMember(const char* key) const;
+   /// Return true if the object has a member named key.
+   /// \param key may contain embedded nulls.
+   bool isMember(const String& key) const;
+-#endif
+   /// Same as isMember(String const& key)const
+   bool isMember(const char* begin, const char* end) const;
+
+diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt
+index 03e9335525ca..a0695e9eba83 100644
+--- a/src/lib_json/CMakeLists.txt
++++ b/src/lib_json/CMakeLists.txt
+@@ -131,9 +131,6 @@ if(BUILD_SHARED_LIBS)
+
+     target_compile_features(${SHARED_LIB} PUBLIC ${REQUIRED_FEATURES})
+
+-    if(JSONCPP_HAS_STRING_VIEW)
+-        target_compile_definitions(${SHARED_LIB} PUBLIC JSONCPP_HAS_STRING_VIEW=1)
+-    endif()
+
+     target_include_directories(${SHARED_LIB} PUBLIC
+         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+@@ -168,9 +165,6 @@ if(BUILD_STATIC_LIBS)
+
+     target_compile_features(${STATIC_LIB} PUBLIC ${REQUIRED_FEATURES})
+
+-    if(JSONCPP_HAS_STRING_VIEW)
+-        target_compile_definitions(${STATIC_LIB} PUBLIC JSONCPP_HAS_STRING_VIEW=1)
+-    endif()
+
+     target_include_directories(${STATIC_LIB} PUBLIC
+         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+@@ -198,9 +192,6 @@ if(BUILD_OBJECT_LIBS)
+
+     target_compile_features(${OBJECT_LIB} PUBLIC ${REQUIRED_FEATURES})
+
+-    if(JSONCPP_HAS_STRING_VIEW)
+-        target_compile_definitions(${OBJECT_LIB} PUBLIC JSONCPP_HAS_STRING_VIEW=1)
+-    endif()
+
+     target_include_directories(${OBJECT_LIB} PUBLIC
+         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
+index 74f77896fa7b..a8eb72d6b75f 100644
+--- a/src/lib_json/json_value.cpp
++++ b/src/lib_json/json_value.cpp
+@@ -441,14 +441,6 @@ Value::Value(const String& value) {
+       value.data(), static_cast<unsigned>(value.length()));
+ }
+
+-#ifdef JSONCPP_HAS_STRING_VIEW
+-Value::Value(std::string_view value) {
+-  initBasic(stringValue, true);
+-  value_.string_ = duplicateAndPrefixStringValue(
+-      value.data(), static_cast<unsigned>(value.length()));
+-}
+-#endif
+-
+ Value::Value(const StaticString& value) {
+   initBasic(stringValue);
+   value_.string_ = const_cast<char*>(value.c_str());
+@@ -656,21 +648,6 @@ bool Value::getString(char const** begin, char const** end) const {
+   return true;
+ }
+
+-#ifdef JSONCPP_HAS_STRING_VIEW
+-bool Value::getString(std::string_view* str) const {
+-  if (type() != stringValue)
+-    return false;
+-  if (value_.string_ == nullptr)
+-    return false;
+-  const char* begin;
+-  unsigned length;
+-  decodePrefixedString(this->isAllocated(), this->value_.string_, &length,
+-                       &begin);
+-  *str = std::string_view(begin, length);
+-  return true;
+-}
+-#endif
+-
+ String Value::asString() const {
+   switch (type()) {
+   case nullValue:
+@@ -1190,17 +1167,6 @@ Value* Value::demand(char const* begin, char const* end) {
+                       "objectValue or nullValue");
+   return &resolveReference(begin, end);
+ }
+-#ifdef JSONCPP_HAS_STRING_VIEW
+-const Value& Value::operator[](std::string_view key) const {
+-  Value const* found = find(key.data(), key.data() + key.length());
+-  if (!found)
+-    return nullSingleton();
+-  return *found;
+-}
+-Value& Value::operator[](std::string_view key) {
+-  return resolveReference(key.data(), key.data() + key.length());
+-}
+-#else
+ const Value& Value::operator[](const char* key) const {
+   Value const* found = find(key, key + strlen(key));
+   if (!found)
+@@ -1221,7 +1187,6 @@ Value& Value::operator[](const char* key) {
+ Value& Value::operator[](const String& key) {
+   return resolveReference(key.data(), key.data() + key.length());
+ }
+-#endif
+
+ Value& Value::operator[](const StaticString& key) {
+   return resolveReference(key.c_str());
+@@ -1261,18 +1226,12 @@ Value Value::get(char const* begin, char const* end,
+   Value const* found = find(begin, end);
+   return !found ? defaultValue : *found;
+ }
+-#ifdef JSONCPP_HAS_STRING_VIEW
+-Value Value::get(std::string_view key, const Value& defaultValue) const {
+-  return get(key.data(), key.data() + key.length(), defaultValue);
+-}
+-#else
+ Value Value::get(char const* key, Value const& defaultValue) const {
+   return get(key, key + strlen(key), defaultValue);
+ }
+ Value Value::get(String const& key, Value const& defaultValue) const {
+   return get(key.data(), key.data() + key.length(), defaultValue);
+ }
+-#endif
+
+ bool Value::removeMember(const char* begin, const char* end, Value* removed) {
+   if (type() != objectValue) {
+@@ -1288,31 +1247,13 @@ bool Value::removeMember(const char* begin, const char* end, Value* removed) {
+   value_.map_->erase(it);
+   return true;
+ }
+-#ifdef JSONCPP_HAS_STRING_VIEW
+-bool Value::removeMember(std::string_view key, Value* removed) {
+-  return removeMember(key.data(), key.data() + key.length(), removed);
+-}
+-#else
+ bool Value::removeMember(const char* key, Value* removed) {
+   return removeMember(key, key + strlen(key), removed);
+ }
+ bool Value::removeMember(String const& key, Value* removed) {
+   return removeMember(key.data(), key.data() + key.length(), removed);
+ }
+-#endif
+-
+-#ifdef JSONCPP_HAS_STRING_VIEW
+-void Value::removeMember(std::string_view key) {
+-  JSON_ASSERT_MESSAGE(type() == nullValue || type() == objectValue,
+-                      "in Json::Value::removeMember(): requires objectValue");
+-  if (type() == nullValue)
+-    return;
+
+-  CZString actualKey(key.data(), unsigned(key.length()),
+-                     CZString::noDuplication);
+-  value_.map_->erase(actualKey);
+-}
+-#else
+ void Value::removeMember(const char* key) {
+   JSON_ASSERT_MESSAGE(type() == nullValue || type() == objectValue,
+                       "in Json::Value::removeMember(): requires objectValue");
+@@ -1323,7 +1264,6 @@ void Value::removeMember(const char* key) {
+   value_.map_->erase(actualKey);
+ }
+ void Value::removeMember(const String& key) { removeMember(key.c_str()); }
+-#endif
+
+ bool Value::removeIndex(ArrayIndex index, Value* removed) {
+   if (type() != arrayValue) {
+@@ -1353,18 +1293,12 @@ bool Value::isMember(char const* begin, char const* end) const {
+   Value const* value = find(begin, end);
+   return nullptr != value;
+ }
+-#ifdef JSONCPP_HAS_STRING_VIEW
+-bool Value::isMember(std::string_view key) const {
+-  return isMember(key.data(), key.data() + key.length());
+-}
+-#else
+ bool Value::isMember(char const* key) const {
+   return isMember(key, key + strlen(key));
+ }
+ bool Value::isMember(String const& key) const {
+   return isMember(key.data(), key.data() + key.length());
+ }
+-#endif
+
+ Value::Members Value::getMemberNames() const {
+   JSON_ASSERT_MESSAGE(
+--
+2.43.0
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp/71d46ca38e90dc902e8178ba484af4f27fa11947.patch b/meta-oe/recipes-devtools/jsoncpp/jsoncpp/71d46ca38e90dc902e8178ba484af4f27fa11947.patch
new file mode 100644
index 0000000000..d649c2ed4c
--- /dev/null
+++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp/71d46ca38e90dc902e8178ba484af4f27fa11947.patch
@@ -0,0 +1,63 @@
+From 71d46ca38e90dc902e8178ba484af4f27fa11947 Mon Sep 17 00:00:00 2001
+From: Jordan Bayles <bayles.jordan@gmail.com>
+Date: Thu, 14 May 2026 15:57:53 -0700
+Subject: [PATCH] fix: GCC 16 / C++20 build failure with u8 string literals
+ (#1685)
+
+* fix: GCC 16 / C++20 build failure with u8 string literals (#1684)
+
+In C++20, the `u8""` string literal prefix was changed to evaluate to `const char8_t[]` instead of `const char[]`. This caused compilation errors when these literals were implicitly converted to `std::string` or passed to functions expecting `const char*`.
+
+This commit adds `reinterpret_cast<const char*>` around the `u8` string literals in the test suite to resolve the build errors while maintaining the intended UTF-8 semantics.
+
+Additionally, this adds C++20 to the GitHub Actions CMake test matrix to ensure we don't regress on newer standards.
+
+Fixes #1684
+
+* style: run clang-format
+
+Upstream-Status: Backport [https://github.com/open-source-parsers/jsoncpp/commit/71d46ca38e90dc902e8178ba484af4f27fa11947]
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ .github/workflows/cmake.yml |  2 +-
+ src/test_lib_json/main.cpp  | 12 +++++++-----
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
+index 501aba10e..08731f66a 100644
+--- a/src/test_lib_json/main.cpp
++++ b/src/test_lib_json/main.cpp
+@@ -1993,7 +1993,8 @@ JSONTEST_FIXTURE_LOCAL(ValueTest, StaticString) {
+
+ JSONTEST_FIXTURE_LOCAL(ValueTest, WideString) {
+   // https://github.com/open-source-parsers/jsoncpp/issues/756
+-  const std::string uni = u8"\u5f0f\uff0c\u8fdb"; // "式，进"
++  const std::string uni =
++      reinterpret_cast<const char*>(u8"\u5f0f\uff0c\u8fdb"); // "式，进"
+   std::string styled;
+   {
+     Json::Value v;
+@@ -3109,9 +3110,9 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, strictModeParseNumber) {
+ }
+
+ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseChineseWithOneError) {
+-  checkParse(R"({ "pr)"
+-             u8"\u4f50\u85e4" // 佐藤
+-             R"(erty" :: "value" })",
++  checkParse(reinterpret_cast<const char*>(R"({ "pr)"
++                                           u8"\u4f50\u85e4" // 佐藤
++                                           R"(erty" :: "value" })"),
+              {{18, 19, "Syntax error: value, object or array expected."}},
+              "* Line 1, Column 19\n  Syntax error: value, object or array "
+              "expected.\n");
+@@ -3223,7 +3224,8 @@ JSONTEST_FIXTURE_LOCAL(CharReaderTest, parseString) {
+     bool ok = reader->parse(doc, doc + std::strlen(doc), &root, &errs);
+     JSONTEST_ASSERT(ok);
+     JSONTEST_ASSERT(errs.empty());
+-    JSONTEST_ASSERT_EQUAL(u8"\u8A2a", root[0].asString()); // "訪"
++    JSONTEST_ASSERT_EQUAL(reinterpret_cast<const char*>(u8"\u8A2a"),
++                          root[0].asString()); // "訪"
+   }
+   {
+     char const doc[] = R"([ "\uD801" ])";
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb
deleted file mode 100644
index f68ffd2c0f..0000000000
--- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "JSON C++ lib used to read and write json file."
-DESCRIPTION = "Jsoncpp is an implementation of a JSON (http://json.org) reader \
-               and writer in C++. JSON (JavaScript Object Notation) is a \
-               lightweight data-interchange format. It is easy for humans to \
-               read and write. It is easy for machines to parse and generate."
-
-HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp"
-
-SECTION = "libs"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926"
-
-PE = "1"
-
-SRCREV = "89e2973c754a9c02a49974d839779b151e95afd6"
-SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https"
-
-
-inherit cmake
-
-EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DBUILD_OBJECT_LIBS=OFF -DJSONCPP_WITH_TESTS=OFF"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.7.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.7.bb
new file mode 100644
index 0000000000..bf91f8eff4
--- /dev/null
+++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.7.bb
@@ -0,0 +1,48 @@
+SUMMARY = "JSON C++ lib used to read and write json file."
+DESCRIPTION = "Jsoncpp is an implementation of a JSON (http://json.org) reader \
+               and writer in C++. JSON (JavaScript Object Notation) is a \
+               lightweight data-interchange format. It is easy for humans to \
+               read and write. It is easy for machines to parse and generate."
+
+HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp"
+
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926"
+
+PE = "1"
+
+SRCREV = "3455302847cf1e4671f1d8f5fa953fd46a7b1404"
+SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https;tag=${PV} \
+           file://0001-Fix-C-11-ABI-breakage-when-compiled-with-C-17-1668-1.patch \
+           file://71d46ca38e90dc902e8178ba484af4f27fa11947.patch \
+           file://run-ptest \
+           "
+
+inherit cmake ptest
+
+EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DBUILD_OBJECT_LIBS=OFF \
+                  ${@bb.utils.contains('PTEST_ENABLED', '1', '-DJSONCPP_WITH_TESTS=ON -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF', '-DJSONCPP_WITH_TESTS=OFF', d)} \
+                  "
+
+DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'rsync-native', '', d)}"
+RDEPENDS:${PN}-ptest += "cmake python3-core"
+
+do_install_ptest () {
+    cp -r ${B}/bin ${D}${PTEST_PATH}
+    cp -r ${S}/test ${D}${PTEST_PATH}
+    
+    rsync -a ${B}/src ${D}${PTEST_PATH} \
+          --exclude CMakeFiles \
+          --exclude cmake_install.cmake \
+          --exclude Makefile \
+          --exclude generated
+    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`
+}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb b/meta-oe/recipes-devtools/libabigail/libabigail_2.10.bb
index 5c262d2880..27918c0dad 100644
--- a/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb
+++ b/meta-oe/recipes-devtools/libabigail/libabigail_2.10.bb
@@ -7,7 +7,7 @@ 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"
+SRC_URI[sha256sum] = "0cc10e6471398330e001b9fe37f1e8c5108a9ab632b08ca9634d6c64bc380b78"
 
 DEPENDS = "elfutils libxml2"
 DEPENDS:append:libc-musl = " fts"
diff --git a/meta-oe/recipes-devtools/librust-cxx/librust-cxx-crates.inc b/meta-oe/recipes-devtools/librust-cxx/librust-cxx-crates.inc
index c313d24e5c..ea21ea5924 100644
--- a/meta-oe/recipes-devtools/librust-cxx/librust-cxx-crates.inc
+++ b/meta-oe/recipes-devtools/librust-cxx/librust-cxx-crates.inc
@@ -1,4 +1,4 @@
-# Autogenerated with 'bitbake -c update_crates cxx'
+# Autogenerated with 'bitbake -c update_crates librust-cxx'
 
 # from Cargo.lock
 SRC_URI += " \
diff --git a/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-more-whitespaces-after-operator.patch b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-more-whitespaces-after-operator.patch
new file mode 100644
index 0000000000..5bff81eaf6
--- /dev/null
+++ b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-more-whitespaces-after-operator.patch
@@ -0,0 +1,34 @@
+From 6af7de3d5eaae59c53c42aab8eca1e1e9a365da5 Mon Sep 17 00:00:00 2001
+From: Steffen Winter <steffen.winter@proton.me>
+Date: Thu, 25 Dec 2025 20:48:02 +0100
+Subject: [PATCH] Remove more whitespaces after operator""
+
+Upstream-Status: Submitted [https://github.com/ToruNiina/toml11/pull/306]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ include/toml11/fwd/literal_fwd.hpp   | 4 ++--
+ include/toml11/impl/literal_impl.hpp | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/include/toml11/fwd/literal_fwd.hpp
++++ b/include/toml11/fwd/literal_fwd.hpp
+@@ -24,7 +24,7 @@ inline namespace toml_literals
+ #if defined(TOML11_HAS_CHAR8_T)
+ // value of u8"" literal has been changed from char to char8_t and char8_t is
+ // NOT compatible to char
+-::toml::value operator"" _toml(const char8_t* str, std::size_t len);
++::toml::value operator""_toml(const char8_t* str, std::size_t len);
+ #endif
+ 
+ } // toml_literals
+--- a/include/toml11/impl/literal_impl.hpp
++++ b/include/toml11/impl/literal_impl.hpp
+@@ -146,7 +146,7 @@ operator""_toml(const char* str, std::si
+ // value of u8"" literal has been changed from char to char8_t and char8_t is
+ // NOT compatible to char
+ TOML11_INLINE ::toml::value
+-operator"" _toml(const char8_t* str, std::size_t len)
++operator""_toml(const char8_t* str, std::size_t len)
+ {
+     if(len == 0)
+     {
diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
index 7e097e4612..49f9840f06 100644
--- a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
+++ b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
@@ -16,12 +16,15 @@ PE = "1"
 SRC_URI = "\
     gitsm://github.com/ToruNiina/toml11.git;protocol=https;branch=main;tag=v${PV} \
     file://0001-Remove-whitespace-in-operator.patch \
+    file://0001-Remove-more-whitespaces-after-operator.patch \
     file://run-ptest \
 "
 SRCREV = "be08ba2be2a964edcdb3d3e3ea8d100abc26f286"
 
 inherit cmake ptest
 
+CXXFLAGS:append:toolchain-clang = " -Wno-error=c2y-extensions"
+
 EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \
                   -DTOML11_BUILD_TESTS=${@bb.utils.contains("PTEST_ENABLED", "1", "ON", "OFF", d)} \
 "
diff --git a/meta-oe/recipes-devtools/lshw/lshw_02.20.bb b/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
index 95e2084255..2f1367341a 100644
--- a/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
+++ b/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
@@ -32,11 +32,11 @@ EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS} RPM_OPT_FLAGS='${CFLAGS}'"
 
 do_compile() {
     # build core only - don't ship gui
-    oe_runmake -C src core
+    oe_runmake -C src SBINDIR=${sbindir} core
 }
 
 do_install() {
-    oe_runmake install DESTDIR=${D}
+    oe_runmake install DESTDIR=${D} SBINDIR=${sbindir}
 }
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-type-of-single-bit-bitfields.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-type-of-single-bit-bitfields.patch
deleted file mode 100644
index 61932269bd..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-type-of-single-bit-bitfields.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 491b3b153f6b5cbf2d23a9778e5676eb29a6705f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 6 Feb 2023 16:37:19 -0800
-Subject: [PATCH] Fix type of single bit bitfields
-
-clang16 warns
-trace.c:311:22: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion]
-
-quash the warning by using an unsigned type to allow
-an assignment of 0 or 1 without implicit conversion.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- library.h                 |  6 +++---
- prototype.h               |  2 +-
- sysdeps/linux-gnu/trace.h | 10 +++++-----
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/library.h
-+++ b/library.h
-@@ -71,20 +71,20 @@ struct library_symbol {
-         * looking up one in LIB->protolib.  */
-        struct prototype *proto;
- 
--       int own_name : 1;
-+       unsigned int own_name : 1;
- 
-        /* This is relevant for PLT symbols.  Latent PLT symbols are
-         * those that don't match any of the -e rules, but that might
-         * potentially become active if a library implementing them
-         * appears that matches a -l rule.  Ltrace core is responsible
-         * for clearing latent flag.  */
--       int latent : 1;
-+       unsigned latent : 1;
- 
-        /* Delayed symbols are those for which a breakpoint shouldn't
-         * be enabled yet.  They are similar to latent symbols, but
-         * backend is responsible for clearing the delayed flag.  See
-         * proc_activate_delayed_symbol.  */
--       int delayed : 1;
-+       unsigned int delayed : 1;
- 
-        struct arch_library_symbol_data arch;
-        struct os_library_symbol_data os;
---- a/prototype.h
-+++ b/prototype.h
-@@ -162,7 +162,7 @@ struct protolib_cache {
- 
-        /* For tracking uses of cache during cache's own
-         * initialization.  */
--       int bootstrap : 1;
-+       unsigned int bootstrap : 1;
- };
- 
- /* Initialize CACHE.  Returns 0 on success or a negative value on
---- a/sysdeps/linux-gnu/trace.h
-+++ b/sysdeps/linux-gnu/trace.h
-@@ -33,11 +33,11 @@
- struct pid_task {
-        pid_t pid;      /* This may be 0 for tasks that exited
-                         * mid-handling.  */
--       int sigstopped : 1;
--       int got_event : 1;
--       int delivered : 1;
--       int vforked : 1;
--       int sysret : 1;
-+       unsigned int sigstopped : 1;
-+       unsigned int got_event : 1;
-+       unsigned int delivered : 1;
-+       unsigned int vforked : 1;
-+       unsigned int sysret : 1;
- };
- 
- struct pid_set {
---- a/sysdeps/linux-gnu/trace.c
-+++ b/sysdeps/linux-gnu/trace.c
-@@ -1043,7 +1043,7 @@ ltrace_exiting_install_handler(struct pr
- struct process_vfork_handler
- {
-        struct event_handler super;
--       int vfork_bp_refd:1;
-+       unsigned int vfork_bp_refd:1;
- };
- 
- static Event *
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch
deleted file mode 100644
index f3a6d9e599..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c1d3aaf5ec810c2594938438c7b4ccd20943f255 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 7 Jul 2017 10:20:52 -0700
-Subject: [PATCH] configure: Recognise linux-musl as a host OS
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 3e8667f..95d6642 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,6 +35,7 @@ AC_CANONICAL_HOST
- case "${host_os}" in
-     linux-gnu*) HOST_OS="linux-gnu" ;;
-     linux-uclibc*) HOST_OS="linux-gnu" ;;
-+    linux-musl*) HOST_OS="linux-gnu" ;;
-     *)         AC_MSG_ERROR([unkown host-os ${host_os}]) ;;
- esac
- AC_SUBST(HOST_OS)
--- 
-2.13.2
-
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-dwarf_prototypes-return-NULL-from-NEXT_SIBLING-on-er.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-dwarf_prototypes-return-NULL-from-NEXT_SIBLING-on-er.patch
new file mode 100644
index 0000000000..e7aa0fdabe
--- /dev/null
+++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-dwarf_prototypes-return-NULL-from-NEXT_SIBLING-on-er.patch
@@ -0,0 +1,34 @@
+From d568c0cbdecf31a7020f2a0574470d014f447a86 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Sun, 12 Apr 2026 00:07:06 -0700
+Subject: [PATCH] dwarf_prototypes: return NULL from NEXT_SIBLING on error
+
+NEXT_SIBLING is used in functions that return pointers, so returning
+false on error is misleading and relies on implicit conversion.
+Return (void *)0 instead to make the failure value explicit and match
+the surrounding function return type.
+
+This is flagged by clang-22 due to
+Replacing return false with return (void *)0
+avoids clang's -Wbool-conversion error when the macro expands
+inside functions returning a pointer type.
+
+Upstream-Status: Submitted [https://gitlab.com/cespedes/ltrace/-/merge_requests/30]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ dwarf_prototypes.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dwarf_prototypes.c b/dwarf_prototypes.c
+index bfac177..e7ea1bc 100644
+--- a/dwarf_prototypes.c
++++ b/dwarf_prototypes.c
+@@ -36,7 +36,7 @@
+ #define NEXT_SIBLING(die)                                      \
+        int res = dwarf_siblingof(die, die);                    \
+        if (res == 0) continue;     /* sibling exists    */     \
+-       if (res < 0)  return false; /* error             */     \
++       if (res < 0)  return (void *)0;  /* error             */        \
+        break                       /* no sibling exists */
+
+ static struct arg_type_info *get_type(int *newly_allocated_info,
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-trace-fix-1-bit-bitfield-assignments-for-clang-Wsing.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-trace-fix-1-bit-bitfield-assignments-for-clang-Wsing.patch
new file mode 100644
index 0000000000..0f8a9766f4
--- /dev/null
+++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-trace-fix-1-bit-bitfield-assignments-for-clang-Wsing.patch
@@ -0,0 +1,86 @@
+From 65c5a621a366a25b8572cd29c01b4aa92c02903a Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Sun, 12 Apr 2026 00:46:20 -0700
+Subject: [PATCH] trace: fix 1-bit bitfield assignments for clang
+ -Wsingle-bit-bitfield-constant-conversion
+
+Replace '1' with 'true' for all 1-bit signed bitfield assignments.
+Assigning integer 1 to a 1-bit signed bitfield truncates to -1; using
+'true' which is a bool is well-defined and avoids the clang error.
+
+Upstream-Status: Submitted [https://gitlab.com/cespedes/ltrace/-/merge_requests/30]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ ltrace-elf.c              |  2 +-
+ sysdeps/linux-gnu/trace.c | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ltrace-elf.c b/ltrace-elf.c
+index beaf69f..2be609c 100644
+--- a/ltrace-elf.c
++++ b/ltrace-elf.c
+@@ -819,7 +819,7 @@ mark_chain_latent(struct library_symbol *libsym)
+ {
+        for (; libsym != NULL; libsym = libsym->next) {
+                debug(DEBUG_FUNCTION, "marking %s latent", libsym->name);
+-               libsym->latent = 1;
++               libsym->latent = true;
+        }
+ }
+
+diff --git a/sysdeps/linux-gnu/trace.c b/sysdeps/linux-gnu/trace.c
+index 12c8747..b7f4c57 100644
+--- a/sysdeps/linux-gnu/trace.c
++++ b/sysdeps/linux-gnu/trace.c
+@@ -310,13 +310,13 @@ send_sigstop(struct process *task, void *data)
+         * weed out unnecessary looping.  */
+        if (st == PS_SLEEPING
+            && is_vfork_parent(task)) {
+-               task_info->vforked = 1;
++               task_info->vforked = true;
+                return CBS_CONT;
+        }
+
+        if (task_kill(task->pid, SIGSTOP) >= 0) {
+                debug(DEBUG_PROCESS, "send SIGSTOP to %d", task->pid);
+-               task_info->sigstopped = 1;
++               task_info->sigstopped = true;
+        } else
+                fprintf(stderr,
+                        "Warning: couldn't send SIGSTOP to %d\n", task->pid);
+@@ -442,7 +442,7 @@ handle_stopping_event(struct pid_task *task_info, Event **eventp)
+ {
+        /* Mark all events, so that we know whom to SIGCONT later.  */
+        if (task_info != NULL)
+-               task_info->got_event = 1;
++               task_info->got_event = true;
+
+        Event *event = *eventp;
+
+@@ -454,7 +454,7 @@ handle_stopping_event(struct pid_task *task_info, Event **eventp)
+                debug(DEBUG_PROCESS, "SIGSTOP delivered to %d", task_info->pid);
+                if (task_info->sigstopped
+                    && !task_info->delivered) {
+-                       task_info->delivered = 1;
++                       task_info->delivered = true;
+                        *eventp = NULL; // sink the event
+                } else
+                        fprintf(stderr, "suspicious: %d got SIGSTOP, but "
+@@ -748,7 +748,7 @@ process_stopping_on_event(struct event_handler *super, Event *event)
+                debug(1, "%d LT_EV_SYSRET", event->proc->pid);
+                event_to_queue = 0;
+                if (task_info != NULL)
+-                       task_info->sysret = 1;
++                       task_info->sysret = true;
+        }
+
+        switch (state) {
+@@ -1070,7 +1070,7 @@ process_vfork_on_event(struct event_handler *super, Event *event)
+                                      &event->e_un.brk_addr, &sbp);
+                        assert(sbp != NULL);
+                        breakpoint_turn_on(sbp, proc->leader);
+-                       self->vfork_bp_refd = 1;
++                       self->vfork_bp_refd = true;
+                }
+                break;
+
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_0.8.1.bb
index f84d989eef..77bb61830b 100644
--- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
+++ b/meta-oe/recipes-devtools/ltrace/ltrace_0.8.1.bb
@@ -9,25 +9,24 @@ HOMEPAGE = "http://ltrace.org/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
-PE = "1"
-PV = "7.91+git"
-SRCREV = "8eabf684ba6b11ae7a1a843aca3c0657c6329d73"
+PE = "2"
+SRCREV = "7ef6e6097586b751cce298c256a919404dab259d"
 
 DEPENDS = "elfutils"
-SRC_URI = "git://gitlab.com/cespedes/ltrace.git;protocol=https;branch=main \
+SRC_URI = "git://gitlab.com/cespedes/ltrace.git;protocol=https;branch=main;tag=${PV} \
            file://configure-allow-to-disable-selinux-support.patch \
            file://0001-Use-correct-enum-type.patch \
            file://0002-Fix-const-qualifier-error.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-ppc-Remove-unused-host_powerpc64-function.patch \
            file://0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch \
-           file://0001-Fix-type-of-single-bit-bitfields.patch \
            file://0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch \
+           file://0001-dwarf_prototypes-return-NULL-from-NEXT_SIBLING-on-er.patch \
+           file://0001-trace-fix-1-bit-bitfield-assignments-for-clang-Wsing.patch \
            "
 SRC_URI:append:libc-musl = " file://add_ppc64le.patch"
 
diff --git a/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
index 9d392f1c29..9873ed6f05 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=d421a5e2a24207f5e260537399a9a38b"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=a2c43bf4a9ea63755af2131b0ae59ff3"
 HOMEPAGE = "http://luajit.org"
 
 SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
@@ -9,7 +9,7 @@ SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
            "
 
 PV = "2.1"
-SRCREV = "538a82133ad6fddfd0ca64de167c4aca3bc1a2da"
+SRCREV = "659a61693aa3b87661864ad0f12eee14c865cd7f"
 
 inherit pkgconfig binconfig siteinfo
 
diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb b/meta-oe/recipes-devtools/mercurial/mercurial_7.2.2.bb
index 3fa692029e..5e350831f5 100644
--- a/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb
+++ b/meta-oe/recipes-devtools/mercurial/mercurial_7.2.2.bb
@@ -10,7 +10,7 @@ RDEPENDS:${PN} = "python3 python3-modules"
 inherit python3native python3targetconfig
 
 SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz"
-SRC_URI[sha256sum] = "f75d6a4a75823a1b7d713a4967eca2f596f466e58fc6bc06d72642932fd7e307"
+SRC_URI[sha256sum] = "f2ec8e7eeef0500591706d374555f0ceb118822068e75fa3b32be07dd2184f6c"
 
 S = "${UNPACKDIR}/mercurial-${PV}"
 
diff --git a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.2.1.bb b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.2.2.bb
index 87a8cbbb88..3d795878b2 100644
--- a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.2.1.bb
+++ b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.2.2.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=363055e71e77071107ba2bb9a54bd9a7"
 SRC_URI = "git://github.com/microsoft/GSL.git;protocol=https;branch=rel/4.2;tag=v${PV} \
            file://run-ptest \
            "
-SRCREV = "249146590e322123cd0b378b1f364d6069717687"
+SRCREV = "152d6eb989a1ecd23fe9c9cfb2fb8cfc7c0cd0c1"
 
 inherit cmake pkgconfig ptest
 
diff --git a/meta-oe/recipes-devtools/mpich/mpich_5.0.0.bb b/meta-oe/recipes-devtools/mpich/mpich_5.0.1.bb
index 505fc6f92b..55f6cde82f 100644
--- a/meta-oe/recipes-devtools/mpich/mpich_5.0.0.bb
+++ b/meta-oe/recipes-devtools/mpich/mpich_5.0.1.bb
@@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a296dfb961b957b0e8adf67d8478d3d"
 
 SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz"
-SRC_URI[sha256sum] = "e9350e32224283e95311f22134f36c98e3cd1c665d17fae20a6cc92ed3cffe11"
+SRC_URI[sha256sum] = "8c1832a13ddacf071685069f5fadfd1f2877a29e1a628652892c65211b1f3327"
 
 RDEPENDS:${PN} += "bash perl libxml2"
 
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_7.0.0.bb b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_8.0.0.bb
index 5b296a20cd..87f11d279b 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_7.0.0.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_8.0.0.bb
@@ -8,7 +8,7 @@ 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] = "7504b7af7e7b9002ce529d4f941e1b7fb1fb435768780ce7da4abaac79bb156f"
+SRC_URI[sha256sum] = "4a3c0c0ac55ef4456c2d0b93c21b5d105aa3a8f21ef8fa9758550feaf989b92f"
 
 UPSTREAM_CHECK_URI = "https://github.com/msgpack/msgpack-c/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
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-24/0001-Do-not-use-glob-in-deps.patch
index f692eedd41..622d25bbd3 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/0001-Do-not-use-glob-in-deps.patch
@@ -1,10 +1,13 @@
+// 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.
+
 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
 
-Upstream-Status: Inappropriate [embedded specific]
-
 Probably imported from:
 https://src.fedoraproject.org/rpms/nodejs/c/41af04f2a3c050fb44628e91ac65fd225b927acb?branch=22609d8c1bfeaa21fe0057645af20b3a2ccc7f53
 which is probably based on dont-run-gyp-files-for-bundled-deps.patch added in:
@@ -28,20 +31,17 @@ 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
+Upstream-Status: Inappropriate [embedded specific]
+
 --- a/Makefile
 +++ b/Makefile
-@@ -173,7 +173,7 @@ with-code-cache test-code-cache:
+@@ -179,7 +179,7 @@ with-code-cache test-code-cache:
         $(warning '$@' target is a noop)
- 
- 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/nbytes/nbytes.gyp \
+
+ out/Makefile: config.gypi common.gypi node.gyp \
+-       deps/*/*.gyp \
++       deps/llhttp/llhttp.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/0004-v8-don-t-override-ARM-CFLAGS.patch b/meta-oe/recipes-devtools/nodejs/nodejs-24/0002-v8-don-t-override-ARM-CFLAGS.patch
index cc920118a2..cc920118a2 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/0002-v8-don-t-override-ARM-CFLAGS.patch
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/system-c-ares.patch b/meta-oe/recipes-devtools/nodejs/nodejs-24/0003-system-c-ares.patch
index 6f08c71e18..6f08c71e18 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/system-c-ares.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/0003-system-c-ares.patch
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch b/meta-oe/recipes-devtools/nodejs/nodejs-24/0004-liftoff-Correct-function-signatures.patch
index 5e617e6554..5e617e6554 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/0004-liftoff-Correct-function-signatures.patch
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch b/meta-oe/recipes-devtools/nodejs/nodejs-24/0006-deps-disable-io_uring-support-in-libuv.patch
index 50d63cf78c..50d63cf78c 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/0006-deps-disable-io_uring-support-in-libuv.patch
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-positional-args.patch b/meta-oe/recipes-devtools/nodejs/nodejs-24/0007-positional-args.patch
index 5fd6aee351..5fd6aee351 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-positional-args.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/0007-positional-args.patch
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-custom-env.patch b/meta-oe/recipes-devtools/nodejs/nodejs-24/0008-custom-env.patch
index 532d3c5f51..532d3c5f51 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-custom-env.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/0008-custom-env.patch
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch b/meta-oe/recipes-devtools/nodejs/nodejs-24/0009-Using-native-binaries.patch
index 0178cec777..0178cec777 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/0009-Using-native-binaries.patch
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-24/0010-v8-fix-Wtemplate-body-error-with-GCC-15-on-ia32.patch b/meta-oe/recipes-devtools/nodejs/nodejs-24/0010-v8-fix-Wtemplate-body-error-with-GCC-15-on-ia32.patch
new file mode 100644
index 0000000000..4053f97053
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/0010-v8-fix-Wtemplate-body-error-with-GCC-15-on-ia32.patch
@@ -0,0 +1,52 @@
+From 9f1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a Mon Sep 17 00:00:00 2001
+From: Bin Cao <bin.cao.cn@windriver.com>
+Date: Thu, 29 May 2026 12:00:00 +0800
+Subject: [PATCH] v8: fix -Wtemplate-body error with GCC 15 on ia32
+
+GCC 15 introduced -Wtemplate-body (enabled by default as an error) which
+performs stricter name lookup checking inside template bodies. In the
+Int64LoweringReducer template class (only compiled for 32-bit targets),
+the expression `__ Tuple<Word32, Word32>(...)` is ambiguous in a
+dependent context because GCC cannot determine whether `Tuple` after
+the `__` macro expansion (`Asm().`) refers to a template member function
+or the struct type `Tuple`.
+
+Add the C++ `template` disambiguator keyword to tell the compiler that
+`Tuple` is a dependent template name. This is the standards-correct fix
+and is backward-compatible with older GCC versions.
+
+This is a minimal backport of the fix already present in upstream V8
+(main branch), where the method was additionally renamed from `Tuple` to
+`MakeTuple`.
+
+Upstream-Status: Backport [https://github.com/nodejs/node/commit/7772a2df9d0b4db9947dbb902b4aec33c35401c0]
+Signed-off-by: Bin Cao <bin.cao.cn@windriver.com>
+---
+ .../turboshaft/int64-lowering-reducer.h       | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h b/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h
+index abcdef1..1234567 100644
+--- a/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h
++++ b/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h
+@@ -637,7 +637,7 @@ class Int64LoweringReducer : public Next {
+       result = __ Word32CountLeadingZeros(high);
+     }
+ 
+-    return __ Tuple<Word32, Word32>(result, __ Word32Constant(0));
++    return __ template Tuple<Word32, Word32>(result, __ Word32Constant(0));
+   }
+ 
+   V<Word32Pair> LowerCtz(V<Word32Pair> input) {
+@@ -650,7 +650,7 @@ class Int64LoweringReducer : public Next {
+       result = __ Word32CountTrailingZeros(low);
+     }
+ 
+-    return __ Tuple<Word32, Word32>(result, __ Word32Constant(0));
++    return __ template Tuple<Word32, Word32>(result, __ Word32Constant(0));
+   }
+ 
+   V<Word32Pair> LowerPopCount(V<Word32Pair> input) {
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest b/meta-oe/recipes-devtools/nodejs/nodejs-24/run-ptest
index e82f373626..e82f373626 100755
--- a/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/run-ptest
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.22/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-24.16/oe-npm-cache
index eb0f143eae..eb0f143eae 100755
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.22/oe-npm-cache
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-24.16/oe-npm-cache
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.22.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_24.16.bb
index 1dcd1f7926..1dcd1f7926 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.22.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_24.16.bb
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
deleted file mode 100644
index 551869523e..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Do-not-use-glob-in-deps.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-// 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-remove-redundant-mXX-flags-for-V8.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-remove-redundant-mXX-flags-for-V8.patch
deleted file mode 100644
index b47aa564cf..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-remove-redundant-mXX-flags-for-V8.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 403264c02edc2689671dbefaf032e3acb4fb713d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
-Date: Sat, 19 Apr 2025 12:22:10 +0200
-Subject: [PATCH] build: remove redundant `-mXX` flags for V8
-
-They are already set by `common.gypi`.
-
-
-Needed to build on aarch64 build hosts with clang compiler
-Drop it when upgrading to 0.24.x or newer.
-
-Upstream-Status: Backport [https://github.com/nodejs/node/commit/403264c02edc2689671dbefaf032e3acb4fb713d]
-
-PR-URL: https://github.com/nodejs/node/pull/57907
-Reviewed-By: James M Snell <jasnell@gmail.com>
-Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
-Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
-Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
-Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
----
- tools/v8_gypfiles/toolchain.gypi | 91 --------------------------------
- 1 file changed, 91 deletions(-)
-
-Index: node-v22.16.0/tools/v8_gypfiles/toolchain.gypi
-===================================================================
---- node-v22.16.0.orig/tools/v8_gypfiles/toolchain.gypi
-+++ node-v22.16.0/tools/v8_gypfiles/toolchain.gypi
-@@ -103,33 +103,6 @@
-     # Indicates if gcmole tools are downloaded by a hook.
-     'gcmole%': 0,
-   },
--
--  # [GYP] this needs to be outside of the top level 'variables'
--  'conditions': [
--    ['host_arch=="ia32" or host_arch=="x64" or \
--      host_arch=="ppc" or host_arch=="ppc64" or \
--      host_arch=="s390x" or \
--      clang==1', {
--      'variables': {
--        'host_cxx_is_biarch%': 1,
--       },
--     }, {
--      'variables': {
--        'host_cxx_is_biarch%': 0,
--      },
--    }],
--    ['target_arch=="ia32" or target_arch=="x64" or \
--      target_arch=="ppc" or target_arch=="ppc64" or \
--      target_arch=="s390x" or clang==1', {
--      'variables': {
--        'target_cxx_is_biarch%': 1,
--       },
--     }, {
--      'variables': {
--        'target_cxx_is_biarch%': 0,
--      },
--    }],
--  ],
-   'target_defaults': {
-     'cflags!': ['-Wall', '-Wextra'],
-     'conditions': [
-@@ -553,71 +526,6 @@
-           '-mmmx',  # Allows mmintrin.h for MMX intrinsics.
-         ],
-       }],
--      ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
--         or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
--        (v8_target_arch=="arm" or v8_target_arch=="ia32" or \
--         v8_target_arch=="ppc")', {
--        'target_conditions': [
--          ['_toolset=="host"', {
--            'conditions': [
--              ['host_cxx_is_biarch==1', {
--                'conditions': [
--                  ['host_arch=="s390x"', {
--                    'cflags': [ '-m31' ],
--                    'ldflags': [ '-m31' ]
--                  },{
--                   'cflags': [ '-m32' ],
--                   'ldflags': [ '-m32' ]
--                  }],
--                ],
--              }],
--            ],
--            'xcode_settings': {
--              'ARCHS': [ 'i386' ],
--            },
--          }],
--          ['_toolset=="target"', {
--            'conditions': [
--              ['target_cxx_is_biarch==1', {
--                'conditions': [
--                  ['host_arch=="s390x"', {
--                    'cflags': [ '-m31' ],
--                    'ldflags': [ '-m31' ]
--                  },{
--                   'cflags': [ '-m32' ],
--                   'ldflags': [ '-m32' ],
--                  }],
--                ],
--              }],
--            ],
--            'xcode_settings': {
--              'ARCHS': [ 'i386' ],
--            },
--          }],
--        ],
--      }],
--      ['(OS=="linux" or OS=="android") and \
--        (v8_target_arch=="x64" or v8_target_arch=="arm64" or \
--         v8_target_arch=="ppc64" or v8_target_arch=="s390x")', {
--        'target_conditions': [
--          ['_toolset=="host"', {
--            'conditions': [
--              ['host_cxx_is_biarch==1', {
--                'cflags': [ '-m64' ],
--                'ldflags': [ '-m64' ]
--              }],
--             ],
--           }],
--          ['_toolset=="target"', {
--             'conditions': [
--               ['target_cxx_is_biarch==1', {
--                 'cflags': [ '-m64' ],
--                 'ldflags': [ '-m64' ],
--               }],
--             ]
--           }],
--         ],
--      }],
-       ['OS=="android" and v8_android_log_stdout==1', {
-         'defines': [
-           'V8_ANDROID_LOG_STDOUT',
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-detect-aarch64-Neon-correctly.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-detect-aarch64-Neon-correctly.patch
deleted file mode 100644
index 15de2c1119..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-detect-aarch64-Neon-correctly.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 41ec2d5302b77be27ca972102c29ce12471ed4b0 Mon Sep 17 00:00:00 2001
-From: Gyorgy Sarvari <skandigraun@gmail.com>
-Date: Thu, 12 Feb 2026 11:09:44 +0100
-Subject: [PATCH 2/2] detect aarch64 Neon correctly
-
-The llhttp vendored dependency of nodejs takes advantage of Arm NEON
-instructions when they are available, however they are detected by
-checking for an outdated CPU feature macro: it checks for __ARM_NEON__,
-however it is not defined by new compilers for aarch64, rather they
-set __ARM_NEON. The Arm C extension guide[1] refers to __ARM_NEON macro
-aswell.
-
-This patch changes the detection to check for both macros when detecting
-the availability of NEON instructions.
-
-The code this patch modifies is generated, so the patch itself isn't
-suitable for upstream submission, as the root cause of the error is
-in the generator itself. A PR has been submitted[2] to the generator
-project to rectify this issue.
-
-[1]: https://developer.arm.com/documentation/ihi0053/d/ - pdf, section 6.9
-[2]: https://github.com/nodejs/llparse/pull/84
-
-Upstream-Status: Inappropriate [see above]
-Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
----
- deps/llhttp/src/llhttp.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c
-index a0e59e50..b069bbbb 100644
---- a/deps/llhttp/src/llhttp.c
-+++ b/deps/llhttp/src/llhttp.c
-@@ -10,7 +10,7 @@
-  #endif  /* _MSC_VER */
- #endif  /* __SSE4_2__ */
- 
--#ifdef __ARM_NEON__
-+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
-  #include <arm_neon.h>
- #endif  /* __ARM_NEON__ */
- 
-@@ -2625,7 +2625,7 @@ static llparse_state_t llhttp__internal__run(
-         goto s_n_llhttp__internal__n_header_value_otherwise;
-       }
-       #endif  /* __SSE4_2__ */
--      #ifdef __ARM_NEON__
-+      #if defined(__ARM_NEON__) || defined(__ARM_NEON)
-       while (endp - p >= 16) {
-         uint8x16_t input;
-         uint8x16_t single;
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-fix-arm-Neon-intrinsics-types.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-fix-arm-Neon-intrinsics-types.patch
deleted file mode 100644
index ddbad575f0..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-fix-arm-Neon-intrinsics-types.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 3f4283dac7d88a89b42f1f2966a862cee5afe486 Mon Sep 17 00:00:00 2001
-From: Gyorgy Sarvari <skandigraun@gmail.com>
-Date: Thu, 12 Feb 2026 11:03:53 +0100
-Subject: [PATCH 1/2] fix arm Neon intrinsics types
-
-The current code calls these intrinsics with incorrect datatypes
-(it uses a vector of uint16 instead of uint8), causing compilation
-to fail with the following error:
-
-| ../deps/llhttp/src/llhttp.c: In function 'llhttp__internal__run':
-| ../deps/llhttp/src/llhttp.c:2645:9: note: use '-flax-vector-conversions' to permit conversions between vectors with differing element types or numbers of subparts
-|  2645 |         );
-|       |         ^
-| ../deps/llhttp/src/llhttp.c:2643:11: error: incompatible type for argument 1 of 'vandq_u16'
-|  2643 |           vcgeq_u8(input, vdupq_n_u8(' ')),
-
-To avoid this, set the correct intrinsics call that matches the
-actual arguments.
-
-The code that this patch modifies is generated code, so in itself
-this change isn't appropriate for upstream. The actual problem
-is in the code generator itself, for which a PR is already pending
-for merging[1]. This patch is a port of that PR.
-
-[1]: https://github.com/nodejs/llparse/pull/79
-
-Upstream-Status: Inappropriate [see above]
-Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
----
- deps/llhttp/src/llhttp.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c
-index aa4c4682..887603fd 100644
---- a/deps/llhttp/src/llhttp.c
-+++ b/deps/llhttp/src/llhttp.c
-@@ -2639,17 +2639,17 @@ static llparse_state_t llhttp__internal__run(
-         /* Find first character that does not match `ranges` */
-         single = vceqq_u8(input, vdupq_n_u8(0x9));
-         mask = single;
--        single = vandq_u16(
-+        single = vandq_u8(
-           vcgeq_u8(input, vdupq_n_u8(' ')),
-           vcleq_u8(input, vdupq_n_u8('~'))
-         );
--        mask = vorrq_u16(mask, single);
--        single = vandq_u16(
-+        mask = vorrq_u8(mask, single);
-+        single = vandq_u8(
-           vcgeq_u8(input, vdupq_n_u8(0x80)),
-           vcleq_u8(input, vdupq_n_u8(0xff))
-         );
--        mask = vorrq_u16(mask, single);
--        narrow = vshrn_n_u16(mask, 4);
-+        mask = vorrq_u8(mask, single);
-+        narrow = vshrn_n_u16(vreinterpretq_u16_u8(mask), 4);
-         match_mask = ~vget_lane_u64(vreinterpret_u64_u8(narrow), 0);
-         match_len = __builtin_ctzll(match_mask) >> 2;
-         if (match_len != 16) {
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-llhttp-fix-NEON-header-value-__builtin_ctzll-undefin.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-llhttp-fix-NEON-header-value-__builtin_ctzll-undefin.patch
deleted file mode 100644
index 683dddcf04..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-llhttp-fix-NEON-header-value-__builtin_ctzll-undefin.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a63a5faea54055973bf5f0a514444532563cc20d Mon Sep 17 00:00:00 2001
-From: Telukula Jeevan Kumar Sahu <j-sahu@ti.com>
-Date: Fri, 27 Feb 2026 20:58:43 +0530
-Subject: [PATCH] llhttp: fix NEON header value __builtin_ctzll undefined
- behavior
-
-When all 16 bytes match the allowed range, match_mask becomes 0 after
-the bitwise NOT. Calling __builtin_ctzll(0) is undefined behavior per
-the C standard.
-
-The code expects match_len == 16 when all bytes match (so the branch
-is skipped and p += 16 continues the loop), but this relied on
-ctzll(0) returning 64, which is not guaranteed.
-
-GCC at -O2 exploits this UB by deducing that __builtin_ctzll() result
-is always in range [0, 63], and after >> 2 always in [0, 15], which
-is never equal to 16. The compiler then optimizes
-"if (match_len != 16)" to always-true, causing every valid 16-byte
-chunk to be falsely rejected as containing an invalid character.
-
-This manifests as HTTP 400 Bad Request (HPE_INVALID_HEADER_TOKEN) for
-any HTTP header value longer than 16 characters on ARM targets with
-NEON enabled.
-
-Fix by explicitly checking for match_mask == 0 and setting
-match_len = 16, avoiding the undefined behavior entirely. This bug
-affects both aarch64 and armv7 NEON targets.
-
-The fix has been merged upstream in llparse 7.3.1 [1] and is included
-in llhttp 9.3.1. This patch can be dropped when nodejs updates its
-bundled llhttp to >= 9.3.1.
-
-[1]: https://github.com/nodejs/llparse/pull/83
-
-Upstream-Status: Inappropriate
-Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com>
----
- deps/llhttp/src/llhttp.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c
-index 14b731e..b0a46c6 100644
---- a/deps/llhttp/src/llhttp.c
-+++ b/deps/llhttp/src/llhttp.c
-@@ -2651,7 +2651,11 @@ static llparse_state_t llhttp__internal__run(
-         mask = vorrq_u8(mask, single);
-         narrow = vshrn_n_u16(vreinterpretq_u16_u8(mask), 4);
-         match_mask = ~vget_lane_u64(vreinterpret_u64_u8(narrow), 0);
--        match_len = __builtin_ctzll(match_mask) >> 2;
-+        if (match_mask == 0) {
-+          match_len = 16;
-+        } else {
-+          match_len = __builtin_ctzll(match_mask) >> 2;
-+        }
-         if (match_len != 16) {
-           p += match_len;
-           goto s_n_llhttp__internal__n_header_value_otherwise;
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch
deleted file mode 100644
index dd9c9015e2..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0976af0f3b328436ea44a74a406f311adb2ab211 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 15 Jun 2021 19:01:31 -0700
-Subject: [PATCH] ppc64: Do not use -mminimal-toc with clang
-
-clang does not support this option
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- common.gypi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/common.gypi
-+++ b/common.gypi
-@@ -417,7 +417,7 @@
-             'ldflags': [ '-m32' ],
-           }],
-           [ 'target_arch=="ppc64" and OS!="aix"', {
--            'cflags': [ '-m64', '-mminimal-toc' ],
-+            'cflags': [ '-m64' ],
-             'ldflags': [ '-m64' ],
-           }],
-           [ 'target_arch=="s390x"', {
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
deleted file mode 100644
index 835c7018de..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-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 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;
-
-Fix:
-|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
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
-Added libatomic library explicitly to x86 targets.
-
-Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.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
-@@ -503,7 +503,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
-@@ -1348,9 +1348,18 @@
-         # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
-         # to implement atomic memory access
-         ['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', {
--          'link_settings': {
--            'libraries': ['-latomic', ],
--          },
-+          'target_conditions': [
-+             ['_toolset=="host"', {
-+               'conditions': [
-+                 ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', {
-+                   'libraries': ['-latomic'],
-+                 }],
-+               ],
-+             }],
-+             ['_toolset=="target"', {
-+               'libraries': ['-latomic', ],
-+             }],
-+           ],
-         }],
-       ],
-     },  # v8_base_without_compiler
-diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
-index cb82d4f15bc..65cb123b7bf 100644
---- a/tools/v8_gypfiles/v8.gyp
-+++ b/tools/v8_gypfiles/v8.gyp
-@@ -1820,6 +1820,13 @@
-         ['enable_lto=="true"', {
-           'ldflags': [ '-fno-lto' ],
-         }],
-+        # For future patch-rebases: this hunk is in mksnapshot target.
-+        # ia32 includes x86 also
-+        ['v8_target_arch=="ia32"', {
-+          'link_settings': {
-+            'libraries': ['-latomic']
-+          }
-+        }],
-       ],
-     },  # mksnapshot
-     {
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.22.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb
index 09d6b896b2..ff40a09656 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_22.22.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb
@@ -1,7 +1,8 @@
 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 & BlueOak-1.0.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b195f4ea4368177a2fd84b879f09cba8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9f816753e8bdfe4576cb87159a0cd60c"
+FILESEXTRAPATHS:prepend := "${THISDIR}/nodejs-24:"
 
 CVE_PRODUCT = "nodejs node.js"
 
@@ -22,27 +23,19 @@ COMPATIBLE_HOST:powerpc64le = "null"
 
 SRC_URI = "https://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://0001-build-remove-redundant-mXX-flags-for-V8.patch \
-           file://0001-fix-arm-Neon-intrinsics-types.patch \
-           file://0001-detect-aarch64-Neon-correctly.patch \
-           file://0001-llhttp-fix-NEON-header-value-__builtin_ctzll-undefin.patch \
+           file://0002-v8-don-t-override-ARM-CFLAGS.patch \
+           file://0003-system-c-ares.patch \
+           file://0004-liftoff-Correct-function-signatures.patch \
+           file://0006-deps-disable-io_uring-support-in-libuv.patch \
+           file://0007-positional-args.patch \
+           file://0008-custom-env.patch \
+           file://0010-v8-fix-Wtemplate-body-error-with-GCC-15-on-ia32.patch \
            file://run-ptest \
            "
 SRC_URI:append:class-target = " \
-           file://0001-Using-native-binaries.patch \
+           file://0009-Using-native-binaries.patch \
            "
-SRC_URI:append:toolchain-clang:powerpc64le = " \
-           file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
-           "
-SRC_URI[sha256sum] = "87104b07e7acee748bcc5391e1bc69cf3571caa0fdfb8b1d6b5fd3f9599b7849"
+SRC_URI[sha256sum] = "2ff84a6de70b6165290111b0fc656ded1ad207a799816fe720cc7c31232df30f"
 
 S = "${UNPACKDIR}/node-v${PV}"
 
diff --git a/meta-oe/recipes-devtools/perl/exiftool_13.52.bb b/meta-oe/recipes-devtools/perl/exiftool_13.59.bb
index f40116144e..224741cce4 100644
--- a/meta-oe/recipes-devtools/perl/exiftool_13.52.bb
+++ b/meta-oe/recipes-devtools/perl/exiftool_13.59.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff
 
 inherit cpan
 
-SRCREV = "02c78a2e051894b57ad8a11024f8cfa05957e725"
+SRCREV = "2200871d9cef988051d2a99d67df3bda6cbb30a8"
 SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master;tag=${PV}"
 
 RDEPENDS:${PN} = " \
diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.647.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.648.bb
index 00f8181065..603c3b3cd2 100644
--- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.647.bb
+++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.648.bb
@@ -7,10 +7,10 @@ database interface independent of the actual database being used. \
 HOMEPAGE = "https://metacpan.org/dist/DBI"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=65f65488c774efe1da488e36ad6c4a36"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1a1138dff61f77bbc3d8782caba6758d"
 
 SRC_URI = "${CPAN_MIRROR}/authors/id/H/HM/HMBRAND/DBI-${PV}.tgz"
-SRC_URI[sha256sum] = "0df16af8e5b3225a68b7b592ab531004ddb35a9682b50300ce50174ad867d9aa"
+SRC_URI[sha256sum] = "ef266aad6010ce2eabb7e465ebd73ca3020bc58150f6989bd89c2b8f9bac6a86"
 
 S = "${UNPACKDIR}/DBI-${PV}"
 
diff --git a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.31.bb
index 1464a84d34..b5b52148c4 100644
--- a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb
+++ b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.31.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=12;md5=b2562f94907eeb42
 
 SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz"
 
-SRC_URI[sha256sum] = "b15309fc85623893289cb9b2b88dfa9ed1e69156b75f29938553a45be6d730af"
+SRC_URI[sha256sum] = "d597af221628571cbecf35b44520148c44798dfc8a9867774e60453f79d25ff7"
 
 S = "${UNPACKDIR}/IO-Tty-${PV}"
 
diff --git a/meta-oe/recipes-devtools/php/php_8.5.4.bb b/meta-oe/recipes-devtools/php/php_8.5.7.bb
index efa778b6d8..4fd517f789 100644
--- a/meta-oe/recipes-devtools/php/php_8.5.4.bb
+++ b/meta-oe/recipes-devtools/php/php_8.5.7.bb
@@ -2,7 +2,7 @@ SUMMARY = "A server-side, HTML-embedded scripting language"
 HOMEPAGE = "https://www.php.net"
 SECTION = "console/network"
 
-LICENSE = "PHP-3.0"
+LICENSE = "PHP-3.01"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fd469cce1a919f0cc95bab7afb28d19d"
 
 BBCLASSEXTEND = "native"
@@ -32,7 +32,7 @@ UPSTREAM_CHECK_REGEX = "releases/tag/php-(?P<pver>\d+(\.\d+)+)"
 
 S = "${UNPACKDIR}/php-${PV}"
 
-SRC_URI[sha256sum] = "2ac929a29a6b7ef4b8acec981a417b91bdf7f548f597df665cc56ab9ea95fc75"
+SRC_URI[sha256sum] = "4ef9355f784d4b320151eb3f31c5941c0da297025eedb97f2838b2ce73dd59bf"
 
 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."
diff --git a/meta-oe/recipes-devtools/poke/poke_4.2.bb b/meta-oe/recipes-devtools/poke/poke_4.3.bb
index 0ae392947e..85b3c9b08d 100644
--- a/meta-oe/recipes-devtools/poke/poke_4.2.bb
+++ b/meta-oe/recipes-devtools/poke/poke_4.3.bb
@@ -11,7 +11,7 @@ SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \
 
 DEPENDS = "flex-native bison-native bdwgc readline"
 
-SRC_URI[sha256sum] = "8aaf36e61e367a53140ea40e2559e9ec512e779c42bee34e7ac24b34ba119bde"
+SRC_URI[sha256sum] = "a84cb9175d50d45a411f2481fd0662b83cb32ce517316b889cfb570819579373"
 
 inherit autotools gettext pkgconfig
 
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch
deleted file mode 100644
index 1aae1f17b0..0000000000
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch
+++ /dev/null
@@ -1,1446 +0,0 @@
-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.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.2.bb
index 30c9e19b16..7fe514fe07 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.2.bb
@@ -13,11 +13,10 @@ 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 \
-           file://protobuf-30.patch \
 "
 SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch"
 
-SRCREV = "185beed28e65494be7505b30c1afeaf199e19b23"
+SRCREV = "4719fdd7760624388c2c5b9d6759eb6a47490626"
 
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_6.33.5.bb b/meta-oe/recipes-devtools/protobuf/protobuf_6.33.6.bb
index 66c9c24473..880dd82b1d 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_6.33.5.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_6.33.6.bb
@@ -16,7 +16,7 @@ PROTOC_BRANCH = "${@d.getVar('PV').split('.', 2)[1]}.x"
 DEPENDS = "zlib abseil-cpp jsoncpp"
 DEPENDS:append:class-target = " protobuf-native"
 
-SRCREV = "b6f9284da830b69be787732ffdaa35049d20a088"
+SRCREV = "6e1998413a5bca7c058b85999667893f167434bc"
 
 SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=${PROTOC_BRANCH};protocol=https;tag=${PROTOC_VERSION} \
            file://run-ptest \
@@ -29,6 +29,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d\.\d+\.\d+)"
 CVE_PRODUCT = "google:protobuf protobuf:protobuf google-protobuf protobuf-cpp"
 
 CVE_STATUS[CVE-2026-0994] = "cpe-incorrect: the vulnerability affects only python3-protobuf recipe"
+CVE_STATUS[CVE-2026-6409] = "cpe-incorrect: the vulnerability affects only the php library"
 
 inherit cmake pkgconfig ptest
 
@@ -53,6 +54,9 @@ LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', ''
 CXXFLAGS:append:mipsarcho32 = " -latomic"
 CXXFLAGS:append:riscv32 = " -latomic"
 
+# The ptests are not buildable now that pkgconf is being used, disable until fixed.
+PTEST_ENABLED = "0"
+
 do_compile_ptest() {
         mkdir -p "${B}/${TEST_SRC_DIR}"
 
diff --git a/meta-oe/recipes-devtools/sip/sip_6.15.1.bb b/meta-oe/recipes-devtools/sip/sip_6.15.3.bb
index b00d5d5e7a..5d6d8c78a6 100644
--- a/meta-oe/recipes-devtools/sip/sip_6.15.1.bb
+++ b/meta-oe/recipes-devtools/sip/sip_6.15.3.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=236276327275fdb261636fb40b18d88d"
 inherit pypi python_setuptools_build_meta python3native
 
 PYPI_PACKAGE = "sip"
-SRC_URI[sha256sum] = "dc2e58c1798a74e1b31c28e837339822fe8fa55288ae30e8986eb28100ebca5a"
+SRC_URI[sha256sum] = "bb2516983f9f716d321e5157c00d0de0c12422eba73b8f43a44610a0f6622438"
 
 DEPENDS += "python3-setuptools-scm-native"
 
diff --git a/meta-oe/recipes-devtools/spdm-utils/spdm-utils-crates.inc b/meta-oe/recipes-devtools/spdm-utils/spdm-utils-crates.inc
index 7a2aae9be7..0c3582d53d 100644
--- a/meta-oe/recipes-devtools/spdm-utils/spdm-utils-crates.inc
+++ b/meta-oe/recipes-devtools/spdm-utils/spdm-utils-crates.inc
@@ -2,557 +2,393 @@
 
 # from Cargo.lock
 SRC_URI += " \
-    crate://crates.io/aho-corasick/1.1.3 \
-    crate://crates.io/anstream/0.6.18 \
-    crate://crates.io/anstyle/1.0.10 \
-    crate://crates.io/anstyle-parse/0.2.6 \
-    crate://crates.io/anstyle-query/1.1.2 \
-    crate://crates.io/anstyle-wincon/3.0.7 \
+    crate://crates.io/aho-corasick/1.1.4 \
+    crate://crates.io/anstream/0.6.21 \
+    crate://crates.io/anstyle/1.0.13 \
+    crate://crates.io/anstyle-parse/0.2.7 \
+    crate://crates.io/anstyle-query/1.1.5 \
+    crate://crates.io/anstyle-wincon/3.0.11 \
     crate://crates.io/asn1-rs/0.5.2 \
     crate://crates.io/asn1-rs/0.6.2 \
     crate://crates.io/asn1-rs-derive/0.4.0 \
     crate://crates.io/asn1-rs-derive/0.5.1 \
     crate://crates.io/asn1-rs-impl/0.1.0 \
     crate://crates.io/asn1-rs-impl/0.2.0 \
-    crate://crates.io/async-attributes/1.1.2 \
-    crate://crates.io/async-channel/1.9.0 \
-    crate://crates.io/async-channel/2.3.1 \
-    crate://crates.io/async-executor/1.13.1 \
-    crate://crates.io/async-global-executor/2.4.1 \
-    crate://crates.io/async-io/2.4.0 \
-    crate://crates.io/async-lock/3.4.0 \
-    crate://crates.io/async-std/1.13.0 \
-    crate://crates.io/async-task/4.7.1 \
-    crate://crates.io/atomic-waker/1.1.2 \
-    crate://crates.io/autocfg/1.4.0 \
-    crate://crates.io/bindgen/0.71.1 \
+    crate://crates.io/autocfg/1.5.0 \
+    crate://crates.io/bindgen/0.72.1 \
     crate://crates.io/bitfield/0.14.0 \
     crate://crates.io/bitflags/1.3.2 \
-    crate://crates.io/bitflags/2.8.0 \
+    crate://crates.io/bitflags/2.10.0 \
     crate://crates.io/block-buffer/0.10.4 \
-    crate://crates.io/blocking/1.6.1 \
-    crate://crates.io/bumpalo/3.16.0 \
+    crate://crates.io/byteorder/1.5.0 \
+    crate://crates.io/bytes/1.11.1 \
     crate://crates.io/cexpr/0.6.0 \
-    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/cfg-if/1.0.4 \
     crate://crates.io/cfg_aliases/0.2.1 \
     crate://crates.io/clang-sys/1.8.1 \
-    crate://crates.io/clap/4.5.27 \
-    crate://crates.io/clap_builder/4.5.27 \
-    crate://crates.io/clap_derive/4.5.24 \
-    crate://crates.io/clap_lex/0.7.4 \
-    crate://crates.io/colorchoice/1.0.3 \
+    crate://crates.io/clap/4.5.57 \
+    crate://crates.io/clap_builder/4.5.57 \
+    crate://crates.io/clap_derive/4.5.55 \
+    crate://crates.io/clap_lex/0.7.7 \
+    crate://crates.io/colorchoice/1.0.4 \
     crate://crates.io/colored/2.2.0 \
-    crate://crates.io/concurrent-queue/2.5.0 \
     crate://crates.io/core-foundation/0.10.0 \
     crate://crates.io/core-foundation-sys/0.8.7 \
     crate://crates.io/cpufeatures/0.2.17 \
-    crate://crates.io/crossbeam-utils/0.8.21 \
-    crate://crates.io/crunchy/0.2.3 \
-    crate://crates.io/crypto-common/0.1.6 \
-    crate://crates.io/data-encoding/2.7.0 \
+    crate://crates.io/crossterm/0.25.0 \
+    crate://crates.io/crossterm_winapi/0.9.1 \
+    crate://crates.io/crunchy/0.2.4 \
+    crate://crates.io/crypto-common/0.1.7 \
+    crate://crates.io/data-encoding/2.10.0 \
     crate://crates.io/der-parser/8.2.0 \
-    crate://crates.io/deranged/0.3.11 \
+    crate://crates.io/deranged/0.5.5 \
     crate://crates.io/digest/0.10.7 \
     crate://crates.io/displaydoc/0.2.5 \
-    crate://crates.io/either/1.13.0 \
+    crate://crates.io/dyn-clone/1.0.20 \
+    crate://crates.io/either/1.15.0 \
     crate://crates.io/embedded-crc-macros/1.0.0 \
     crate://crates.io/env_logger/0.10.2 \
-    crate://crates.io/errno/0.3.10 \
-    crate://crates.io/event-listener/2.5.3 \
-    crate://crates.io/event-listener/5.4.0 \
-    crate://crates.io/event-listener-strategy/0.5.3 \
-    crate://crates.io/fastrand/2.3.0 \
+    crate://crates.io/errno/0.3.14 \
     crate://crates.io/futures/0.3.31 \
     crate://crates.io/futures-channel/0.3.31 \
     crate://crates.io/futures-core/0.3.31 \
     crate://crates.io/futures-executor/0.3.31 \
     crate://crates.io/futures-io/0.3.31 \
-    crate://crates.io/futures-lite/2.6.0 \
     crate://crates.io/futures-macro/0.3.31 \
     crate://crates.io/futures-sink/0.3.31 \
     crate://crates.io/futures-task/0.3.31 \
     crate://crates.io/futures-util/0.3.31 \
+    crate://crates.io/fuzzy-matcher/0.3.7 \
+    crate://crates.io/fxhash/0.2.1 \
     crate://crates.io/generic-array/0.14.7 \
-    crate://crates.io/glob/0.3.2 \
-    crate://crates.io/gloo-timers/0.3.0 \
-    crate://crates.io/half/2.4.1 \
+    crate://crates.io/glob/0.3.3 \
+    crate://crates.io/half/2.7.1 \
     crate://crates.io/heck/0.5.0 \
-    crate://crates.io/hermit-abi/0.4.0 \
-    crate://crates.io/home/0.5.11 \
-    crate://crates.io/humantime/2.1.0 \
+    crate://crates.io/hermit-abi/0.5.2 \
+    crate://crates.io/home/0.5.12 \
+    crate://crates.io/humantime/2.3.0 \
+    crate://crates.io/inquire/0.7.5 \
     crate://crates.io/io-kit-sys/0.4.1 \
-    crate://crates.io/is-terminal/0.4.15 \
-    crate://crates.io/is_terminal_polyfill/1.70.1 \
+    crate://crates.io/is-terminal/0.4.17 \
+    crate://crates.io/is_terminal_polyfill/1.70.2 \
     crate://crates.io/itertools/0.13.0 \
-    crate://crates.io/itoa/1.0.14 \
-    crate://crates.io/js-sys/0.3.77 \
-    crate://crates.io/kv-log-macro/1.0.7 \
+    crate://crates.io/itoa/1.0.17 \
     crate://crates.io/lazy_static/1.5.0 \
-    crate://crates.io/libc/0.2.169 \
-    crate://crates.io/libloading/0.8.6 \
+    crate://crates.io/libc/0.2.180 \
+    crate://crates.io/libloading/0.8.9 \
     crate://crates.io/libmctp/0.2.0 \
     crate://crates.io/libudev/0.3.0 \
     crate://crates.io/libudev-sys/0.1.4 \
     crate://crates.io/linux-raw-sys/0.4.15 \
-    crate://crates.io/log/0.4.25 \
-    crate://crates.io/mach2/0.4.2 \
-    crate://crates.io/memchr/2.7.4 \
+    crate://crates.io/lock_api/0.4.14 \
+    crate://crates.io/log/0.4.29 \
+    crate://crates.io/mach2/0.4.3 \
+    crate://crates.io/memchr/2.7.6 \
     crate://crates.io/memmap2/0.5.10 \
     crate://crates.io/minicbor/0.25.1 \
     crate://crates.io/minicbor-derive/0.15.3 \
     crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/mio/0.8.11 \
+    crate://crates.io/mio/1.1.1 \
+    crate://crates.io/newline-converter/0.3.0 \
     crate://crates.io/nix/0.26.4 \
     crate://crates.io/nix/0.29.0 \
     crate://crates.io/nom/7.1.3 \
     crate://crates.io/num-bigint/0.4.6 \
-    crate://crates.io/num-conv/0.1.0 \
+    crate://crates.io/num-conv/0.2.0 \
     crate://crates.io/num-integer/0.1.46 \
     crate://crates.io/num-traits/0.2.19 \
     crate://crates.io/oid-registry/0.6.1 \
-    crate://crates.io/once_cell/1.20.2 \
-    crate://crates.io/parking/2.2.1 \
+    crate://crates.io/once_cell/1.21.3 \
+    crate://crates.io/once_cell_polyfill/1.70.2 \
+    crate://crates.io/parking_lot/0.12.5 \
+    crate://crates.io/parking_lot_core/0.9.12 \
     crate://crates.io/pin-project-lite/0.2.16 \
     crate://crates.io/pin-utils/0.1.0 \
-    crate://crates.io/piper/0.2.4 \
-    crate://crates.io/pkg-config/0.3.31 \
-    crate://crates.io/polling/3.7.4 \
+    crate://crates.io/pkg-config/0.3.32 \
     crate://crates.io/powerfmt/0.2.0 \
-    crate://crates.io/prettyplease/0.2.29 \
-    crate://crates.io/proc-macro2/1.0.93 \
-    crate://crates.io/quote/1.0.38 \
-    crate://crates.io/regex/1.11.1 \
-    crate://crates.io/regex-automata/0.4.9 \
-    crate://crates.io/regex-syntax/0.8.5 \
-    crate://crates.io/rustc-hash/2.1.0 \
+    crate://crates.io/prettyplease/0.2.37 \
+    crate://crates.io/proc-macro2/1.0.106 \
+    crate://crates.io/quote/1.0.40 \
+    crate://crates.io/redox_syscall/0.5.18 \
+    crate://crates.io/regex/1.12.3 \
+    crate://crates.io/regex-automata/0.4.14 \
+    crate://crates.io/regex-syntax/0.8.9 \
+    crate://crates.io/rustc-hash/2.1.1 \
     crate://crates.io/rusticata-macros/4.1.0 \
     crate://crates.io/rustix/0.38.44 \
-    crate://crates.io/rustversion/1.0.19 \
     crate://crates.io/scopeguard/1.2.0 \
-    crate://crates.io/serde/1.0.217 \
-    crate://crates.io/serde_derive/1.0.217 \
-    crate://crates.io/serialport/4.7.0 \
-    crate://crates.io/sha2/0.10.8 \
+    crate://crates.io/serde_core/1.0.228 \
+    crate://crates.io/serde_derive/1.0.228 \
+    crate://crates.io/serialport/4.8.1 \
+    crate://crates.io/sha2/0.10.9 \
     crate://crates.io/shlex/1.3.0 \
-    crate://crates.io/slab/0.4.9 \
+    crate://crates.io/signal-hook/0.3.18 \
+    crate://crates.io/signal-hook-mio/0.2.5 \
+    crate://crates.io/signal-hook-registry/1.4.8 \
+    crate://crates.io/slab/0.4.12 \
+    crate://crates.io/smallvec/1.15.1 \
     crate://crates.io/smbus-pec/1.0.1 \
+    crate://crates.io/socket2/0.6.2 \
     crate://crates.io/strsim/0.11.1 \
     crate://crates.io/syn/1.0.109 \
-    crate://crates.io/syn/2.0.96 \
+    crate://crates.io/syn/2.0.114 \
     crate://crates.io/synstructure/0.12.6 \
-    crate://crates.io/synstructure/0.13.1 \
+    crate://crates.io/synstructure/0.13.2 \
     crate://crates.io/termcolor/1.4.1 \
     crate://crates.io/thiserror/1.0.69 \
+    crate://crates.io/thiserror/2.0.18 \
     crate://crates.io/thiserror-impl/1.0.69 \
-    crate://crates.io/time/0.3.37 \
-    crate://crates.io/time-core/0.1.2 \
-    crate://crates.io/time-macros/0.2.19 \
-    crate://crates.io/tracing/0.1.41 \
-    crate://crates.io/tracing-core/0.1.33 \
-    crate://crates.io/typenum/1.17.0 \
-    crate://crates.io/unescaper/0.1.5 \
-    crate://crates.io/unicode-ident/1.0.15 \
+    crate://crates.io/thiserror-impl/2.0.18 \
+    crate://crates.io/thread_local/1.1.9 \
+    crate://crates.io/time/0.3.47 \
+    crate://crates.io/time-core/0.1.8 \
+    crate://crates.io/time-macros/0.2.27 \
+    crate://crates.io/tokio/1.49.0 \
+    crate://crates.io/tokio-macros/2.6.0 \
+    crate://crates.io/typenum/1.19.0 \
+    crate://crates.io/unescaper/0.1.8 \
+    crate://crates.io/unicode-ident/1.0.22 \
+    crate://crates.io/unicode-segmentation/1.12.0 \
+    crate://crates.io/unicode-width/0.1.14 \
     crate://crates.io/unicode-xid/0.2.6 \
     crate://crates.io/utf8parse/0.2.2 \
-    crate://crates.io/value-bag/1.10.0 \
     crate://crates.io/version_check/0.9.5 \
-    crate://crates.io/wasm-bindgen/0.2.100 \
-    crate://crates.io/wasm-bindgen-backend/0.2.100 \
-    crate://crates.io/wasm-bindgen-futures/0.4.50 \
-    crate://crates.io/wasm-bindgen-macro/0.2.100 \
-    crate://crates.io/wasm-bindgen-macro-support/0.2.100 \
-    crate://crates.io/wasm-bindgen-shared/0.2.100 \
-    crate://crates.io/web-sys/0.3.77 \
+    crate://crates.io/wasi/0.11.1+wasi-snapshot-preview1 \
     crate://crates.io/which/6.0.3 \
     crate://crates.io/winapi/0.3.9 \
     crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-    crate://crates.io/winapi-util/0.1.9 \
+    crate://crates.io/winapi-util/0.1.11 \
     crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/windows-link/0.2.1 \
+    crate://crates.io/windows-sys/0.48.0 \
+    crate://crates.io/windows-sys/0.52.0 \
     crate://crates.io/windows-sys/0.59.0 \
+    crate://crates.io/windows-sys/0.60.2 \
+    crate://crates.io/windows-sys/0.61.2 \
+    crate://crates.io/windows-targets/0.48.5 \
     crate://crates.io/windows-targets/0.52.6 \
+    crate://crates.io/windows-targets/0.53.5 \
+    crate://crates.io/windows_aarch64_gnullvm/0.48.5 \
     crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
+    crate://crates.io/windows_aarch64_gnullvm/0.53.1 \
+    crate://crates.io/windows_aarch64_msvc/0.48.5 \
     crate://crates.io/windows_aarch64_msvc/0.52.6 \
+    crate://crates.io/windows_aarch64_msvc/0.53.1 \
+    crate://crates.io/windows_i686_gnu/0.48.5 \
     crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnu/0.53.1 \
     crate://crates.io/windows_i686_gnullvm/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.53.1 \
+    crate://crates.io/windows_i686_msvc/0.48.5 \
     crate://crates.io/windows_i686_msvc/0.52.6 \
+    crate://crates.io/windows_i686_msvc/0.53.1 \
+    crate://crates.io/windows_x86_64_gnu/0.48.5 \
     crate://crates.io/windows_x86_64_gnu/0.52.6 \
+    crate://crates.io/windows_x86_64_gnu/0.53.1 \
+    crate://crates.io/windows_x86_64_gnullvm/0.48.5 \
     crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
+    crate://crates.io/windows_x86_64_gnullvm/0.53.1 \
+    crate://crates.io/windows_x86_64_msvc/0.48.5 \
     crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/windows_x86_64_msvc/0.53.1 \
     crate://crates.io/winsafe/0.0.19 \
     crate://crates.io/x509-parser/0.15.1 \
+    crate://crates.io/zerocopy/0.8.38 \
+    crate://crates.io/zerocopy-derive/0.8.38 \
 "
 
-SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-SRC_URI[anstream-0.6.18.sha256sum] = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
-SRC_URI[anstyle-1.0.10.sha256sum] = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
-SRC_URI[anstyle-parse-0.2.6.sha256sum] = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
-SRC_URI[anstyle-query-1.1.2.sha256sum] = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
-SRC_URI[anstyle-wincon-3.0.7.sha256sum] = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+SRC_URI[aho-corasick-1.1.4.sha256sum] = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+SRC_URI[anstream-0.6.21.sha256sum] = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+SRC_URI[anstyle-1.0.13.sha256sum] = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+SRC_URI[anstyle-parse-0.2.7.sha256sum] = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+SRC_URI[anstyle-query-1.1.5.sha256sum] = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+SRC_URI[anstyle-wincon-3.0.11.sha256sum] = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 SRC_URI[asn1-rs-0.5.2.sha256sum] = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
 SRC_URI[asn1-rs-0.6.2.sha256sum] = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
 SRC_URI[asn1-rs-derive-0.4.0.sha256sum] = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
 SRC_URI[asn1-rs-derive-0.5.1.sha256sum] = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 SRC_URI[asn1-rs-impl-0.1.0.sha256sum] = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
 SRC_URI[asn1-rs-impl-0.2.0.sha256sum] = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
-SRC_URI[async-attributes-1.1.2.sha256sum] = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
-SRC_URI[async-channel-1.9.0.sha256sum] = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-SRC_URI[async-channel-2.3.1.sha256sum] = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-SRC_URI[async-executor-1.13.1.sha256sum] = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
-SRC_URI[async-global-executor-2.4.1.sha256sum] = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
-SRC_URI[async-io-2.4.0.sha256sum] = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
-SRC_URI[async-lock-3.4.0.sha256sum] = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
-SRC_URI[async-std-1.13.0.sha256sum] = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
-SRC_URI[async-task-4.7.1.sha256sum] = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
-SRC_URI[atomic-waker-1.1.2.sha256sum] = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-SRC_URI[autocfg-1.4.0.sha256sum] = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-SRC_URI[bindgen-0.71.1.sha256sum] = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
+SRC_URI[autocfg-1.5.0.sha256sum] = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+SRC_URI[bindgen-0.72.1.sha256sum] = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 SRC_URI[bitfield-0.14.0.sha256sum] = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
 SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-SRC_URI[bitflags-2.8.0.sha256sum] = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+SRC_URI[bitflags-2.10.0.sha256sum] = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-SRC_URI[blocking-1.6.1.sha256sum] = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
-SRC_URI[bumpalo-3.16.0.sha256sum] = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+SRC_URI[bytes-1.11.1.sha256sum] = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-SRC_URI[clap-4.5.27.sha256sum] = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796"
-SRC_URI[clap_builder-4.5.27.sha256sum] = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7"
-SRC_URI[clap_derive-4.5.24.sha256sum] = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
-SRC_URI[clap_lex-0.7.4.sha256sum] = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
-SRC_URI[colorchoice-1.0.3.sha256sum] = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+SRC_URI[clap-4.5.57.sha256sum] = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a"
+SRC_URI[clap_builder-4.5.57.sha256sum] = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238"
+SRC_URI[clap_derive-4.5.55.sha256sum] = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
+SRC_URI[clap_lex-0.7.7.sha256sum] = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
+SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 SRC_URI[colored-2.2.0.sha256sum] = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
-SRC_URI[concurrent-queue-2.5.0.sha256sum] = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 SRC_URI[core-foundation-0.10.0.sha256sum] = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
 SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
-SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-SRC_URI[crunchy-0.2.3.sha256sum] = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
-SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-SRC_URI[data-encoding-2.7.0.sha256sum] = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
+SRC_URI[crossterm-0.25.0.sha256sum] = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
+SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+SRC_URI[crypto-common-0.1.7.sha256sum] = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+SRC_URI[data-encoding-2.10.0.sha256sum] = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 SRC_URI[der-parser-8.2.0.sha256sum] = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
-SRC_URI[deranged-0.3.11.sha256sum] = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+SRC_URI[deranged-0.5.5.sha256sum] = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-SRC_URI[either-1.13.0.sha256sum] = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+SRC_URI[dyn-clone-1.0.20.sha256sum] = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 SRC_URI[embedded-crc-macros-1.0.0.sha256sum] = "4f1c75747a43b086df1a87fb2a889590bc0725e0abf54bba6d0c4bf7bd9e762c"
 SRC_URI[env_logger-0.10.2.sha256sum] = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-SRC_URI[errno-0.3.10.sha256sum] = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
-SRC_URI[event-listener-2.5.3.sha256sum] = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-SRC_URI[event-listener-5.4.0.sha256sum] = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
-SRC_URI[event-listener-strategy-0.5.3.sha256sum] = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
-SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+SRC_URI[errno-0.3.14.sha256sum] = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 SRC_URI[futures-0.3.31.sha256sum] = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 SRC_URI[futures-channel-0.3.31.sha256sum] = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 SRC_URI[futures-core-0.3.31.sha256sum] = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 SRC_URI[futures-executor-0.3.31.sha256sum] = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 SRC_URI[futures-io-0.3.31.sha256sum] = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-SRC_URI[futures-lite-2.6.0.sha256sum] = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
 SRC_URI[futures-macro-0.3.31.sha256sum] = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 SRC_URI[futures-sink-0.3.31.sha256sum] = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 SRC_URI[futures-task-0.3.31.sha256sum] = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 SRC_URI[futures-util-0.3.31.sha256sum] = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+SRC_URI[fuzzy-matcher-0.3.7.sha256sum] = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
+SRC_URI[fxhash-0.2.1.sha256sum] = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
 SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-SRC_URI[glob-0.3.2.sha256sum] = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
-SRC_URI[gloo-timers-0.3.0.sha256sum] = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
-SRC_URI[half-2.4.1.sha256sum] = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+SRC_URI[glob-0.3.3.sha256sum] = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+SRC_URI[half-2.7.1.sha256sum] = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-SRC_URI[hermit-abi-0.4.0.sha256sum] = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-SRC_URI[home-0.5.11.sha256sum] = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
-SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+SRC_URI[hermit-abi-0.5.2.sha256sum] = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+SRC_URI[home-0.5.12.sha256sum] = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
+SRC_URI[humantime-2.3.0.sha256sum] = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
+SRC_URI[inquire-0.7.5.sha256sum] = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a"
 SRC_URI[io-kit-sys-0.4.1.sha256sum] = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b"
-SRC_URI[is-terminal-0.4.15.sha256sum] = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37"
-SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+SRC_URI[is-terminal-0.4.17.sha256sum] = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
+SRC_URI[is_terminal_polyfill-1.70.2.sha256sum] = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-SRC_URI[itoa-1.0.14.sha256sum] = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
-SRC_URI[js-sys-0.3.77.sha256sum] = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
-SRC_URI[kv-log-macro-1.0.7.sha256sum] = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+SRC_URI[itoa-1.0.17.sha256sum] = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-SRC_URI[libc-0.2.169.sha256sum] = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
-SRC_URI[libloading-0.8.6.sha256sum] = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+SRC_URI[libc-0.2.180.sha256sum] = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
+SRC_URI[libloading-0.8.9.sha256sum] = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 SRC_URI[libmctp-0.2.0.sha256sum] = "0d077261b65cfe16a3d490243354fbaec3f22e5bcad546d21394105ab836d1d0"
 SRC_URI[libudev-0.3.0.sha256sum] = "78b324152da65df7bb95acfcaab55e3097ceaab02fb19b228a9eb74d55f135e0"
 SRC_URI[libudev-sys-0.1.4.sha256sum] = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
 SRC_URI[linux-raw-sys-0.4.15.sha256sum] = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-SRC_URI[log-0.4.25.sha256sum] = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
-SRC_URI[mach2-0.4.2.sha256sum] = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+SRC_URI[lock_api-0.4.14.sha256sum] = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+SRC_URI[log-0.4.29.sha256sum] = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+SRC_URI[mach2-0.4.3.sha256sum] = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44"
+SRC_URI[memchr-2.7.6.sha256sum] = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 SRC_URI[memmap2-0.5.10.sha256sum] = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
 SRC_URI[minicbor-0.25.1.sha256sum] = "c0452a60c1863c1f50b5f77cd295e8d2786849f35883f0b9e18e7e6e1b5691b0"
 SRC_URI[minicbor-derive-0.15.3.sha256sum] = "bd2209fff77f705b00c737016a48e73733d7fbccb8b007194db148f03561fb70"
 SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+SRC_URI[mio-0.8.11.sha256sum] = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+SRC_URI[mio-1.1.1.sha256sum] = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+SRC_URI[newline-converter-0.3.0.sha256sum] = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f"
 SRC_URI[nix-0.26.4.sha256sum] = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 SRC_URI[nix-0.29.0.sha256sum] = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
-SRC_URI[num-conv-0.1.0.sha256sum] = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+SRC_URI[num-conv-0.2.0.sha256sum] = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
 SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 SRC_URI[oid-registry-0.6.1.sha256sum] = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
-SRC_URI[once_cell-1.20.2.sha256sum] = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
-SRC_URI[parking-2.2.1.sha256sum] = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+SRC_URI[once_cell_polyfill-1.70.2.sha256sum] = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+SRC_URI[parking_lot-0.12.5.sha256sum] = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+SRC_URI[parking_lot_core-0.9.12.sha256sum] = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 SRC_URI[pin-project-lite-0.2.16.sha256sum] = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-SRC_URI[piper-0.2.4.sha256sum] = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
-SRC_URI[pkg-config-0.3.31.sha256sum] = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
-SRC_URI[polling-3.7.4.sha256sum] = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+SRC_URI[pkg-config-0.3.32.sha256sum] = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-SRC_URI[prettyplease-0.2.29.sha256sum] = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"
-SRC_URI[proc-macro2-1.0.93.sha256sum] = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
-SRC_URI[quote-1.0.38.sha256sum] = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
-SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
-SRC_URI[regex-automata-0.4.9.sha256sum] = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
-SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-SRC_URI[rustc-hash-2.1.0.sha256sum] = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+SRC_URI[prettyplease-0.2.37.sha256sum] = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+SRC_URI[quote-1.0.40.sha256sum] = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+SRC_URI[redox_syscall-0.5.18.sha256sum] = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+SRC_URI[regex-1.12.3.sha256sum] = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+SRC_URI[regex-automata-0.4.14.sha256sum] = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+SRC_URI[regex-syntax-0.8.9.sha256sum] = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
+SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 SRC_URI[rusticata-macros-4.1.0.sha256sum] = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
 SRC_URI[rustix-0.38.44.sha256sum] = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-SRC_URI[rustversion-1.0.19.sha256sum] = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-SRC_URI[serde-1.0.217.sha256sum] = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
-SRC_URI[serde_derive-1.0.217.sha256sum] = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
-SRC_URI[serialport-4.7.0.sha256sum] = "5ecfc4858c2266c7695d8b8460bbd612fa81bd2e250f5f0dd16195e4b4f8b3d8"
-SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+SRC_URI[serialport-4.8.1.sha256sum] = "21f60a586160667241d7702c420fc223939fb3c0bb8d3fac84f78768e8970dee"
+SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-SRC_URI[slab-0.4.9.sha256sum] = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+SRC_URI[signal-hook-0.3.18.sha256sum] = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
+SRC_URI[signal-hook-mio-0.2.5.sha256sum] = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
+SRC_URI[signal-hook-registry-1.4.8.sha256sum] = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
+SRC_URI[slab-0.4.12.sha256sum] = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 SRC_URI[smbus-pec-1.0.1.sha256sum] = "ca0763a680cd5d72b28f7bfc8a054c117d8841380a6ad4f72f05bd2a34217d3e"
+SRC_URI[socket2-0.6.2.sha256sum] = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
 SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-SRC_URI[syn-2.0.96.sha256sum] = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 SRC_URI[synstructure-0.12.6.sha256sum] = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-SRC_URI[synstructure-0.13.1.sha256sum] = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+SRC_URI[synstructure-0.13.2.sha256sum] = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 SRC_URI[termcolor-1.4.1.sha256sum] = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 SRC_URI[thiserror-1.0.69.sha256sum] = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+SRC_URI[thiserror-2.0.18.sha256sum] = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 SRC_URI[thiserror-impl-1.0.69.sha256sum] = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-SRC_URI[time-0.3.37.sha256sum] = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
-SRC_URI[time-core-0.1.2.sha256sum] = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-SRC_URI[time-macros-0.2.19.sha256sum] = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
-SRC_URI[tracing-0.1.41.sha256sum] = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
-SRC_URI[tracing-core-0.1.33.sha256sum] = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
-SRC_URI[typenum-1.17.0.sha256sum] = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-SRC_URI[unescaper-0.1.5.sha256sum] = "c878a167baa8afd137494101a688ef8c67125089ff2249284bd2b5f9bfedb815"
-SRC_URI[unicode-ident-1.0.15.sha256sum] = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243"
+SRC_URI[thiserror-impl-2.0.18.sha256sum] = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+SRC_URI[thread_local-1.1.9.sha256sum] = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+SRC_URI[time-0.3.47.sha256sum] = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
+SRC_URI[time-core-0.1.8.sha256sum] = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+SRC_URI[time-macros-0.2.27.sha256sum] = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
+SRC_URI[tokio-1.49.0.sha256sum] = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
+SRC_URI[tokio-macros-2.6.0.sha256sum] = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+SRC_URI[typenum-1.19.0.sha256sum] = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+SRC_URI[unescaper-0.1.8.sha256sum] = "4064ed685c487dbc25bd3f0e9548f2e34bab9d18cefc700f9ec2dba74ba1138e"
+SRC_URI[unicode-ident-1.0.22.sha256sum] = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+SRC_URI[unicode-segmentation-1.12.0.sha256sum] = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+SRC_URI[unicode-width-0.1.14.sha256sum] = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 SRC_URI[unicode-xid-0.2.6.sha256sum] = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-SRC_URI[value-bag-1.10.0.sha256sum] = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
 SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-SRC_URI[wasm-bindgen-0.2.100.sha256sum] = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
-SRC_URI[wasm-bindgen-backend-0.2.100.sha256sum] = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-SRC_URI[wasm-bindgen-futures-0.4.50.sha256sum] = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
-SRC_URI[wasm-bindgen-macro-0.2.100.sha256sum] = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
-SRC_URI[wasm-bindgen-macro-support-0.2.100.sha256sum] = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
-SRC_URI[wasm-bindgen-shared-0.2.100.sha256sum] = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-SRC_URI[web-sys-0.3.77.sha256sum] = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+SRC_URI[wasi-0.11.1+wasi-snapshot-preview1.sha256sum] = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 SRC_URI[which-6.0.3.sha256sum] = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
 SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-SRC_URI[winapi-util-0.1.9.sha256sum] = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+SRC_URI[winapi-util-0.1.11.sha256sum] = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+SRC_URI[windows-link-0.2.1.sha256sum] = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+SRC_URI[windows-sys-0.60.2.sha256sum] = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+SRC_URI[windows-sys-0.61.2.sha256sum] = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+SRC_URI[windows-targets-0.53.5.sha256sum] = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+SRC_URI[windows_aarch64_gnullvm-0.53.1.sha256sum] = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+SRC_URI[windows_aarch64_msvc-0.53.1.sha256sum] = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnu-0.53.1.sha256sum] = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+SRC_URI[windows_i686_gnullvm-0.53.1.sha256sum] = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+SRC_URI[windows_i686_msvc-0.53.1.sha256sum] = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+SRC_URI[windows_x86_64_gnu-0.53.1.sha256sum] = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+SRC_URI[windows_x86_64_gnullvm-0.53.1.sha256sum] = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[windows_x86_64_msvc-0.53.1.sha256sum] = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 SRC_URI[winsafe-0.0.19.sha256sum] = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
 SRC_URI[x509-parser-0.15.1.sha256sum] = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
-# from tock-responder/Cargo.lock
-SRC_URI += " \
-    crate://crates.io/aho-corasick/1.1.3 \
-    crate://crates.io/atty/0.2.14 \
-    crate://crates.io/autocfg/1.4.0 \
-    crate://crates.io/bindgen/0.71.1 \
-    crate://crates.io/bitfield/0.14.0 \
-    crate://crates.io/bitflags/1.3.2 \
-    crate://crates.io/bitflags/2.8.0 \
-    crate://crates.io/byteorder/0.5.3 \
-    crate://crates.io/cexpr/0.6.0 \
-    crate://crates.io/cfg-if/1.0.0 \
-    crate://crates.io/clang-sys/1.8.1 \
-    crate://crates.io/clap/3.2.25 \
-    crate://crates.io/clap_derive/3.2.25 \
-    crate://crates.io/clap_lex/0.2.4 \
-    crate://crates.io/critical-section/1.2.0 \
-    crate://crates.io/either/1.13.0 \
-    crate://crates.io/elf/0.0.10 \
-    crate://crates.io/embedded-alloc/0.5.1 \
-    crate://crates.io/embedded-crc-macros/1.0.0 \
-    crate://crates.io/errno/0.3.10 \
-    crate://crates.io/glob/0.3.2 \
-    crate://crates.io/hashbrown/0.12.3 \
-    crate://crates.io/heck/0.4.1 \
-    crate://crates.io/hermit-abi/0.1.19 \
-    crate://crates.io/home/0.5.11 \
-    crate://crates.io/indexmap/1.9.3 \
-    crate://crates.io/itertools/0.13.0 \
-    crate://crates.io/libc/0.2.169 \
-    crate://crates.io/libloading/0.8.6 \
-    crate://crates.io/libm/0.2.11 \
-    crate://crates.io/libmctp/0.2.0 \
-    crate://crates.io/linked_list_allocator/0.10.5 \
-    crate://crates.io/linux-raw-sys/0.4.15 \
-    crate://crates.io/log/0.4.25 \
-    crate://crates.io/memchr/2.7.4 \
-    crate://crates.io/minimal-lexical/0.2.1 \
-    crate://crates.io/nom/7.1.3 \
-    crate://crates.io/numtoa/0.1.0 \
-    crate://crates.io/once_cell/1.20.2 \
-    crate://crates.io/os_str_bytes/6.6.1 \
-    crate://crates.io/portable-atomic/1.10.0 \
-    crate://crates.io/prettyplease/0.2.29 \
-    crate://crates.io/proc-macro-error/1.0.4 \
-    crate://crates.io/proc-macro-error-attr/1.0.4 \
-    crate://crates.io/proc-macro2/1.0.93 \
-    crate://crates.io/quote/1.0.38 \
-    crate://crates.io/redox_syscall/0.2.16 \
-    crate://crates.io/redox_termios/0.1.3 \
-    crate://crates.io/regex/1.11.1 \
-    crate://crates.io/regex-automata/0.4.9 \
-    crate://crates.io/regex-syntax/0.8.5 \
-    crate://crates.io/rustc-hash/2.1.0 \
-    crate://crates.io/rustix/0.38.44 \
-    crate://crates.io/shlex/1.3.0 \
-    crate://crates.io/smbus-pec/1.0.1 \
-    crate://crates.io/strsim/0.10.0 \
-    crate://crates.io/syn/1.0.109 \
-    crate://crates.io/syn/2.0.96 \
-    crate://crates.io/termcolor/1.4.1 \
-    crate://crates.io/termion/1.5.6 \
-    crate://crates.io/textwrap/0.16.1 \
-    crate://crates.io/unicode-ident/1.0.15 \
-    crate://crates.io/version_check/0.9.5 \
-    crate://crates.io/which/6.0.3 \
-    crate://crates.io/winapi/0.3.9 \
-    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-    crate://crates.io/winapi-util/0.1.9 \
-    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.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/winsafe/0.0.19 \
-"
-
-SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-SRC_URI[autocfg-1.4.0.sha256sum] = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-SRC_URI[bindgen-0.71.1.sha256sum] = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
-SRC_URI[bitfield-0.14.0.sha256sum] = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
-SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-SRC_URI[bitflags-2.8.0.sha256sum] = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
-SRC_URI[byteorder-0.5.3.sha256sum] = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
-SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-SRC_URI[clap-3.2.25.sha256sum] = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
-SRC_URI[clap_derive-3.2.25.sha256sum] = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
-SRC_URI[clap_lex-0.2.4.sha256sum] = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-SRC_URI[critical-section-1.2.0.sha256sum] = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
-SRC_URI[either-1.13.0.sha256sum] = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-SRC_URI[elf-0.0.10.sha256sum] = "4841de15dbe0e49b9b62a417589299e3be0d557e0900d36acb87e6dae47197f5"
-SRC_URI[embedded-alloc-0.5.1.sha256sum] = "ddae17915accbac2cfbc64ea0ae6e3b330e6ea124ba108dada63646fd3c6f815"
-SRC_URI[embedded-crc-macros-1.0.0.sha256sum] = "4f1c75747a43b086df1a87fb2a889590bc0725e0abf54bba6d0c4bf7bd9e762c"
-SRC_URI[errno-0.3.10.sha256sum] = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
-SRC_URI[glob-0.3.2.sha256sum] = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
-SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-SRC_URI[home-0.5.11.sha256sum] = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
-SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-SRC_URI[libc-0.2.169.sha256sum] = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
-SRC_URI[libloading-0.8.6.sha256sum] = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
-SRC_URI[libm-0.2.11.sha256sum] = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
-SRC_URI[libmctp-0.2.0.sha256sum] = "0d077261b65cfe16a3d490243354fbaec3f22e5bcad546d21394105ab836d1d0"
-SRC_URI[linked_list_allocator-0.10.5.sha256sum] = "9afa463f5405ee81cdb9cc2baf37e08ec7e4c8209442b5d72c04cfb2cd6e6286"
-SRC_URI[linux-raw-sys-0.4.15.sha256sum] = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-SRC_URI[log-0.4.25.sha256sum] = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
-SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
-SRC_URI[once_cell-1.20.2.sha256sum] = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
-SRC_URI[os_str_bytes-6.6.1.sha256sum] = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
-SRC_URI[portable-atomic-1.10.0.sha256sum] = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
-SRC_URI[prettyplease-0.2.29.sha256sum] = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"
-SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-SRC_URI[proc-macro2-1.0.93.sha256sum] = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
-SRC_URI[quote-1.0.38.sha256sum] = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
-SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
-SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
-SRC_URI[regex-automata-0.4.9.sha256sum] = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
-SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-SRC_URI[rustc-hash-2.1.0.sha256sum] = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
-SRC_URI[rustix-0.38.44.sha256sum] = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-SRC_URI[smbus-pec-1.0.1.sha256sum] = "ca0763a680cd5d72b28f7bfc8a054c117d8841380a6ad4f72f05bd2a34217d3e"
-SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-SRC_URI[syn-2.0.96.sha256sum] = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
-SRC_URI[termcolor-1.4.1.sha256sum] = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
-SRC_URI[textwrap-0.16.1.sha256sum] = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
-SRC_URI[unicode-ident-1.0.15.sha256sum] = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243"
-SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-SRC_URI[which-6.0.3.sha256sum] = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
-SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-SRC_URI[winapi-util-0.1.9.sha256sum] = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-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[winsafe-0.0.19.sha256sum] = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
-SRC_URI[clap-4.5.26.sha256sum] = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
-SRC_URI[clap_builder-4.5.26.sha256sum] = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
-SRC_URI[cpufeatures-0.2.16.sha256sum] = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
-SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-SRC_URI[is-terminal-0.4.13.sha256sum] = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
-SRC_URI[rustix-0.38.43.sha256sum] = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
-SRC_URI[unicode-ident-1.0.14.sha256sum] = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
-SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-SRC_URI[bindgen-0.63.0.sha256sum] = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
-SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-SRC_URI[critical-section-1.1.2.sha256sum] = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
-SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-SRC_URI[home-0.5.9.sha256sum] = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-SRC_URI[libloading-0.8.5.sha256sum] = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
-SRC_URI[libm-0.2.8.sha256sum] = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-SRC_URI[peeking_take_while-0.1.2.sha256sum] = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-SRC_URI[portable-atomic-1.7.0.sha256sum] = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
-SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
-SRC_URI[regex-automata-0.4.7.sha256sum] = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-SRC_URI[regex-syntax-0.8.4.sha256sum] = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-SRC_URI[rustix-0.38.34.sha256sum] = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-SRC_URI[which-4.4.2.sha256sum] = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-SRC_URI[which-6.0.2.sha256sum] = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075"
-SRC_URI[winapi-util-0.1.8.sha256sum] = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
-SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+SRC_URI[zerocopy-0.8.38.sha256sum] = "57cf3aa6855b23711ee9852dfc97dfaa51c45feaba5b645d0c777414d494a961"
+SRC_URI[zerocopy-derive-0.8.38.sha256sum] = "8a616990af1a287837c4fe6596ad77ef57948f787e46ce28e166facc0cc1cb75"
diff --git a/meta-oe/recipes-devtools/spdm-utils/spdm-utils_0.7.2.bb b/meta-oe/recipes-devtools/spdm-utils/spdm-utils_0.7.2.bb
index 5c5022d9c0..6b7c46ed3a 100644
--- a/meta-oe/recipes-devtools/spdm-utils/spdm-utils_0.7.2.bb
+++ b/meta-oe/recipes-devtools/spdm-utils/spdm-utils_0.7.2.bb
@@ -15,7 +15,9 @@ SRC_URI += "git://github.com/westerndigitalcorporation/spdm-utils.git;protocol=h
 
 include spdm-utils-crates.inc
 
-SRCREV = "f67ac9e00b79f603ecbbd29928a4ecc3dec5abd5"
+SRCREV = "8805327c9ac0d354c6ef891ccdd0527bbecf80e0"
+
+PV .= "+git"
 
 DEPENDS += "libspdm udev clang-native bindgen-cli-native pciutils"
 
diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb
index 102e329878..0a3fbf5b93 100644
--- a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb
+++ b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb
@@ -9,7 +9,7 @@ SECTION =  "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-CVE_PRODUCT = "xerces-c\+\+"
+CVE_PRODUCT = "xerces-c++"
 
 SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2 \
     file://0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch \