67 files changed, 321 insertions, 707 deletions
diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass
index 152bef8ad5..eb8591f624 100644
--- a/meta/classes-global/insane.bbclass
+++ b/meta/classes-global/insane.bbclass
@@ -32,7 +32,7 @@ CHECKLAYER_REQUIRED_TESTS = "\
    invalid-packageconfig la \
    license-checksum license-exception license-exists license-file-missing license-format license-no-generic license-syntax \
    mime mime-xdg missing-update-alternatives multilib obsolete-license \
-    packages-list patch-fuzz patch-status perllocalpod perm-config perm-line perm-link \
+    packages-list patch-fuzz patch-status perllocalpod perm-config perm-line perm-link recipe-naming \
    pkgconfig pkgvarcheck pkgv-undefined pn-overrides shebang-size src-uri-bad symlink-to-sysroot \
    unhandled-features-check unknown-configure-option unlisted-pkg-lics uppercase-pn useless-rpaths \
    var-undefined virtual-slash xorg-driver-abi"
@@ -1438,6 +1438,12 @@ python do_qa_unpack() {
 python do_recipe_qa() {
    import re
+    def test_naming(pn, d):
+        if pn.endswith("-native") and not bb.data.inherits_class("native", d):
+            oe.qa.handle_error("recipe-naming", "Recipe %s appears native but is not, should inherit native" % pn, d)
+        if pn.startswith("nativesdk-") and not bb.data.inherits_class("nativesdk", d):
+            oe.qa.handle_error("recipe-naming", "Recipe %s appears nativesdk but is not, should inherit nativesdk" % pn, d)
    def test_missing_metadata(pn, d):
        fn = d.getVar("FILE")
        srcfile = d.getVar('SRC_URI').split()
@@ -1482,6 +1488,7 @@ python do_recipe_qa() {
                oe.qa.handle_error("invalid-packageconfig", error_msg, d)
    pn = d.getVar('PN')
+    test_naming(pn, d)
    test_missing_metadata(pn, d)
    test_missing_maintainer(pn, d)
    test_srcuri(pn, d)
diff --git a/meta/classes-recipe/cross.bbclass b/meta/classes-recipe/cross.bbclass
index 93de9a5274..9abf166e50 100644
--- a/meta/classes-recipe/cross.bbclass
+++ b/meta/classes-recipe/cross.bbclass
@@ -80,17 +80,17 @@ do_packagedata[stamp-extra-info] = ""
 USE_NLS = "no"
-export CC = "${BUILD_CC}"
+CC = "${BUILD_CC}"
-export CXX = "${BUILD_CXX}"
+CXX = "${BUILD_CXX}"
-export FC = "${BUILD_FC}"
+FC = "${BUILD_FC}"
-export CPP = "${BUILD_CPP}"
+CPP = "${BUILD_CPP}"
-export LD = "${BUILD_LD}"
+LD = "${BUILD_LD}"
-export CCLD = "${BUILD_CCLD}"
+CCLD = "${BUILD_CCLD}"
-export AR = "${BUILD_AR}"
+AR = "${BUILD_AR}"
-export AS = "${BUILD_AS}"
+AS = "${BUILD_AS}"
-export RANLIB = "${BUILD_RANLIB}"
+RANLIB = "${BUILD_RANLIB}"
-export STRIP = "${BUILD_STRIP}"
+STRIP = "${BUILD_STRIP}"
-export NM = "${BUILD_NM}"
+NM = "${BUILD_NM}"
 inherit nopackages
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 52e74a6879..c515a07b6f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -801,7 +801,7 @@ DISTRO_NAME ??= "OpenEmbedded"
 # And finally '<foo>:forcevariable' overrides any standard variable, with the highest priority.
 # This works for functions as well, they are really just variables.
 #
-OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable"
+OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:${TCOVERRIDE}${LIBCOVERRIDE}:forcevariable"
 FILE_LAYERNAME ??= "config"
 LIBCOVERRIDE ?= ""
 CLASSOVERRIDE ?= "class-target"
diff --git a/meta/conf/toolchain/clang.inc b/meta/conf/toolchain/clang.inc
index 2bd4a07a86..8a0a2c315a 100644
--- a/meta/conf/toolchain/clang.inc
+++ b/meta/conf/toolchain/clang.inc
@@ -17,11 +17,11 @@ READELF = "${HOST_PREFIX}llvm-readelf"
 PREFERRED_PROVIDER_virtual/cross-cc = "${MLPREFIX}clang-cross-${TARGET_ARCH}"
 PREFERRED_PROVIDER_virtual/cross-c++ = "${MLPREFIX}clang-cross-${TARGET_ARCH}"
 PREFERRED_PROVIDER_virtual/compilerlibs = "gcc-runtime"
-PREFERRED_PROVIDER_virtual/cross-cc:class-nativesdk = "gcc-crosssdk-${SDK_SYS}"
+PREFERRED_PROVIDER_virtual/cross-cc:class-nativesdk = "clang-crosssdk-${SDK_SYS}"
-PREFERRED_PROVIDER_virtual/cross-c++:class-nativesdk = "gcc-crosssdk-${SDK_SYS}"
+PREFERRED_PROVIDER_virtual/cross-c++:class-nativesdk = "clang-crosssdk-${SDK_SYS}"
-PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}"
+PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "clang-crosssdk-${SDK_SYS}"
-PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}"
+PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "clang-crosssdk-${SDK_SYS}"
 PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime"
 BASE_DEFAULT_DEPS:append:class-target = " compiler-rt"
@@ -30,3 +30,5 @@ TUNE_CCARGS += "${@bb.utils.contains("DISTRO_FEATURES", "usrmerge", " --dyld-pre
 LDFLAGS:append:class-nativesdk:x86-64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-x86-64.so.2"
 LDFLAGS:append:class-nativesdk:aarch64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-aarch64.so.1"
+TCOVERRIDE = "toolchain-clang"
diff --git a/meta/conf/toolchain/gcc.inc b/meta/conf/toolchain/gcc.inc
index 36d33f5d6d..75f9abe999 100644
--- a/meta/conf/toolchain/gcc.inc
+++ b/meta/conf/toolchain/gcc.inc
@@ -24,3 +24,4 @@ PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}"
 PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}"
 PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime"
+TCOVERRIDE = "toolchain-gcc"
diff --git a/meta/lib/oeqa/selftest/cases/liboe.py b/meta/lib/oeqa/selftest/cases/liboe.py
index d5ffffdcb4..930354c931 100644
--- a/meta/lib/oeqa/selftest/cases/liboe.py
+++ b/meta/lib/oeqa/selftest/cases/liboe.py
@@ -9,11 +9,11 @@ from oeqa.utils.commands import get_bb_var, get_bb_vars, bitbake, runCmd
 import oe.path
 import os
-class LibOE(OESelftestTestCase):
+class CopyTreeTests(OESelftestTestCase):
    @classmethod
    def setUpClass(cls):
-        super(LibOE, cls).setUpClass()
+        super().setUpClass()
        cls.tmp_dir = get_bb_var('TMPDIR')
    def test_copy_tree_special(self):
@@ -102,3 +102,36 @@ class LibOE(OESelftestTestCase):
        self.assertEqual(dstcnt, len(testfiles), "Number of files in dst (%s) differs from number of files in src(%s)." % (dstcnt, srccnt))
        oe.path.remove(testloc)
+class SubprocessTests(OESelftestTestCase):
+    def test_subprocess_tweak(self):
+        """
+        Test that the string representation of
+        oeqa.utils.subprocesstweak.OETestCalledProcessError includes stdout and
+        stderr, as expected.
+        """
+        script = """
+#! /bin/sh
+echo Ivn fgqbhg | tr '[a-zA-Z]' '[n-za-mN-ZA-M]'
+echo Ivn fgqree | tr '[a-zA-Z]' '[n-za-mN-ZA-M]' >&2
+exit 42
+        """
+        import subprocess
+        import unittest.mock
+        from oeqa.utils.subprocesstweak import OETestCalledProcessError
+        with self.assertRaises(OETestCalledProcessError) as cm:
+            with unittest.mock.patch("subprocess.CalledProcessError", OETestCalledProcessError):
+                subprocess.run(["bash", "-"], input=script, text=True, capture_output=True, check=True)
+        e = cm.exception
+        self.assertEqual(e.returncode, 42)
+        self.assertEqual("Via stdout\n", e.stdout)
+        self.assertEqual("Via stderr\n", e.stderr)
+        string = str(e)
+        self.assertIn("exit status 42", string)
+        self.assertIn("Standard Output: Via stdout", string)
+        self.assertIn("Standard Error: Via stderr", string)
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
index 6c5648779a..88a61aff63 100644
--- a/meta/lib/oeqa/utils/sshcontrol.py
+++ b/meta/lib/oeqa/utils/sshcontrol.py
@@ -58,7 +58,7 @@ class SSHProcess(object):
                        data = os.read(self.process.stdout.fileno(), 1024)
                        if not data:
                            self.process.poll()
-                            if self.process.returncode is None:
+                            if self.process.returncode is not None:
                                self.process.stdout.close()
                                eof = True
                        else:
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index 6cd9c39430..fd1eab5cdd 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -16,10 +16,6 @@ SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a"
 SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}"
-# workarounds for aarch64 kvm qemu boot regressions
-SRC_URI:append:qemuarm64 = " file://disable-CONFIG_BLOBLIST.cfg file://disable_CONFIG_USB.cfg"
-SRC_URI:append:genericarm64 = " file://disable-CONFIG_BLOBLIST.cfg file://disable_CONFIG_USB.cfg"
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/meta/recipes-bsp/u-boot/u-boot_2025.04.bb b/meta/recipes-bsp/u-boot/u-boot_2025.04.bb
index db8b2d58b4..89e964f627 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2025.04.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2025.04.bb
@@ -2,3 +2,7 @@ require u-boot-common.inc
 require u-boot.inc
 DEPENDS += "bc-native dtc-native gnutls-native python3-pyelftools-native"
+# workarounds for aarch64 kvm qemu boot regressions
+SRC_URI:append:qemuarm64 = " file://disable-CONFIG_BLOBLIST.cfg file://disable_CONFIG_USB.cfg"
+SRC_URI:append:genericarm64 = " file://disable-CONFIG_BLOBLIST.cfg file://disable_CONFIG_USB.cfg"
diff --git a/meta/recipes-connectivity/kea/kea_2.6.1.bb b/meta/recipes-connectivity/kea/kea_2.6.1.bb
index ff7fb51fe0..17e4378746 100644
--- a/meta/recipes-connectivity/kea/kea_2.6.1.bb
+++ b/meta/recipes-connectivity/kea/kea_2.6.1.bb
@@ -69,7 +69,7 @@ do_install:append() {
    sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \
           -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \
           ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl
-    sed -i "s:${B}/../${BPN}-${PV}:@abs_top_builddir_placeholder@:g" ${D}${sbindir}/kea-admin
+    sed -i "s:${B}:@abs_top_builddir_placeholder@:g" ${D}${sbindir}/kea-admin
 }
 do_install:append() {
diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb
index 06ded45934..e07b93d695 100644
--- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
+++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb
@@ -5,11 +5,11 @@ SECTION = "network"
 LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04"
-SRCREV = "55ba955d53305df96123534488fd160ea882b4dd"
-PV = "20240407"
 PE = "1"
 SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main"
+SRCREV = "55ba955d53305df96123534488fd160ea882b4dd"
 S = "${WORKDIR}/git"
 inherit meson
diff --git a/meta/recipes-devtools/binutils/binutils-2.44.inc b/meta/recipes-devtools/binutils/binutils-2.44.inc
index 5838b2ebeb..c3a597cd7b 100644
--- a/meta/recipes-devtools/binutils/binutils-2.44.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.44.inc
@@ -40,5 +40,6 @@ SRC_URI = "\
     file://CVE-2025-1182.patch \
     file://0016-CVE-2025-1181-1.patch \
     file://0017-CVE-2025-1181-2.patch \
+     file://0018-CVE-2025-5245.patch \
 "
 S  = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/0018-CVE-2025-5245.patch b/meta/recipes-devtools/binutils/binutils/0018-CVE-2025-5245.patch
new file mode 100644
index 0000000000..d4b7d55966
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0018-CVE-2025-5245.patch
@@ -0,0 +1,38 @@
+From: Alan Modra <amodra@gmail.com>
+Date: Tue, 1 Apr 2025 22:36:54 +1030
+PR32829, SEGV on objdump function debug_type_samep
+u.kenum is always non-NULL, see debug_make_enum_type.
+Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=6c3458a8b7ee7d39f070c7b2350851cb2110c65a]
+CVE: CVE-2025-5245
+Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
+diff --git a/binutils/debug.c b/binutils/debug.c
+index dcc8ccde..465b18e7 100644
+--- a/binutils/debug.c
+++ b/binutils/debug.c
+@@ -2554,9 +2554,6 @@ debug_write_type (struct debug_handle *info,
+     case DEBUG_KIND_UNION_CLASS:
+       return debug_write_class_type (info, fns, fhandle, type, tag);
+     case DEBUG_KIND_ENUM:
+-      if (type->u.kenum == NULL)
+-       return (*fns->enum_type) (fhandle, tag, (const char **) NULL,
+-                                 (bfd_signed_vma *) NULL);
+       return (*fns->enum_type) (fhandle, tag, type->u.kenum->names,
+                                type->u.kenum->values);
+     case DEBUG_KIND_POINTER:
+@@ -3097,9 +3094,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
+       break;
+ 
+     case DEBUG_KIND_ENUM:
+-      if (t1->u.kenum == NULL)
+-       ret = t2->u.kenum == NULL;
+-      else if (t2->u.kenum == NULL)
+      if (t1->u.kenum->names == NULL)
+       ret = t2->u.kenum->names == NULL;
+      else if (t2->u.kenum->names == NULL)
+        ret = false;
+       else
+        {
diff --git a/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
index f8e7bb13d2..47438014b2 100644
--- a/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
+++ b/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
@@ -36,6 +36,8 @@ BUILD_CXX = "${CCACHE}${HOST_PREFIX}clang++ ${BUILD_CC_ARCH}$"
 CFLAGS += "${COMPILER_RT}"
 CXXFLAGS += "${COMPILER_RT} ${LIBCPLUSPLUS}"
+TOOLCHAIN = "clang"
 DEPENDS += "ninja-native virtual/crypt compiler-rt"
 DEPENDS:append:class-native = " clang-native libxcrypt-native libcxx-native"
 DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-libxcrypt nativesdk-gcc-runtime"
diff --git a/meta/recipes-devtools/clang/compiler-rt_git.bb b/meta/recipes-devtools/clang/compiler-rt_git.bb
index ad145f8644..7b442183ef 100644
--- a/meta/recipes-devtools/clang/compiler-rt_git.bb
+++ b/meta/recipes-devtools/clang/compiler-rt_git.bb
@@ -58,6 +58,8 @@ BUILD_CXX = "${CCACHE}clang++ ${BUILD_CC_ARCH}"
 LDFLAGS += "${COMPILER_RT} ${UNWINDLIB}"
 CXXFLAGS += "${LIBCPLUSPLUS}"
+TOOLCHAIN = "clang"
 def get_compiler_rt_arch(bb, d):
    if bb.utils.contains('TUNE_FEATURES', 'armv5 thumb dsp', True, False, d):
        return 'armv5te'
diff --git a/meta/recipes-devtools/clang/libcxx_git.bb b/meta/recipes-devtools/clang/libcxx_git.bb
index c99617c228..f5bf17f30a 100644
--- a/meta/recipes-devtools/clang/libcxx_git.bb
+++ b/meta/recipes-devtools/clang/libcxx_git.bb
@@ -54,6 +54,8 @@ BUILD_CXX = "${CCACHE}clang++ ${BUILD_CC_ARCH}"
 LDFLAGS += "${COMPILER_RT} ${UNWINDLIB} ${LIBCPLUSPLUS}"
 CXXFLAGS += "${LIBCPLUSPLUS}"
+TOOLCHAIN = "clang"
 OECMAKE_SOURCEPATH = "${S}/llvm"
 EXTRA_OECMAKE += "\
                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
diff --git a/meta/recipes-devtools/gcc/gcc-15.1.inc b/meta/recipes-devtools/gcc/gcc-15.1.inc
index 0032500cdc..18f8cae5ca 100644
--- a/meta/recipes-devtools/gcc/gcc-15.1.inc
+++ b/meta/recipes-devtools/gcc/gcc-15.1.inc
@@ -79,7 +79,7 @@ S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}"
 B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
 # Language Overrides
-FORTRAN = ""
+FORTRAN ?= ""
 SSP ?= "--disable-libssp"
 SSP:mingw32 = "--enable-libssp"
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 5c79936242..e3fb48c030 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -6,7 +6,7 @@ require gcc-shared-source.inc
 # These can be overridden by the version specific .inc file.
 # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
-FORTRAN ?= ",fortran"
+FORTRAN ??= ",fortran"
 LANGUAGES ?= "c,c++${FORTRAN}"
 EXTRA_OECONF_BASE ?= ""
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb
index 0c73032923..c31fc44ce4 100644
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb
@@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
 SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main"
-PV = "2.15.1"
 SRCREV = "e7f179eeeb6eee1403f090fc43a3c80bb08b5bfd"
 S = "${WORKDIR}/git"
-inherit meson gobject-introspection pkgconfig
+inherit meson gobject-introspection pkgconfig manpages
-EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides"
+EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides"
 DEPENDS += "glib-2.0 libyaml glib-2.0-native"
@@ -22,3 +21,6 @@ BBCLASSEXTEND = "native nativesdk"
 GIR_MESON_OPTION = 'skip_introspection'
 GIR_MESON_ENABLE_FLAG = 'false'
 GIR_MESON_DISABLE_FLAG = 'true'
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[manpages] = "-Dwith_manpages=enabled,-Dwith_manpages=disabled"
diff --git a/meta/recipes-devtools/m4/m4-1.4.20.inc b/meta/recipes-devtools/m4/m4-1.4.20.inc
index a31335f173..aad57b8b64 100644
--- a/meta/recipes-devtools/m4/m4-1.4.20.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.20.inc
@@ -27,7 +27,7 @@ EXTRA_OEMAKE += "'infodir=${infodir}'"
 do_compile_ptest() {
        cd ${B}/tests
        sed -i '/^buildtest-TESTS: /c buildtest-TESTS: $(TESTS) $(check_LIBRARIES) $(check_PROGRAMS)' Makefile
-        oe_runmake buildtest-TESTS
+        oe_runmake CPPFLAGS="-DSRCDIR=\\\"${PTEST_PATH}/tests/\\\"" buildtest-TESTS
 }
 do_install_ptest() {
@@ -39,9 +39,6 @@ do_install_ptest() {
                chmod 0755 ${D}${PTEST_PATH}/tests/test-spawn-pipe-main \
                     ${D}${PTEST_PATH}/tests/test-spawn-pipe-child ${D}${PTEST_PATH}/tests/test-version-etc \
                     ${D}${PTEST_PATH}/tests/test-xalloc-die
-                ln -sf ptest ${D}${libdir}/${BPN}/${BP}
-                sed -i -e 's/@BP@/${BP}/g' ${D}${PTEST_PATH}/run-ptest
 }
 do_install_ptest:append:libc-glibc() {
diff --git a/meta/recipes-devtools/m4/m4/run-ptest b/meta/recipes-devtools/m4/m4/run-ptest
index a91c372e54..da786e26f4 100644
--- a/meta/recipes-devtools/m4/m4/run-ptest
+++ b/meta/recipes-devtools/m4/m4/run-ptest
@@ -2,4 +2,4 @@
 #
 #This script is used to run m4 test suites
 cd tests 
-make -k runtest-TESTS abs_aux_dir=../../@BP@/tests/build-aux abs_top_srcdir=../../@BP@/tests abs_srcdir=../../@BP@/tests top_srcdir=.. srcdir=.
+make -k runtest-TESTS abs_aux_dir=./build-aux abs_top_srcdir=. abs_srcdir=. top_srcdir=.. srcdir=.
diff --git a/meta/recipes-devtools/python/python3_3.13.3.bb b/meta/recipes-devtools/python/python3_3.13.4.bb
index 6839d28e19..5b49fee3bf 100644
--- a/meta/recipes-devtools/python/python3_3.13.3.bb
+++ b/meta/recipes-devtools/python/python3_3.13.4.bb
@@ -36,7 +36,7 @@ SRC_URI:append:class-native = " \
           file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \
           "
-SRC_URI[sha256sum] = "40f868bcbdeb8149a3149580bb9bfd407b3321cd48f0be631af955ac92c0e041"
+SRC_URI[sha256sum] = "27b15a797562a2971dce3ffe31bb216042ce0b995b39d768cf15f784cc757365"
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
@@ -72,8 +72,6 @@ DEPENDS = "\
    bzip2-replacement-native \
    expat \
    libffi \
-    libnsl2 \
-    libtirpc \
    ncurses \
    openssl \
    sqlite3 \
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_10.0.2.bb b/meta/recipes-devtools/qemu/qemu-system-native_10.0.2.bb
index 57a7e8515a..22462e2499 100644
--- a/meta/recipes-devtools/qemu/qemu-system-native_10.0.2.bb
+++ b/meta/recipes-devtools/qemu/qemu-system-native_10.0.2.bb
@@ -9,7 +9,7 @@ DEPENDS += "glib-2.0-native zlib-native pixman-native qemu-native"
 EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
-PACKAGECONFIG ??= "fdt alsa kvm pie slirp png pixman \
+PACKAGECONFIG ??= "fdt alsa kvm pie slirp png pixman sdl \
    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer epoxy', '', d)} \
 "
diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch
new file mode 100644
index 0000000000..ed270a5704
--- /dev/null
+++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch
@@ -0,0 +1,58 @@
+From 19f7ef341f19ac5594c7d0113f9eb8224934464a Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Sun, 8 Jun 2025 00:19:06 -0700
+Subject: [PATCH] CMakeLists.txt: Fix checking for CFLAGS
+The previous code doesn't work because the check_c_compiler_flag() only ran
+once because 'found' is in CACHE, here is log:
+-- Performing Test found
+-- Performing Test found - Success
+That would result in:
+* All the flags are added when the first one works
+* None of the flags is added when the first one doesn't work
+We can use "unset(found CACHE)" to fix that, but the log is still not clear:
+-- Performing Test found
+-- Performing Test found - Success
+-- Performing Test found
+-- Performing Test found - Success
+-- Performing Test found
+-- Performing Test found - Failed
+Use a new var SUPPORTS_${flag} will make it more clear:
+-- Performing Test SUPPORTS_-fno-strict-overflow
+-- Performing Test SUPPORTS_-fno-strict-overflow - Success
+-- Performing Test SUPPORTS_-fno-delete-null-pointer-checks
+-- Performing Test SUPPORTS_-fno-delete-null-pointer-checks - Success
+-- Performing Test SUPPORTS_-fhardened
+-- Performing Test SUPPORTS_-fhardened - Failed
+Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/3796]
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 08e3e5274..a7566ab5a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -416,11 +416,10 @@ endif()
+ 
+ # try to ensure some compiler sanity and hardening options where supported
+ foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks -fhardened)
+-       check_c_compiler_flag(${flag} found)
+-       if (found)
+       check_c_compiler_flag(${flag} SUPPORTS_${flag})
+       if (SUPPORTS_${flag})
+                add_compile_options(${flag})
+        endif()
+-       unset(found)
+ endforeach()
+ 
+ # generated sources
+-- 
+2.49.0
diff --git a/meta/recipes-devtools/rpm/files/0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch b/meta/recipes-devtools/rpm/files/0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch
deleted file mode 100644
index 5db69340ad..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2d6beb620896a59cfd685b51a19057e5c5c4ab41 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Thu, 19 Dec 2024 11:54:54 +0800
-Subject: [PATCH] Set RPM_PLUGINDIR in top level CMakeLists.txt
-We have in macros.in:
-  %__plugindir          @RPM_PLUGINDIR@
-This means, if RPM_PLUGINDIR is not set, %__plugindir will be empty.
-This in turn results in error message when running 'dnf'.
-e.g.,
-dnf --help >/dev/null
-error: /usr/lib64/rpm/macros: line 1183: Macro %__plugindir has empty body
-error: /usr/lib64/rpm/macros: line 1183: Macro %__plugindir has empty body
-So we should move this directory setting into the top level CMakeLists.txt.
-Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/3496]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
- CMakeLists.txt         | 3 +++
- plugins/CMakeLists.txt | 3 ---
- 2 files changed, 3 insertions(+), 3 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 758ba73f4..e694b9650 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -453,6 +453,9 @@ if (ENABLE_PYTHON)
-        add_subdirectory(python)
- endif()
- 
-+set(RPM_PLUGINDIR ${CMAKE_INSTALL_FULL_LIBDIR}/rpm-plugins
-+       CACHE PATH "rpm plugin directory")
-+
- if (ENABLE_PLUGINS)
-        add_subdirectory(plugins)
- endif()
-diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index a44056fe3..6e61a7c20 100644
--- a/plugins/CMakeLists.txt
-+++ b/plugins/CMakeLists.txt
-@@ -42,9 +42,6 @@ if (HAVE_UNSHARE)
-        add_library(unshare MODULE unshare.c)
- endif()
- 
-set(RPM_PLUGINDIR ${CMAKE_INSTALL_FULL_LIBDIR}/rpm-plugins
-       CACHE PATH "rpm plugin directory")
-
- get_property(plugins DIRECTORY PROPERTY BUILDSYSTEM_TARGETS)
- foreach(plugin ${plugins})
-        target_link_libraries(${plugin} PRIVATE librpmio librpm ${Intl_LIBRARIES})
-- 
-2.25.1
diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
index fc6d7e0d29..b71156fe12 100644
--- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
+++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
@@ -24,15 +24,18 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>:
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Rebased to 4.20.1
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 ---
- lib/rpmscript.c | 11 ++++++++---
+ lib/rpmscript.c | 9 +++++++--
- 1 file changed, 8 insertions(+), 3 deletions(-)
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 diff --git a/lib/rpmscript.c b/lib/rpmscript.c
-index 097c9055a..060fd8124 100644
+index eb14870b3..1785e8f30 100644
 --- a/lib/rpmscript.c
 +++ b/lib/rpmscript.c
-@@ -447,8 +447,7 @@ exit:
+@@ -456,8 +456,7 @@ exit:
        Fclose(out);    /* XXX dup'd STDOUT_FILENO */
 
     if (fn) {
@@ -42,18 +45,17 @@ index 097c9055a..060fd8124 100644
        free(fn);
     }
     free(mline);
-@@ -482,7 +481,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd,
+@@ -491,7 +490,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd,
 
     if (rc != RPMRC_FAIL) {
        if (script_type & RPMSCRIPTLET_EXEC) {
-           rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
 +           if (getenv("RPM_NO_CHROOT_FOR_SCRIPTS") != NULL) {
-+               rpmChrootOut();
+           rpmChrootOut();
-+               rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
+            rc = runExtScript(plugins, prefixes, script, lvl, scriptFd, &args, arg1, arg2);
-+               rpmChrootIn();
+           rpmChrootIn();
 +           } else {
-+               rc = runExtScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
+           rc = runExtScript(plugins, prefixes, script, lvl, scriptFd, &args, arg1, arg2);
 +           }
        } else {
-            rc = runLuaScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, script->nextFileFunc);
+            rc = runLuaScript(plugins, prefixes, script, lvl, scriptFd, &args, arg1, arg2);
        }
diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch
index 278fa38bad..bac2d6331c 100644
--- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch
+++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch
@@ -9,15 +9,18 @@ irrelevant noise to rootfs logs.
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Rebased to 4.20.1
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 ---
 lib/rpmscript.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 diff --git a/lib/rpmscript.c b/lib/rpmscript.c
-index 4dc6466a8..6d3c19d01 100644
+index e9f288ae0..f0c628708 100644
 --- a/lib/rpmscript.c
 +++ b/lib/rpmscript.c
-@@ -290,7 +290,7 @@ static char * writeScript(const char *cmd, const char *script)
+@@ -299,7 +299,7 @@ static char * writeScript(const char *cmd, const char *script)
     if (Ferror(fd))
        goto exit;
 
@@ -26,30 +29,30 @@ index 4dc6466a8..6d3c19d01 100644
        static const char set_x[] = "set -x\n";
        /* Assume failures will be caught by the write below */
        Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd);
-@@ -322,7 +322,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
+@@ -330,7 +330,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
     char *mline = NULL;
     rpmRC rc = RPMRC_FAIL;
 
-    rpmlog(RPMLOG_DEBUG, "%s: scriptlet start\n", sname);
+-    rpmlog(RPMLOG_DEBUG, "%s: scriptlet start\n", script->descr);
-+    rpmlog(RPMLOG_INFO, "%s: scriptlet start\n", sname);
+    rpmlog(RPMLOG_INFO, "%s: scriptlet start\n", script->descr);
 
-     if (script) {
+     if (script->body) {
-        fn = writeScript(*argvp[0], script);
+        fn = writeScript(*argvp[0], script->body);
-@@ -374,7 +374,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
+@@ -382,7 +382,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
-                sname, strerror(errno));
+                script->descr, strerror(errno));
        goto exit;
     } else if (pid == 0) {/* Child */
 -       rpmlog(RPMLOG_DEBUG, "%s: execv(%s) pid %d\n",
 +       rpmlog(RPMLOG_INFO, "%s: execv(%s) pid %d\n",
-               sname, *argvp[0], (unsigned)getpid());
+               script->descr, *argvp[0], (unsigned)getpid());
 
        fclose(in);
-@@ -417,7 +417,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
+@@ -426,7 +426,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes,
        reaped = waitpid(pid, &status, 0);
     } while (reaped == -1 && errno == EINTR);
 
 -    rpmlog(RPMLOG_DEBUG, "%s: waitpid(%d) rc %d status %x\n",
 +    rpmlog(RPMLOG_INFO, "%s: waitpid(%d) rc %d status %x\n",
-           sname, (unsigned)pid, (unsigned)reaped, status);
+           script->descr, (unsigned)pid, (unsigned)reaped, status);
 
     if (reaped < 0) {
diff --git a/meta/recipes-devtools/rpm/rpm_4.20.0.bb b/meta/recipes-devtools/rpm/rpm_4.20.1.bb
index bcc138dab0..7bb6993811 100644
--- a/meta/recipes-devtools/rpm/rpm_4.20.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.20.1.bb
@@ -22,7 +22,7 @@ HOMEPAGE = "http://www.rpm.org"
 # libraries are also LGPL - how to express this?
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=066ecde17828e5c8911ec9eae8be78f4"
 SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.20.x;protocol=https \
           file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \
@@ -38,11 +38,11 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.20.x;protoc
           file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \
           file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \
           file://0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch \
-           file://0001-Set-RPM_PLUGINDIR-in-top-level-CMakeLists.txt.patch \
+           file://0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch \
           "
 PE = "1"
-SRCREV = "b3323786668cf99bc9aed7e60ccdab0bc25e19da"
+SRCREV = "c8dc5ea575a2e9c1488036d12f4b75f6a5a49120"
 S = "${WORKDIR}/git"
@@ -101,6 +101,8 @@ WRAPPER_TOOLS = " \
   ${libdir}/rpm/rpmdeps \
 "
+base_bindir_progs = "sed tar rm mv mkdir cp cat chown chmod gzip grep"
 do_install:append:class-native() {
        for tool in ${WRAPPER_TOOLS}; do
                test -x ${D}$tool && create_wrapper ${D}$tool \
@@ -123,9 +125,15 @@ do_install:append:class-nativesdk() {
        EOF
 }
-# Rpm's make install creates var/tmp which clashes with base-files packaging
 do_install:append:class-target() {
+    # Rpm's make install creates var/tmp which clashes with base-files packaging
    rm -rf ${D}/var
+    if [ "${base_bindir}" != "${bindir}" ]; then
+        for prog in ${base_bindir_progs}; do
+            sed -i "s|^%__${prog}.*|%__${prog}  ${base_bindir}/${prog}|g" ${D}${libdir}/rpm/macros
+        done
+    fi
 }
 do_install:append:class-nativesdk() {
    rm -rf ${D}${SDKPATHNATIVE}/var
diff --git a/meta/recipes-devtools/strace/strace_6.15.bb b/meta/recipes-devtools/strace/strace_6.15.bb
index d8ac2a53d0..2093c92eb3 100644
--- a/meta/recipes-devtools/strace/strace_6.15.bb
+++ b/meta/recipes-devtools/strace/strace_6.15.bb
@@ -45,7 +45,7 @@ do_install_ptest() {
        mkdir -p ${D}${PTEST_PATH}/src
        install -m 755 ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
        install -m 644 ${B}/src/config.h ${D}${PTEST_PATH}/src/
-        sed -e '/^src/s/strace.*[0-9]/ptest/' \
+        sed -e 's/^srcdir = .*/srcdir = ..\/..\/ptest\/tests/' \
            -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \
            -i ${D}/${PTEST_PATH}/${TESTDIR}/Makefile
 }
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb
index 235936288b..b02fcb9cad 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb
@@ -7,7 +7,6 @@ LICENSE = "EPL-1.0 | BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679"
 SRCREV = "1f11747e83ebf4f53e8d17f430136f92ec378709"
-PV = "1.8.0+git"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 SRC_URI = "git://gitlab.eclipse.org/eclipse/tcf/tcf.agent.git;protocol=https;branch=master \
diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch b/meta/recipes-devtools/unfs3/unfs3/0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch
deleted file mode 100644
index 91909fa236..0000000000
--- a/meta/recipes-devtools/unfs3/unfs3/0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 949db882e487d728c44bb68139682b38396dd275 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 14 Dec 2022 14:50:10 -0800
-Subject: [PATCH] Alias off64_t to off_t on linux if not defined
-Musl C library does not define off64_t and has 64-bit default off_t
-therefore define off64_t as an alias on linux as well when configure
-detects that off64_t is not provided by a linux system
-Upstream-Status: Submitted [https://github.com/unfs3/unfs3/pull/29]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- nfs.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/nfs.h b/nfs.h
-index aded011..7996c67 100644
--- a/nfs.h
-+++ b/nfs.h
-@@ -62,7 +62,7 @@ typedef int32_t int32;
- #endif
- 
- #ifndef HAVE_OFF64_T
-#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__linux__)
- typedef off_t off64_t;
- #endif
- #endif
diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch b/meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch
deleted file mode 100644
index a0f3740d6a..0000000000
--- a/meta/recipes-devtools/unfs3/unfs3/0001-attr-fix-utime-for-symlink.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 7e789895919d57d573ebb8faa147d1286104cd01 Mon Sep 17 00:00:00 2001
-From: Rui Wang <rui.wang@windriver.com>
-Date: Mon, 24 Apr 2023 02:57:57 -0700
-Subject: [PATCH] attr: fix utime for symlink
-unfs3 has an old defect that it can not change the timestamps of a
-symlink file because it only uses utime(), which will follow the
-symlink. This will not cause an error if the symlink points to an
-existent file. But under some special situation, such as installing
-a rpm package, rpm tool will create the symlink first and try to
-modify the timestamps of it, when the target file is non-existent.
-This will cause an ESTALE error. Making rpm tool ignore this error
-is a solution, but not the best one. An acceptable approach is
-Making unfs3 support lutimes(), which can modify the symlink file
-itself. Considering not every system support this function, so a
-function checking is necessary.
-Upstream-Status: Submitted [https://github.com/unfs3/unfs3/pull/35]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
- attr.c         | 15 +++++++++++----
- backend_unix.h |  2 ++
- configure.ac   |  1 +
- 3 files changed, 14 insertions(+), 4 deletions(-)
-diff --git a/attr.c b/attr.c
-index 0ce9375..930ce6e 100644
--- a/attr.c
-+++ b/attr.c
-@@ -285,7 +285,7 @@ post_op_attr get_post_cached(struct svc_req * req)
- static nfsstat3 set_time(const char *path, backend_statstruct buf, sattr3 new)
- {
-     time_t new_atime, new_mtime;
-    struct utimbuf utim;
-+    struct timeval stamps[2];
-     int res;
- 
-     /* set atime and mtime */
-@@ -307,10 +307,17 @@ static nfsstat3 set_time(const char *path, backend_statstruct buf, sattr3 new)
-        else                           /* DONT_CHANGE */
-            new_mtime = buf.st_mtime;
- 
-       utim.actime = new_atime;
-       utim.modtime = new_mtime;
-+       stamps[0].tv_sec = new_atime;
-+       stamps[0].tv_usec = 0;
-+       stamps[1].tv_sec = new_mtime;
-+       stamps[1].tv_usec = 0;
-+
-+#if HAVE_LUTIMES
-+       res = backend_lutimes(path, stamps);
-+#else
-+       res = backend_utimes(path, stamps);
-+#endif
- 
-       res = backend_utime(path, &utim);
-        if (res == -1)
-            return setattr_err();
-     }
-diff --git a/backend_unix.h b/backend_unix.h
-index 4db72ae..9cce9ab 100644
--- a/backend_unix.h
-+++ b/backend_unix.h
-@@ -61,6 +61,8 @@
- #define backend_symlink symlink
- #define backend_truncate truncate
- #define backend_utime utime
-+#define backend_utimes utimes
-+#define backend_lutimes lutimes
- #define backend_statstruct struct stat
- #define backend_dirstream DIR
- #define backend_statvfsstruct struct statvfs
-diff --git a/configure.ac b/configure.ac
-index d46c905..c21afe3 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -32,6 +32,7 @@ AC_CHECK_FUNCS(setresuid setresgid)
- AC_CHECK_FUNCS(vsyslog)
- AC_CHECK_FUNCS(lchown)
- AC_CHECK_FUNCS(setgroups)
-+AC_CHECK_FUNCS(lutimes)
- UNFS3_COMPILE_WARNINGS
- 
- PKG_CHECK_MODULES([TIRPC], [libtirpc])
-- 
-2.40.0
diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch b/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch
deleted file mode 100644
index 20bbee90a0..0000000000
--- a/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 212a947e776e7a25c1f2259615f461179bcb3663 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Wed, 23 Nov 2022 21:38:38 +0100
-Subject: [PATCH] daemon.c: Fix race window for writing of the pid file
-The parent process should write the pid file such that the pid file
-will can be checked immediately following exit of the fork from the
-parent.
-This allows external monitoring applications to watch the daemon
-without having to add sleep calls to wait for the pid file be written
-on a busy system.
-Upstream-Status: Submitted [https://github.com/unfs3/unfs3/pull/28]
-Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
- daemon.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-diff --git a/daemon.c b/daemon.c
-index ff53b7a..13b06a4 100644
--- a/daemon.c
-+++ b/daemon.c
-@@ -166,7 +166,7 @@ int get_socket_type(struct svc_req *rqstp)
- /*
-  * write current pid to a file
-  */
-static void create_pid_file(void)
-+static void create_pid_file(int pid)
- {
-     char buf[16];
-     int fd, res, len;
-@@ -188,7 +188,7 @@ static void create_pid_file(void)
-     }
- #endif
- 
-    sprintf(buf, "%i\n", backend_getpid());
-+    sprintf(buf, "%i\n", pid);
-     len = strlen(buf);
- 
-     res = backend_pwrite(fd, buf, len, 0);
-@@ -1122,6 +1122,10 @@ int main(int argc, char **argv)
-            fprintf(stderr, "could not fork into background\n");
-            daemon_exit(0);
-        }
-+       if (pid)
-+           create_pid_file(pid);
-+    } else {
-+       create_pid_file(backend_getpid());
-     }
- #endif                                /* WIN32 */
- 
-@@ -1161,8 +1165,10 @@ int main(int argc, char **argv)
-        /* no umask to not screw up create modes */
-        umask(0);
- 
-+#ifdef WIN32
-        /* create pid file if wanted */
-       create_pid_file();
-+       create_pid_file(backend_getpid());
-+#endif
- 
-        /* initialize internal stuff */
-        fh_cache_init();
-- 
-2.30.2
diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-fix-building-on-macOS.patch b/meta/recipes-devtools/unfs3/unfs3/0001-fix-building-on-macOS.patch
deleted file mode 100644
index f18ffd3711..0000000000
--- a/meta/recipes-devtools/unfs3/unfs3/0001-fix-building-on-macOS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 989b87ae46b3183a742031373fbb3e912ab9b666 Mon Sep 17 00:00:00 2001
-From: Andrey Filipenkov <decapitator@ukr.net>
-Date: Wed, 2 Nov 2022 13:38:40 +0300
-Subject: [PATCH] fix building on macOS
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport [https://github.com/unfs3/unfs3/commit/989b87ae46b3183a742031373fbb3e912ab9b666]
---
- attr.c | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/attr.c b/attr.c
-index 6253e84..0ce9375 100644
--- a/attr.c
-+++ b/attr.c
-@@ -18,6 +18,8 @@
- #include <utime.h>
- #include <errno.h>
- #include <dirent.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- #include "backend.h"
- #include "nfs.h"
-- 
-2.39.1
diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch b/meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch
deleted file mode 100644
index 076e08fadc..0000000000
--- a/meta/recipes-devtools/unfs3/unfs3/0001-locate.c-Include-attr.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 63e0785bb379a8f2c41f34f5cd938ca38555e605 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 13 Jan 2023 23:41:01 -0800
-Subject: [PATCH] locate.c: Include attr.h
-Its needed for fix_dir_times() API declarations
-Upstream-Status: Submitted [https://github.com/unfs3/unfs3/pull/32]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- locate.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/locate.c b/locate.c
-index 6bbe71f..84e0fe5 100644
--- a/locate.c
-+++ b/locate.c
-@@ -27,6 +27,7 @@
- #include "nfs.h"
- #include "fh.h"
- #include "daemon.h"
-+#include "attr.h"
- 
- /*
-  * these are the brute-force file searching routines that are used
-- 
-2.39.0
diff --git a/meta/recipes-devtools/unfs3/unfs3_git.bb b/meta/recipes-devtools/unfs3/unfs3_0.11.0.bb
index 0a274d6ffd..da5ca45277 100644
--- a/meta/recipes-devtools/unfs3/unfs3_git.bb
+++ b/meta/recipes-devtools/unfs3/unfs3_0.11.0.bb
@@ -5,26 +5,17 @@ are used by NFS clients for accessing files on the server."
 HOMEPAGE = "https://github.com/unfs3/unfs3"
 SECTION = "console/network"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c621cd2786a3a1344a60a0d608c910"
-DEPENDS = "flex-native bison-native flex"
+DEPENDS = "bison-native flex-native libtirpc"
-DEPENDS += "libtirpc"
-DEPENDS:append:class-nativesdk = " flex-nativesdk"
 S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master \
+SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master;tag=${BP}"
-           file://0001-daemon.c-Fix-race-window-for-writing-of-the-pid-file.patch \
+SRCREV = "ec1660ba33c80d5c67131e163e68834c1a10e243"
-           file://0001-Alias-off64_t-to-off_t-on-linux-if-not-defined.patch \
-           file://0001-locate.c-Include-attr.h.patch \
-           file://0001-fix-building-on-macOS.patch \
-           file://0001-attr-fix-utime-for-symlink.patch \
-           "
-SRCREV = "c8f2d2cd4529955419bad0e163f88d47ff176b8d"
 UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P<pver>\d+(\.\d+)+)"
-PV = "0.10.0"
-BBCLASSEXTEND = "native nativesdk"
 inherit autotools pkgconfig
 EXTRA_OECONF:append:class-native = " --sbindir=${bindir}"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-extended/bc/bc/0001-getopt-Add-missing-params-to-getopt-getenv-signature.patch b/meta/recipes-extended/bc/bc/0001-getopt-Add-missing-params-to-getopt-getenv-signature.patch
deleted file mode 100644
index f43f336075..0000000000
--- a/meta/recipes-extended/bc/bc/0001-getopt-Add-missing-params-to-getopt-getenv-signature.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 493997b0d2c3dc6469f967d8f619ed934667c71e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 22 Mar 2025 18:33:08 -0700
-Subject: [PATCH] getopt: Add missing params to getopt/getenv signatures
-This ensures it can compile with GCC 15 on musl
-Upstream-Status: Submitted [sent to bug-bc@gnu.org]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- h/getopt.h   | 2 +-
- lib/getopt.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/h/getopt.h b/h/getopt.h
-index cc45f46..5ea5eac 100644
--- a/h/getopt.h
-+++ b/h/getopt.h
-@@ -141,7 +141,7 @@ struct option
-    errors, only prototype getopt for the GNU C library.  */
- extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);
- #else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-+extern int getopt (int,  char * const*, const char *);
- #endif /* __GNU_LIBRARY__ */
- 
- #ifndef __need_getopt
-diff --git a/lib/getopt.c b/lib/getopt.c
-index b270074..3e6d071 100644
--- a/lib/getopt.c
-+++ b/lib/getopt.c
-@@ -197,7 +197,7 @@ static char *posixly_correct;
-    whose names are inconsistent.  */
- 
- #ifndef getenv
-extern char *getenv ();
-+extern char *getenv (const char*);
- #endif
- 
- #endif /* not __GNU_LIBRARY__ */
diff --git a/meta/recipes-extended/bc/bc_1.08.1.bb b/meta/recipes-extended/bc/bc_1.08.2.bb
index 5fbbe7ef6a..cebfed9642 100644
--- a/meta/recipes-extended/bc/bc_1.08.1.bb
+++ b/meta/recipes-extended/bc/bc_1.08.2.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "bc is an arbitrary precision numeric processing language. Syntax
 LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                    file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
-                    file://bc/bcdefs.h;endline=17;md5=4295c06df9e833519a342f7b5d43db06 \
+                    file://bc/bcdefs.h;endline=17;md5=f4a0239b216b8407783955e74938f190 \
                    file://dc/dc.h;endline=18;md5=bad31533d57fe5948c996f9ef6643206 \
                    file://lib/number.c;endline=20;md5=cf43068cc88f837731dc53240456cfaf"
@@ -13,9 +13,8 @@ SECTION = "base"
 DEPENDS = "flex-native"
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
-           file://0001-getopt-Add-missing-params-to-getopt-getenv-signature.patch \
           file://run-ptest"
-SRC_URI[sha256sum] = "b71457ffeb210d7ea61825ff72b3e49dc8f2c1a04102bbe23591d783d1bfe996"
+SRC_URI[sha256sum] = "ae470fec429775653e042015edc928d07c8c3b2fc59765172a330d3d87785f86"
 inherit autotools texinfo update-alternatives ptest
diff --git a/meta/recipes-extended/cpio/cpio_2.15.bb b/meta/recipes-extended/cpio/cpio_2.15.bb
index 77fb019af9..fa011251e2 100644
--- a/meta/recipes-extended/cpio/cpio_2.15.bb
+++ b/meta/recipes-extended/cpio/cpio_2.15.bb
@@ -37,10 +37,10 @@ do_install () {
 }
 do_compile_ptest() {
-    oe_runmake -C ${B}/gnu/ check
+    # Forcibly regenerate this script so we get our --am-fmt option
-    oe_runmake -C ${B}/lib/ check
+    rm -f ${S}/tests/testsuite
-    oe_runmake -C ${B}/rmt/ check
+    oe_runmake -C ${B}/tests/ testsuite
-    oe_runmake -C ${B}/src/ check
    oe_runmake -C ${B}/tests/ genfile
 }
@@ -69,7 +69,7 @@ do_install_ptest_base:append() {
 DEPENDS:append:class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', 'ptest-runner', '', d)}"
 PACKAGE_WRITE_DEPS:append:class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', 'ptest-runner', '', d)}"
-RDEPENDS:${PN}-ptest += "ptest-runner"
+RDEPENDS:${PN}-ptest += "ptest-runner coreutils"
 PACKAGES =+ "${PN}-rmt"
diff --git a/meta/recipes-extended/cpio/files/test.sh b/meta/recipes-extended/cpio/files/test.sh
index f027574e86..e966ed91f8 100644
--- a/meta/recipes-extended/cpio/files/test.sh
+++ b/meta/recipes-extended/cpio/files/test.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
-# Define cpio test work dir
+cd @PTEST_PATH@/tests/
-WORKDIR=@PTEST_PATH@/tests/
-# Run test
+./testsuite --am-fmt
-cd ${WORKDIR}
-./atconfig ./atlocal ./testsuite
-./testsuite 2>&1 | grep -E '[0-9]{1,3}: ' | sed -e 's/^.....//' -e '/[ok]$/s/^/PASS: /;/FAILED (.*)/s/^/FAIL: /;/skipped (.*)/s/^/SKIP: /;/expected failure/ s/^/PASS: /;/UNEXPECTED PASS/s/^/FAIL: /' -e 's/ok$//g' -e 's/FAILED.*//g' -e 's/skipped.*//g' -e 's/expected failure.*//g' -e 's/UNEXPECTED PASS.*//g'
diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb
index 8f132d55c6..cd7087721f 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb
@@ -48,7 +48,7 @@ EXTRA_OECONF:append:mipsarcho32 = " --with-large_color_index=0"
 EXTRA_OECONF:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
 EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
-CC += "-std=gnu17"
+TARGET_CFLAGS += "-std=gnu17"
 # Uses autoconf but not automake, can't do out-of-tree
 inherit autotools-brokensep pkgconfig
diff --git a/meta/recipes-extended/iputils/iputils/CVE-2025-47268.patch b/meta/recipes-extended/iputils/iputils/CVE-2025-47268.patch
deleted file mode 100644
index dd31b79031..0000000000
--- a/meta/recipes-extended/iputils/iputils/CVE-2025-47268.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 070cfacd7348386173231fb16fad4983d4e6ae40 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <pvorel@suse.cz>
-Date: Mon, 5 May 2025 23:55:57 +0200
-Subject: [PATCH] ping: Fix signed 64-bit integer overflow in RTT calculation
-Crafted ICMP Echo Reply packet can cause signed integer overflow in
-1) triptime calculation:
-triptime = tv->tv_sec * 1000000 + tv->tv_usec;
-2) tsum2 increment which uses triptime
-rts->tsum2 += (double)((long long)triptime * (long long)triptime);
-3) final tmvar:
-tmvar = (rts->tsum2 / total) - (tmavg * tmavg)
-    $ export CFLAGS="-O1 -g -fsanitize=address,undefined -fno-omit-frame-pointer"
-    $ export LDFLAGS="-fsanitize=address,undefined -fno-omit-frame-pointer"
-    $ meson setup .. -Db_sanitize=address,undefined
-    $ ninja
-    $ ./ping/ping -c2 127.0.0.1
-    PING 127.0.0.1 (127.0.0.1) 56(84) bytes of data.
-    64 bytes from 127.0.0.1: icmp_seq=1 ttl=64 time=0.061 ms
-    ../ping/ping_common.c:757:25: runtime error: signed integer overflow: -2513732689199106 * 1000000 cannot be represented in type 'long int'
-    ../ping/ping_common.c:757:12: runtime error: signed integer overflow: -4975495174606980224 + -6510615555425289427 cannot be represented in type 'long int'
-    ../ping/ping_common.c:769:47: runtime error: signed integer overflow: 6960633343677281965 * 6960633343677281965 cannot be represented in type 'long int'
-    24 bytes from 127.0.0.1: icmp_seq=1 ttl=64 (truncated)
-    ./ping/ping: Warning: time of day goes back (-7256972569576721377us), taking countermeasures
-    ./ping/ping: Warning: time of day goes back (-7256972569576721232us), taking countermeasures
-    24 bytes from 127.0.0.1: icmp_seq=1 ttl=64 (truncated)
-    ../ping/ping_common.c:265:16: runtime error: signed integer overflow: 6960633343677281965 * 2 cannot be represented in type 'long int'
-    64 bytes from 127.0.0.1: icmp_seq=2 ttl=64 time=0.565 ms
-    --- 127.0.0.1 ping statistics ---
-    2 packets transmitted, 2 received, +2 duplicates, 0% packet loss, time 1002ms
-    ../ping/ping_common.c:940:42: runtime error: signed integer overflow: 1740158335919320832 * 1740158335919320832 cannot be represented in type 'long int'
-    rtt min/avg/max/mdev = 0.000/1740158335919320.832/6960633343677281.965/-1623514645242292.-224 ms
-To fix the overflow check allowed ranges of struct timeval members:
-* tv_sec <0, LONG_MAX/1000000>
-* tv_usec <0, 999999>
-Fix includes 2 new error messages (needs translation).
-Also existing message "time of day goes back ..." needed to be modified
-as it now prints tv->tv_sec which is a second (needs translation update).
-After fix:
-    $ ./ping/ping -c2 127.0.0.1
-    64 bytes from 127.0.0.1: icmp_seq=1 ttl=64 time=0.057 ms
-    ./ping/ping: Warning: invalid tv_usec -6510615555424928611 us
-    ./ping/ping: Warning: time of day goes back (-3985394643238914 s), taking countermeasures
-    ./ping/ping: Warning: invalid tv_usec -6510615555424928461 us
-    ./ping/ping: Warning: time of day goes back (-3985394643238914 s), taking countermeasures
-    24 bytes from 127.0.0.1: icmp_seq=1 ttl=64 (truncated)
-    ./ping/ping: Warning: invalid tv_usec -6510615555425884541 us
-    ./ping/ping: Warning: time of day goes back (-4243165695442945 s), taking countermeasures
-    24 bytes from 127.0.0.1: icmp_seq=1 ttl=64 (truncated)
-    64 bytes from 127.0.0.1: icmp_seq=2 ttl=64 time=0.111 ms
-    --- 127.0.0.1 ping statistics ---
-    2 packets transmitted, 2 received, +2 duplicates, 0% packet loss, time 101ms
-    rtt min/avg/max/mdev = 0.000/0.042/0.111/0.046 ms
-Fixes: https://github.com/iputils/iputils/issues/584
-Fixes: CVE-2025-472
-Link: https://github.com/Zephkek/ping-rtt-overflow/
-Co-developed-by: Cyril Hrubis <chrubis@suse.cz>
-Reported-by: Mohamed Maatallah <hotelsmaatallahrecemail@gmail.com>
-Reviewed-by: Mohamed Maatallah <hotelsmaatallahrecemail@gmail.com>
-Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
-Reviewed-by: Noah Meyerhans <noahm@debian.org>
-Signed-off-by: Petr Vorel <pvorel@suse.cz>
-CVE: CVE-2025-47268
-Upstream-Status: Backport
-[https://github.com/iputils/iputils/commit/070cfacd7348386173231fb16fad4983d4e6ae40]
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
- iputils_common.h   |  3 +++
- ping/ping_common.c | 22 +++++++++++++++++++---
- 2 files changed, 22 insertions(+), 3 deletions(-)
-diff --git a/iputils_common.h b/iputils_common.h
-index 49e790d..829a749 100644
--- a/iputils_common.h
-+++ b/iputils_common.h
-@@ -10,6 +10,9 @@
-          !!__builtin_types_compatible_p(__typeof__(arr), \
-                                         __typeof__(&arr[0]))])) * 0)
- 
-+/* 1000001 = 1000000 tv_sec + 1 tv_usec */
-+#define TV_SEC_MAX_VAL (LONG_MAX/1000001)
-+
- #ifdef __GNUC__
- # define iputils_attribute_format(t, n, m) __attribute__((__format__ (t, n, m)))
- #else
-diff --git a/ping/ping_common.c b/ping/ping_common.c
-index dadd2a4..4e99d89 100644
--- a/ping/ping_common.c
-+++ b/ping/ping_common.c
-@@ -754,16 +754,32 @@ int gather_statistics(struct ping_rts *rts, uint8_t *icmph, int icmplen,
- 
- restamp:
-                tvsub(tv, &tmp_tv);
-               triptime = tv->tv_sec * 1000000 + tv->tv_usec;
-               if (triptime < 0) {
-                       error(0, 0, _("Warning: time of day goes back (%ldus), taking countermeasures"), triptime);
-+
-+               if (tv->tv_usec >= 1000000) {
-+                       error(0, 0, _("Warning: invalid tv_usec %ld us"), tv->tv_usec);
-+                       tv->tv_usec = 999999;
-+               }
-+
-+               if (tv->tv_usec < 0) {
-+                       error(0, 0, _("Warning: invalid tv_usec %ld us"), tv->tv_usec);
-+                       tv->tv_usec = 0;
-+               }
-+
-+               if (tv->tv_sec > TV_SEC_MAX_VAL) {
-+                       error(0, 0, _("Warning: invalid tv_sec %ld s"), tv->tv_sec);
-+                       triptime = 0;
-+               } else if (tv->tv_sec < 0) {
-+                       error(0, 0, _("Warning: time of day goes back (%ld s), taking countermeasures"), tv->tv_sec);
-                        triptime = 0;
-                        if (!rts->opt_latency) {
-                                gettimeofday(tv, NULL);
-                                rts->opt_latency = 1;
-                                goto restamp;
-                        }
-+               } else {
-+                       triptime = tv->tv_sec * 1000000 + tv->tv_usec;
-                }
-+
-                if (!csfailed) {
-                        rts->tsum += triptime;
-                        rts->tsum2 += (double)((long long)triptime * (long long)triptime);
-- 
-2.34.1
diff --git a/meta/recipes-extended/iputils/iputils_20240905.bb b/meta/recipes-extended/iputils/iputils_20250605.bb
index 64d58a91c2..bb495a7d13 100644
--- a/meta/recipes-extended/iputils/iputils_20240905.bb
+++ b/meta/recipes-extended/iputils/iputils_20250605.bb
@@ -8,12 +8,9 @@ LICENSE = "BSD-3-Clause & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=627cc07ec86a45951d43e30658bbd819"
-DEPENDS = "gnutls"
 SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
-           file://CVE-2025-47268.patch \
          "
-SRCREV = "10b50784aae3fb75c96cdf9b1668916b49557dd5"
+SRCREV = "6e1cb146547eb6fbb127ffc8397a9241be0d33c2"
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-extended/tar/tar/run-ptest b/meta/recipes-extended/tar/tar/run-ptest
index 185b33d61a..b4ccbbcb46 100644
--- a/meta/recipes-extended/tar/tar/run-ptest
+++ b/meta/recipes-extended/tar/tar/run-ptest
@@ -1,14 +1,8 @@
 #!/bin/sh
-# Define tar test work dir
+cd @PTEST_PATH@/tests/
-WORKDIR=@PTEST_PATH@/tests/
-# Run test
+# Clear old data
-cd ${WORKDIR}
+rm -rf testsuite.dir testsuite.log
-./atconfig ./atlocal ./testsuite
-# clear log
-rm -rf testsuite.dir
-rm -rf testsuite.log
 ./testsuite --am-fmt
diff --git a/meta/recipes-graphics/mesa/files/0001-meson-stop-building-XA-by-default.patch b/meta/recipes-graphics/mesa/files/0001-meson-stop-building-XA-by-default.patch
deleted file mode 100644
index 4372675952..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-meson-stop-building-XA-by-default.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 31a835dd2573c17d77efa8803c7fb28e0d58abc6 Mon Sep 17 00:00:00 2001
-From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
-Date: Thu, 22 May 2025 20:11:46 +0300
-Subject: [PATCH] meson: stop building XA by default
-Commit cf40099730c4 ("meson: deprecate gallium-xa") deprecated XA
-tracker, but didn't disable it by default. Thus any attempt to disable
-it would cause a deprecated option warning. Flip the default to disable
-XA tracker by default.
-Fixes: cf40099730c4 ("meson: deprecate gallium-xa")
-Backport-to: 25.1
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
-Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/31cf6b94ad1dfaf4272b22a39d7e2805d03f9375]
---
- meson.options | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/meson.options b/meson.options
-index e6c9567ade86..a56bcef6e2ca 100644
--- a/meson.options
-+++ b/meson.options
-@@ -127,6 +127,7 @@ option(
- option(
-   'gallium-xa',
-   type : 'feature',
-+  value : 'disabled',
-   description : 'enable gallium xa frontend.',
-   deprecated: true,
- )
-- 
-2.47.2
diff --git a/meta/recipes-graphics/mesa/mesa-demos_9.0.0.bb b/meta/recipes-graphics/mesa/mesa-demos_9.0.0.bb
index d92f1ddc5b..a9e84039d2 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_9.0.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_9.0.0.bb
@@ -30,7 +30,6 @@ PACKAGECONFIG[egl] = "-Degl=enabled,-Degl=disabled,virtual/egl"
 PACKAGECONFIG[gles1] = "-Dgles1=enabled,-Dgles1=disabled,virtual/libgles1"
 PACKAGECONFIG[gles2] = "-Dgles2=enabled,-Dgles2=disabled,virtual/libgles2"
 PACKAGECONFIG[glut] = "-Dwith-glut=${STAGING_EXECPREFIXDIR},,freeglut"
-PACKAGECONFIG[osmesa] = "-Dosmesa=enabled,-Dosmesa=disabled,"
 PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader glslang-native"
 PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/libgl wayland wayland-native wayland-protocols libxkbcommon libdecor"
 PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libglu libxkbcommon libxcb"
diff --git a/meta/recipes-graphics/mesa/mesa-gl.bb b/meta/recipes-graphics/mesa/mesa-gl.bb
index 680fda1be5..2bdabddc28 100644
--- a/meta/recipes-graphics/mesa/mesa-gl.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl.bb
@@ -9,7 +9,6 @@ S = "${WORKDIR}/mesa-${PV}"
 TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm"
 # At least one DRI rendering engine is required to build mesa.
-# When no X11 is available, use osmesa for the rendering engine.
 PACKAGECONFIG ??= "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG:class-target = "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 4b1e427ad5..b222e72fdd 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -18,11 +18,10 @@ SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
           file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
           file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \
           file://0001-dont-build-clover-frontend.patch \
-           file://0001-meson-stop-building-XA-by-default.patch \
 "
-SRC_URI[sha256sum] = "cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce"
+SRC_URI[sha256sum] = "ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f"
-PV = "25.1.1"
+PV = "25.1.3"
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch
new file mode 100644
index 0000000000..f8600556e5
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch
@@ -0,0 +1,32 @@
+From 846efe923932d66810305b228fa09f83a172296d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Thu, 22 May 2025 17:34:15 +0200
+Subject: [PATCH] tests/no_error.py: modify _command and not command
+command getter function has hidden magic that prepends build paths;
+this is an undesirable side effect here, as we only want to append a parameter
+and not change anything else.
+In particular this avoids adding build paths to installed .xml.gz file,
+ensuring reproducibility. Xml writer is already using _command for the
+same reason.
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/1016]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ tests/no_error.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/tests/no_error.py b/tests/no_error.py
+index 4ecaa9a01..c64eec0a1 100644
+--- a/tests/no_error.py
+++ b/tests/no_error.py
+@@ -21,4 +21,4 @@ for name, test in itertools.chain(_profile1.test_list.items(),
+                                   _profile2.test_list.items()):
+     if isinstance(test, (PiglitGLTest, ShaderTest, MultiShaderTest)):
+         profile.test_list['{} khr_no_error'.format(name)] = test
+-        test.command += ['-khr_no_error']
+        test._command += ['-khr_no_error']
+-- 
+2.39.5
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index e30efdf33b..dc210ff56d 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -12,6 +12,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma
           file://0001-tests-Fix-narrowing-errors-seen-with-clang.patch \
           file://0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch \
           file://0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch \
+           file://0001-tests-no_error.py-modify-_command-and-not-command.patch \
           "
 UPSTREAM_CHECK_COMMITS = "1"
@@ -48,8 +49,6 @@ PACKAGECONFIG[x11] = "-DPIGLIT_USE_X11=1 -DPIGLIT_BUILD_GL_TESTS=ON -DPIGLIT_BUI
 PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,glslang-native vulkan-loader,glslang"
 PACKAGECONFIG[wayland] = "-DPIGLIT_USE_WAYLAND=1,-DPIGLIT_USE_WAYLAND=0,wayland-native wayland wayland-protocols"
-export PIGLIT_BUILD_DIR = "../../../../git"
 do_configure:prepend() {
   if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then
        sed -i -e "/^#.*include <GL\/freeglut_ext.h>$/d" ${S}/src/piglit/glut_wrap.h
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch
deleted file mode 100644
index 37617600d5..0000000000
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 79bc507b48d4acd3dec8a85ab6b341b872d44a05 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 29 Jan 2019 22:40:24 -0800
-Subject: [PATCH] calibrator.hh: Include <string> to get std::string
-Found with libc++
-Upstream-Status: Submitted [https://github.com/tias/xinput_calibrator/pull/76]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/calibrator.hh | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/src/calibrator.hh b/src/calibrator.hh
-index a6f9504..e75bcef 100644
--- a/src/calibrator.hh
-+++ b/src/calibrator.hh
-@@ -29,6 +29,7 @@
- #include <X11/Xlib.h>
- #include <stdio.h>
- #include <vector>
-+#include <string>
- 
- // XXX: we currently don't handle lines that are longer than this
- #define MAX_LINE_LEN 1024
-- 
-2.20.1
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
index de0862599d..86982924a8 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Inactive-Upstream [last commits over a decade ago]
+Upstream-Status: Pending
 From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001
 From: Laurentiu Palcu <laurentiu.palcu@intel.com>
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.8.0.bb
index 0516928a76..c37b36897b 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.8.0.bb
@@ -4,22 +4,18 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a"
 DEPENDS = "virtual/libx11 libxi libxrandr"
-PV = "0.7.5+git"
 inherit autotools pkgconfig features_check
-# depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
-SRCREV = "18ec53f1cada39f905614ebfaffed5c7754ecf46"
+SRCREV = "970b574b8f7b0d6f2613d343191f47814f2dfaa4"
-SRC_URI = "git://github.com/kreijack/xinput_calibrator.git;branch=libinput;protocol=https \
+SRC_URI = "git://gitlab.freedesktop.org/xorg/app/xinput-calibrator;protocol=https;branch=master;tag=v${PV} \
           file://30xinput_calibrate.sh \
           file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \
-           file://0001-calibrator.hh-Include-string-to-get-std-string.patch \
           "
 S = "${WORKDIR}/git"
-# force native X11 ui as we don't have gtk+ in DEPENDS
 EXTRA_OECONF += "--with-gui=x11"
 do_install:append() {
diff --git a/meta/recipes-graphics/xwayland/xwayland_24.1.6.bb b/meta/recipes-graphics/xwayland/xwayland_24.1.6.bb
index 350b8e93cc..540ec100bd 100644
--- a/meta/recipes-graphics/xwayland/xwayland_24.1.6.bb
+++ b/meta/recipes-graphics/xwayland/xwayland_24.1.6.bb
@@ -17,7 +17,7 @@ UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
 inherit meson features_check pkgconfig
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
-DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt"
+DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt libtirpc"
 OPENGL_PKGCONFIGS = "glx glamor dri3"
 PACKAGECONFIG ??= "${XORG_CRYPTO} ${XWAYLAND_EI} \
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_1.3.0.bb
index 8fc30d74fd..061a7b9784 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_1.3.0.bb
@@ -10,14 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 DEPENDS = "libaio"
-SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb"
-PV = "1.3.0+git"
-SRC_URI = "git://git.kernel.dk/blktrace.git;branch=master;protocol=https \
+SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=https;branch=master \
           file://0001-bno_plot.py-btt_plot.py-Ask-for-python3-specifically.patch \
          "
+SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb"
 S = "${WORKDIR}/git"
 EXTRA_OEMAKE = "\
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
index 1f61008bd6..5a7bad9017 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
@@ -14,8 +14,8 @@ python () {
        raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
-SRCREV_machine ?= "4127c6137af28c2c91ec79acee60fe4d4d70db9b"
+SRCREV_machine ?= "7cb6d42c40de351ecab0a083aef260f84407de0d"
-SRCREV_meta ?= "f2f3b6cbd91743920e2cb55998c53326855b2e9c"
+SRCREV_meta ?= "60b8562e9989f268ad5d241989f56b71cfa1f648"
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
           git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.12;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
index d92862a426..0fad73dddd 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "fee8195f8412ff8f1bfc50ba86cdb8f20de22750"
+SRCREV_machine ?= "298aefdf4112e7c0a84522e4acf2c722e433c8a0"
-SRCREV_meta ?= "f2f3b6cbd91743920e2cb55998c53326855b2e9c"
+SRCREV_meta ?= "60b8562e9989f268ad5d241989f56b71cfa1f648"
 PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.12.bb b/meta/recipes-kernel/linux/linux-yocto_6.12.bb
index c5cab3432c..262ae35704 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.12.bb
@@ -18,18 +18,18 @@ KBRANCH:qemux86.104 ?= "v6.12/standard/base"
 KBRANCH:qemuloongarch64  ?= "v6.12/standard/base"
 KBRANCH:qemumips64 ?= "v6.12/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "4260a7bd706072e6bec438cdc29f44845d380b21"
+SRCREV_machine:qemuarm ?= "37a1fd13ca538e7785daf01434495a614bc55ead"
-SRCREV_machine:qemuarm64 ?= "fee8195f8412ff8f1bfc50ba86cdb8f20de22750"
+SRCREV_machine:qemuarm64 ?= "298aefdf4112e7c0a84522e4acf2c722e433c8a0"
-SRCREV_machine:qemuloongarch64 ?= "fee8195f8412ff8f1bfc50ba86cdb8f20de22750"
+SRCREV_machine:qemuloongarch64 ?= "298aefdf4112e7c0a84522e4acf2c722e433c8a0"
-SRCREV_machine:qemumips ?= "681fad27d382f2e0eb53d1b46f9d35aa2332248f"
+SRCREV_machine:qemumips ?= "2bcf58ea5aa19d54c436e63c59ab09b307e9ee8e"
-SRCREV_machine:qemuppc ?= "fee8195f8412ff8f1bfc50ba86cdb8f20de22750"
+SRCREV_machine:qemuppc ?= "298aefdf4112e7c0a84522e4acf2c722e433c8a0"
-SRCREV_machine:qemuriscv64 ?= "fee8195f8412ff8f1bfc50ba86cdb8f20de22750"
+SRCREV_machine:qemuriscv64 ?= "298aefdf4112e7c0a84522e4acf2c722e433c8a0"
-SRCREV_machine:qemuriscv32 ?= "fee8195f8412ff8f1bfc50ba86cdb8f20de22750"
+SRCREV_machine:qemuriscv32 ?= "298aefdf4112e7c0a84522e4acf2c722e433c8a0"
-SRCREV_machine:qemux86 ?= "fee8195f8412ff8f1bfc50ba86cdb8f20de22750"
+SRCREV_machine:qemux86 ?= "298aefdf4112e7c0a84522e4acf2c722e433c8a0"
-SRCREV_machine:qemux86-64 ?= "fee8195f8412ff8f1bfc50ba86cdb8f20de22750"
+SRCREV_machine:qemux86-64 ?= "298aefdf4112e7c0a84522e4acf2c722e433c8a0"
-SRCREV_machine:qemumips64 ?= "c32033ad8eac09b074c44a42e7d34d398df9d172"
+SRCREV_machine:qemumips64 ?= "6470f58a8f04951f202cf85afb4421d2e7ec9995"
-SRCREV_machine ?= "fee8195f8412ff8f1bfc50ba86cdb8f20de22750"
+SRCREV_machine ?= "298aefdf4112e7c0a84522e4acf2c722e433c8a0"
-SRCREV_meta ?= "f2f3b6cbd91743920e2cb55998c53326855b2e9c"
+SRCREV_meta ?= "60b8562e9989f268ad5d241989f56b71cfa1f648"
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 0d19e1bdc2..6cc5499d8d 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -151,6 +151,7 @@ PERF_SRC ?= "Makefile \
             arch/arm64/tools \
             ${PERF_BPF_EVENT_SRC} \
             arch/${ARCH}/Makefile \
+             include/uapi/asm-generic/Kbuild \
 "
 PERF_EXTRA_LDFLAGS = ""
@@ -208,7 +209,7 @@ python copy_perf_source_from_kernel() {
 do_configure:prepend () {
    # If building a multlib based perf, the incorrect library path will be
    # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit
-    # build, with a 64 bit multilib, the arch won't match and the detection of a 
+    # build, with a 64 bit multilib, the arch won't match and the detection of a
    # 64 bit build (and library) are not exected. To ensure that libraries are
    # installed to the correct location, we can use the weak assignment in the
    # config/Makefile.
diff --git a/meta/recipes-kernel/systemtap/systemtap-native_git.bb b/meta/recipes-kernel/systemtap/systemtap-native_5.2.bb
index 2690b259c8..8befa7a7ea 100644
--- a/meta/recipes-kernel/systemtap/systemtap-native_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap-native_5.2.bb
@@ -1,5 +1,4 @@
+require systemtap_${PV}.bb
-require systemtap_git.bb
 inherit_defer native
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_5.2.bb
index 254bac4d6f..254bac4d6f 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_5.2.bb
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index bbb2105b5a..a6688f2604 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,14 +1,14 @@
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de"
-PV = "5.2"
-SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \
+SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master \
           file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
           file://0001-Install-python-modules-to-correct-library-dir.patch \
           file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
           "
+SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de"
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux'
 COMPATIBLE_HOST:libc-musl = 'null'
diff --git a/meta/recipes-support/curl/curl/no-test-timeout.patch b/meta/recipes-support/curl/curl/no-test-timeout.patch
index 677d177302..5b901a6fe9 100644
--- a/meta/recipes-support/curl/curl/no-test-timeout.patch
+++ b/meta/recipes-support/curl/curl/no-test-timeout.patch
@@ -14,7 +14,7 @@ diff --git a/tests/servers.pm b/tests/servers.pm
 index d4472d5..9999938 100644
 --- a/tests/servers.pm
 +++ b/tests/servers.pm
-@@ -123,7 +123,7 @@ my $sshdverstr;  # for socks server, ssh daemon version string
+@@ -124,7 +124,7 @@ my $sshdverstr;  # for socks server, ssh daemon version string
 my $sshderror;   # for socks server, ssh daemon version error
 my %doesntrun;    # servers that don't work, identified by pidfile
 my %PORT = (nolisten => 47); # port we use for a local non-listening service
diff --git a/meta/recipes-support/curl/curl_8.12.1.bb b/meta/recipes-support/curl/curl_8.14.1.bb
index 4192693da8..08ad9cdb17 100644
--- a/meta/recipes-support/curl/curl_8.12.1.bb
+++ b/meta/recipes-support/curl/curl_8.14.1.bb
@@ -20,7 +20,7 @@ SRC_URI:append:class-nativesdk = " \
           file://environment.d-curl.sh \
 "
-SRC_URI[sha256sum] = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202"
+SRC_URI[sha256sum] = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd"
 # Curl has used many names over the years...
 CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"
@@ -126,12 +126,17 @@ do_install_ptest() {
                ${B}/libtool --mode=install install ${B}/tests/server/$name ${D}${PTEST_PATH}/tests/server
        done
+        install -d ${D}${PTEST_PATH}/src
+        install -m 755 ${B}/src/curlinfo ${D}${PTEST_PATH}/src
        cp -r ${S}/tests/data ${D}${PTEST_PATH}/tests/
        # More tests that we disable for automated QA as they're not reliable
        cat ${UNPACKDIR}/disable-tests >>${D}${PTEST_PATH}/tests/data/DISABLED
 }
+DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' openssl-native', '', d)}"
 RDEPENDS:${PN}-ptest += " \
        locale-base-en-us \
        perl-module-b \
diff --git a/meta/recipes-support/diffoscope/diffoscope_293.bb b/meta/recipes-support/diffoscope/diffoscope_297.bb
index 59e7cbe000..6f6f4ac520 100644
--- a/meta/recipes-support/diffoscope/diffoscope_293.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_297.bb
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
 inherit pypi setuptools3
-SRC_URI[sha256sum] = "15315d09babdee45449be7042ad1f57104a5f04853bd6951cdc0da171c13ac3b"
+SRC_URI[sha256sum] = "25532061c640b4be7496f9a726640e20ca0fcb8e46a8a1a46e51ac940a5f4e57"
 RDEPENDS:${PN} += "\
        binutils \
@@ -29,9 +29,6 @@ RDEPENDS:${PN} += "\
        vim \
        "
-# Dependencies don't build for musl
-COMPATIBLE_HOST:libc-musl = 'null'
 do_install:append:class-native() {
        create_wrapper ${D}${bindir}/diffoscope \
                MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \
diff --git a/meta/recipes-support/sass/libsass_git.bb b/meta/recipes-support/sass/libsass_3.6.6.bb
index 890cbf8e63..3878072cf1 100644
--- a/meta/recipes-support/sass/libsass_git.bb
+++ b/meta/recipes-support/sass/libsass_3.6.6.bb
@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d"
 inherit autotools
-SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/sass/libsass.git;protocol=https;branch=master \
           file://0001-Remove-version.h-from-source-directory.patch"
 SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460"
-PV = "3.6.6"
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-support/sass/sassc_git.bb b/meta/recipes-support/sass/sassc_3.6.2.bb
index 64e92f48cf..4d4dbc03fe 100644
--- a/meta/recipes-support/sass/sassc_git.bb
+++ b/meta/recipes-support/sass/sassc_3.6.2.bb
@@ -7,12 +7,11 @@ DEPENDS = "libsass"
 inherit autotools pkgconfig
-SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/sass/sassc.git;protocol=https;branch=master \
           file://0001-Remove-sassc_version.h-from-source-directory.patch"
 SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0"
 S = "${WORKDIR}/git"
-PV = "3.6.2"
 CVE_STATUS[CVE-2022-43357] = "cpe-incorrect: this is CVE for libsass, not sassc wrapper"