55 files changed, 797 insertions, 280 deletions

diff --git a/meta-filesystems/SECURITY.md b/meta-filesystems/SECURITY.md
new file mode 100644
index 0000000000..1530103230
--- /dev/null
+++ b/meta-filesystems/SECURITY.md
@@ -0,0 +1,20 @@
+How to Report a Potential Vulnerability?
+========================================
+
+If you would like to report a public issue (for example, one with a released
+CVE number), please report it to the mailing list:
+
+  https://lists.openembedded.org/g/openembedded-devel
+
+If you are dealing with a not-yet released or urgent issue, please send a
+message to one of the maintainers listed in the README.  Include as many
+details as possible:
+  - the layer or software module affected
+  - the recipe and its version
+  - any example code, if available
+
+Branches maintained with security fixes
+---------------------------------------
+
+See https://wiki.yoctoproject.org/wiki/Releases for the list of current
+releases.  We only accept patches for the LTS releases and the master branch.
diff --git a/meta-filesystems/conf/include/non-repro-meta-filesystems.inc b/meta-filesystems/conf/include/non-repro-meta-filesystems.inc
deleted file mode 100644
index 4975593277..0000000000
--- a/meta-filesystems/conf/include/non-repro-meta-filesystems.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# List of known non-reproducible package of the meta-filesystems layer
-# Please keep this list sorted
-KNOWN_NON_REPRO_META_FILESYSTEMS = " \
-    e2tools-ptest \
-    xfsprogs-doc \
-    zfs \
-    zfs-dbg \
-    zfs-dev \
-"
diff --git a/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc b/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc
index f57bbab930..875a2f139a 100644
--- a/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc
+++ b/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc
@@ -8,11 +8,10 @@
 
 PTESTS_FAST_META_FILESYSTEMS = "\
     e2tools \
-    fuse3 \
 "
 
 PTESTS_SLOW_META_FILESYSTEMS = "\
+    sshfs-fuse \
 "
 PTESTS_PROBLEMS_META_FILESYSTEMS = "\
-    sshfs-fuse \
 "
diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf
index 52ca5a4c0b..4d147b7139 100644
--- a/meta-filesystems/conf/layer.conf
+++ b/meta-filesystems/conf/layer.conf
@@ -15,4 +15,15 @@ LAYERVERSION_filesystems-layer = "1"
 
 LAYERDEPENDS_filesystems-layer = "core openembedded-layer networking-layer"
 
-LAYERSERIES_COMPAT_filesystems-layer = "styhead"
+LAYERSERIES_COMPAT_filesystems-layer = "walnascar whinlatter"
+
+BBFILES_DYNAMIC += " \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
+"
+
+# List of known non-reproducible package of the meta-filesystems layer
+# Please keep this list sorted
+OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += " \
+    e2tools-ptest \
+    xfsprogs-doc \
+"
diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in
new file mode 100644
index 0000000000..a9cf5e4075
--- /dev/null
+++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.init.in
@@ -0,0 +1,84 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:             gpiod-sysfs-proxy
+# Required-Start:       $remote_fs $syslog
+# Required-Stop:        $remote_fs $syslog
+# Default-Start:        2 3 4 5
+# Default-Stop:         1
+# Short-Description:    User-space, libgpiod-based compatibility layer for linux GPIO sysfs interface.
+### END INIT INFO
+#
+# -*- coding: utf-8 -*-
+# Debian init.d script for gpiod-sysfs-proxy
+# Copyright (c) 2024 Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+
+# set -e
+
+# Source function library.
+. /etc/init.d/functions
+
+PROG="/usr/bin/gpiod-sysfs-proxy"
+NAME="gpiod-sysfs-proxy"
+DESC="/sys/class/gpio compatibility layer"
+MOUNTPOINT="@mountpoint@"
+
+test -x $PROG || exit 0
+
+do_start()
+{
+        echo -n "Starting $DESC: "
+
+        if [ "$MOUNTPOINT" = "/sys/class/gpio" ] && [ ! -e /sys/class/gpio ]; then
+                mkdir -p /run/gpio/sys /run/gpio/class/gpio /run/gpio/work
+                mount -t sysfs sysfs /run/gpio/sys -o nosuid,nodev,noexec
+                # Bail out if overlayfs is not available
+                set -e
+                mount -t overlay overlay /sys/class \
+-o upperdir=/run/gpio/class,lowerdir=/run/gpio/sys/class,workdir=/run/gpio/work,nosuid,nodev,noexec,relatime,ro
+                set +e
+        else
+                mkdir -p $MOUNTPOINT
+        fi
+
+        $PROG $MOUNTPOINT -o nonempty -o allow_other -o default_permissions -o entry_timeout=0 -f | logger -i $NAME &
+        echo "done"
+}
+
+do_stop()
+{
+        echo -n "Stopping $DESC: "
+
+        umount $MOUNTPOINT
+
+        mountpoint -q /sys/class
+        if [ "$?" = "0" ]; then
+                umount /sys/class
+                umount /run/gpio/sys
+                rm -rf /run/gpio
+        fi
+        echo "done"
+}
+
+case "$1" in
+        start)
+                do_start
+        ;;
+        stop)
+                do_stop
+        ;;
+        status)
+                status $PROG
+                exit $?
+        ;;
+        restart)
+                do_stop
+                sleep 1
+                do_start
+        ;;
+        *)
+                echo "Usage: /etc/init.d/$NAME {start|stop|status|restart}" >&2
+                exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in
new file mode 100644
index 0000000000..313523268c
--- /dev/null
+++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/gpiod-sysfs-proxy.service.in
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: 2024 Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+
+[Unit]
+Description=User-space, libgpiod-based compatibility layer for linux GPIO sysfs interface
+
+[Service]
+RuntimeDirectory=gpio
+Type=simple
+ExecStart=/usr/bin/gpiod-sysfs-proxy @mountpoint@ -f -o nonempty -o allow_other -o default_permissions -o entry_timeout=0
+ExecStop=/bin/umount @mountpoint@
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/run-gpio-sys.mount b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/run-gpio-sys.mount
new file mode 100644
index 0000000000..a924cb9b64
--- /dev/null
+++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/run-gpio-sys.mount
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: 2024 Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+
+[Unit]
+Description=Remount of sysfs for gpiod-sysfs-proxy
+ConditionPathExists=!/sys/class/gpio
+
+[Mount]
+DirectoryMode=0700
+What=sysfs
+Where=/run/gpio/sys
+Type=sysfs
+Options=nosuid,nodev,noexec
diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/run-ptest.in b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/run-ptest.in
new file mode 100644
index 0000000000..aab3a5ce3e
--- /dev/null
+++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/run-ptest.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+ptestdir=$(dirname "$(readlink -f "$0")")
+testbin="gpio-sysfs-compat-tests"
+
+modprobe gpio-sim
+modprobe configfs
+
+mountpoint -q /sys/kernel/config
+if [ "$?" -ne "0" ]; then
+        mount -t configfs configfs /sys/kernel/config
+fi
+
+cd $ptestdir/tests
+
+./$testbin -v --gpio-class @mountpoint@ --chown-user gpio-test > ./$testbin.out 2>&1
+if [ $? -ne 0 ]; then
+        echo "FAIL: $testbin"
+else
+        echo "PASS: $testbin"
+fi
diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/sys-class.mount b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/sys-class.mount
new file mode 100644
index 0000000000..e3e3ce8e74
--- /dev/null
+++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy/sys-class.mount
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: 2024 Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+
+[Unit]
+Description=Overlay on top of /sys/class adding the gpio class directory
+Before=gpiod-sysfs-proxy.service
+After=run-gpio-sys.mount
+ConditionPathExists=!/sys/class/gpio
+
+[Mount]
+RuntimeDirectory=gpio/class/gpio
+DirectoryMode=0755
+What=overlay
+Where=/sys/class
+Type=overlay
+Options=upperdir=/run/gpio/class,lowerdir=/run/gpio/sys/class,workdir=/run/gpio/work,ro,nosuid,nodev,noexec,relatime
diff --git a/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_0.1.2.bb b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_0.1.2.bb
new file mode 100644
index 0000000000..3e68a52b09
--- /dev/null
+++ b/meta-filesystems/dynamic-layers/meta-python/recipes-support/gpiod-sysfs-proxy/gpiod-sysfs-proxy_0.1.2.bb
@@ -0,0 +1,85 @@
+SUMMARY = "User-space, libgpiod-based compatibility layer for linux GPIO sysfs interface."
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0dcf8b702b5c96178978c7223f64a73b"
+
+inherit systemd update-rc.d ptest pypi python_pep517 python_setuptools_build_meta useradd
+
+PYPI_PACKAGE = "gpiod_sysfs_proxy"
+
+SRC_URI += " \
+    file://gpiod-sysfs-proxy.service.in \
+    file://run-gpio-sys.mount \
+    file://sys-class.mount \
+    file://gpiod-sysfs-proxy.init.in \
+    file://run-ptest.in \
+"
+
+SRC_URI[sha256sum] = "4bdd4b8a7042f63a40507ae0f16b360011e67cbb2f0276289636487a54849530"
+
+# For full backward compatibility with the kernel sysfs interface, this option
+# must be selected. However, we don't make it the default as - with kernel sysfs
+# disabled - it plays a silly game with /sys/class, where it mounts a read-only
+# overlay containing the missing /sys/class/gpio directory. This is a rather
+# non-standard behavior so make sure the user actually wants it.
+PACKAGECONFIG[sys-class-mount] = ""
+
+export MOUNTPOINT = "${@bb.utils.contains('PACKAGECONFIG', 'sys-class-mount', '/sys/class/gpio', '/run/gpio', d)}"
+
+do_install:append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        install -d ${D}${systemd_system_unitdir}
+        install -m 0644 ${UNPACKDIR}/gpiod-sysfs-proxy.service.in ${D}${systemd_system_unitdir}/gpiod-sysfs-proxy.service
+
+        if ${@bb.utils.contains('PACKAGECONFIG', 'sys-class-mount', 'true', 'false', d)}; then
+            install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/
+
+            install -m 0644 ${UNPACKDIR}/run-gpio-sys.mount ${D}${systemd_system_unitdir}/run-gpio-sys.mount
+            install -m 0644 ${UNPACKDIR}/sys-class.mount ${D}${systemd_system_unitdir}/sys-class.mount
+
+            ln -sf ../run-gpio-sys.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/run-gpio-sys.mount
+            ln -sf ../sys-class.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/sys-class.mount
+        fi
+
+        sed -i "s:@mountpoint@:$MOUNTPOINT:g" ${D}${systemd_system_unitdir}/gpiod-sysfs-proxy.service
+    elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${UNPACKDIR}/gpiod-sysfs-proxy.init.in ${D}${sysconfdir}/init.d/gpiod-sysfs-proxy
+        sed -i "s:@mountpoint@:$MOUNTPOINT:g" ${D}${sysconfdir}/init.d/gpiod-sysfs-proxy
+    fi
+}
+
+SYSTEMD_SERVICE:${PN} = "gpiod-sysfs-proxy.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
+INITSCRIPT_NAME = "gpiod-sysfs-proxy"
+INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 0 1 6 ."
+
+FILES:${PN} += "/usr/lib/systemd/system"
+
+RDEPENDS:${PN} += " \
+    python3-fuse \
+    python3-gpiod \
+    python3-pyudev \
+"
+
+python __anonymous() {
+    if d.getVar("PTEST_ENABLED") == "1":
+        d.appendVar("SRC_URI", "git://github.com/brgl/gpio-sysfs-compat-tests;protocol=https;branch=main;destsuffix=tests;name=tests")
+        d.setVar("SRCREV_tests", "a3c9daa4650dd1e8d7fd8972db68d9c2c204263d")
+}
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${UNPACKDIR}/run-ptest.in ${D}${PTEST_PATH}/run-ptest
+    sed -i "s:@mountpoint@:$MOUNTPOINT:g" ${D}${PTEST_PATH}/run-ptest
+    install -m 0755 ${UNPACKDIR}/tests/gpio-sysfs-compat-tests ${D}${PTEST_PATH}/tests/gpio-sysfs-compat-tests
+}
+
+# Test user is created for verifying chown() and chmod() operations.
+USERADD_PACKAGES = "${PN}-ptest"
+GROUPADD_PARAM:${PN}-ptest = "--system gpio-test"
+USERADD_PARAM:${PN}-ptest = "--system -M -s /bin/nologin -g gpio-test gpio-test"
+
+RDEPENDS:${PN}-ptest += "kmod"
+RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs"
diff --git a/meta-filesystems/recipes-filesystems/burnia/libburn/0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch b/meta-filesystems/recipes-filesystems/burnia/libburn/0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch
new file mode 100644
index 0000000000..6061352cb7
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/burnia/libburn/0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch
@@ -0,0 +1,27 @@
+From d537f9dd35282df834a311ead5f113af67d223b3 Mon Sep 17 00:00:00 2001
+From: Thomas Schmitt <scdbackup@gmx.net>
+Date: Tue, 26 Nov 2024 23:02:03 +0100
+Subject: [PATCH] Bug fix: Faulty signal handler prototype spoiled compilation
+ under C23
+
+Upstream-Status: Backport [https://dev.lovelyhq.com/libburnia/libburn/commit/d537f9dd35282df834a311ead5f113af67d223b3]
+---
+ test/poll.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/poll.c b/test/poll.c
+index 660f384..cd5ff90 100644
+--- a/test/poll.c
++++ b/test/poll.c
+@@ -14,7 +14,7 @@ static struct burn_drive_info *drives;
+ static unsigned int n_drives;
+ int NEXT;
+ 
+-static void catch_int ()
++static void catch_int (int signum)
+ {
+        NEXT = 1;
+ }
+-- 
+2.34.1
+
diff --git a/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb b/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb
index e0f6664ab3..e84a60a543 100644
--- a/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb
+++ b/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb
@@ -5,7 +5,9 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
                     file://COPYRIGHT;md5=a91b9b862895b64e68e5b321873c9111"
 
-SRC_URI = "http://files.libburnia-project.org/releases/${BP}.tar.gz"
+SRC_URI = "http://files.libburnia-project.org/releases/${BP}.tar.gz \
+           file://0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch"
+
 SRC_URI[sha256sum] = "7295491b4be5eeac5e7a3fb2067e236e2955ffdc6bbd45f546466edee321644b"
 
 inherit autotools pkgconfig lib_package
diff --git a/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb b/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb
index 5dc3ea6632..2370633551 100644
--- a/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb
+++ b/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb
@@ -11,7 +11,7 @@ RDEPENDS:${PN} += "fuse"
 SRC_URI += "${SOURCEFORGE_MIRROR}/project/httpfs/httpfs2/httpfs2-${PV}.tar.gz"
 SRC_URI[sha256sum] = "01cb4bb38deb344f540da6f1464dc7edbdeb51213ad810b8c9c282c1e17e0fc1"
 
-S = "${WORKDIR}/httpfs2-${PV}"
+S = "${UNPACKDIR}/httpfs2-${PV}"
 
 do_compile() {
     oe_runmake -C ${S} httpfs2
diff --git a/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb b/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb
index c9702eb93e..5fbeab53d8 100644
--- a/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb
+++ b/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb
@@ -1,7 +1,7 @@
 SUMMARY = "A fuse filesystem to access the contents of an iPhone or iPod Touch"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7"
-HOMEPAGE ="http://www.libimobiledevice.org/"
+HOMEPAGE = "http://www.libimobiledevice.org/"
 
 DEPENDS = "fuse libimobiledevice"
 
diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
index 7d0a83609e..06051d8013 100644
--- a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
+++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git;branch=master;protocol=h
            "
 SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "CC="${CC}" LD="${LD}" AR="${AR}""
 
diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch
new file mode 100644
index 0000000000..3160f56880
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch
@@ -0,0 +1,42 @@
+From 7b6210c5be46e5120b42c09f910e8f104bf3edf1 Mon Sep 17 00:00:00 2001
+From: Erik Larsson <erik@tuxera.com>
+Date: Tue, 13 Jun 2023 17:47:15 +0300
+Subject: [PATCH] unistr.c: Fix use-after-free in 'ntfs_uppercase_mbs'.
+
+If 'utf8_to_unicode' throws an error due to an invalid UTF-8 sequence,
+then 'n' will be less than 0 and the loop will terminate without storing
+anything in '*t'. After the loop the uppercase string's allocation is
+freed, however after it is freed it is unconditionally accessed through
+'*t', which points into the freed allocation, for the purpose of NULL-
+terminating the string. This leads to a use-after-free.
+Fixed by only NULL-terminating the string when no error has been thrown.
+
+Thanks for Jeffrey Bencteux for reporting this issue:
+https://github.com/tuxera/ntfs-3g/issues/84
+
+Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/75dcdc2cf37478fad6c0e3427403d198b554951d]
+CVE: CVE-2023-52890
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+---
+ libntfs-3g/unistr.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libntfs-3g/unistr.c b/libntfs-3g/unistr.c
+index 5854b3b..db8ddf4 100644
+--- a/libntfs-3g/unistr.c
++++ b/libntfs-3g/unistr.c
+@@ -1189,8 +1189,9 @@ char *ntfs_uppercase_mbs(const char *low,
+                        free(upp);
+                        upp = (char*)NULL;
+                        errno = EILSEQ;
++               } else {
++                       *t = 0;
+                }
+-               *t = 0;
+        }
+        return (upp);
+ }
+-- 
+2.34.1
+
diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb
index 37a8106bb0..4c7fff8ea9 100644
--- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb
+++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb
@@ -8,8 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \
            file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \
+           file://0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch \
 "
-S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}"
+S = "${UNPACKDIR}/ntfs-3g_ntfsprogs-${PV}"
 SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c"
 
 UPSTREAM_CHECK_URI = "https://www.tuxera.com/community/open-source-ntfs-3g/"
diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb
index 7768a734d6..890c8aecc0 100644
--- a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb
+++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/owfs/owfs;branch=master;protocol=https \
            file://owserver \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep update-rc.d pkgconfig systemd
 
diff --git a/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb b/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb
index b8399265cd..05a1004b65 100644
--- a/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb
+++ b/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb
@@ -11,4 +11,3 @@ inherit autotools pkgconfig
 SRC_URI = "git://github.com/phatina/simple-mtpfs.git;protocol=https;branch=master"
 SRCREV = "19e7bb9b608b0c0dce2ee6f56fac75901bc69529"
 
-S = "${WORKDIR}/git"
diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
index 2d9eab1dd5..97c7ad396e 100644
--- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
+++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "SMBNetFS is a Linux/FreeBSD filesystem that allow you to use \
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
-HOMEPAGE ="http://sourceforge.net/projects/smbnetfs"
+HOMEPAGE = "http://sourceforge.net/projects/smbnetfs"
 
 DEPENDS = "fuse samba"
 DEPENDS:append:libc-musl = " libexecinfo"
@@ -27,6 +27,5 @@ SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=m
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[libsecret] = "--with-libsecret=yes,--with-libsecret=no,libsecret"
 
-S = "${WORKDIR}/git"
 
 LDFLAGS:append:libc-musl = " -lexecinfo"
diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest
index b63c4de0d9..5aab54d5b5 100644
--- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest
+++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/run-ptest
@@ -1,3 +1,11 @@
 #!/bin/sh
+mkdir -p ~/.ssh
+cat > ~/.ssh/config << EOF
+Host *
+  CheckHostIP no
+  StrictHostKeyChecking no
+  UserKnownHostsFile=/dev/null
+EOF
+pytest --automake
 
-pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}'
+rm -rf ~/.ssh/config
diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb
index 5a926dac0c..c3a00566ab 100644
--- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb
+++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb
@@ -10,16 +10,17 @@ SRC_URI = "git://github.com/libfuse/sshfs;branch=master;protocol=https \
            file://a1d58ae1be99571a88b8439b027abe6349b74658.patch \
 "
 SRCREV = "c91eb9a9a992f1a36c49a8e6f1146e45b5e1c8e7"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig ptest
 
 SRC_URI += " \
         file://run-ptest \
 "
-
+#python3-compile for filecmp module
 RDEPENDS:${PN}-ptest += " \
+        python3-compile \
         python3-pytest \
+        python3-unittest-automake-output \
         bash \
         fuse \
 "
@@ -27,4 +28,5 @@ RDEPENDS:${PN}-ptest += " \
 do_install_ptest() {
         install -d ${D}${PTEST_PATH}/test
         cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/
+        ln -sf ${bindir}/sshfs ${D}${PTEST_PATH}/sshfs
 }
diff --git a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb
index e8fda05365..fc474e3238 100644
--- a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb
+++ b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb
@@ -14,6 +14,5 @@ SRCREV = "773f1853b043eeb64b7459f903a2c65bd096f9d9"
 DEPENDS = "fuse3"
 RDEPENDS:${PN} = "bash"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-Makefile-add-LDFLAGS.patch
index bb21899eb3..ac38115952 100644
--- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch
+++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-Makefile-add-LDFLAGS.patch
@@ -1,12 +1,20 @@
+From 8393f9d64b4cead722ee1a7674da1c41b33cfdcc Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Fri, 20 Jun 2025 15:08:19 +0800
+Subject: [PATCH] Makefile: add LDFLAGS
+
 Upstream-Status: Pending
 
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ utils/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/utils/Makefile b/utils/Makefile
-index 710ebbf..6259893 100644
+index a00fa13..13e91f7 100644
 --- a/utils/Makefile
 +++ b/utils/Makefile
-@@ -57,10 +57,10 @@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c
+@@ -56,10 +56,10 @@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c
         $(CC) -c $(CFLAGS) $< -o $@
  
  mkyaffsimage: $(MKYAFFSIMAGEOBJS) $(COMMONOBJS)
@@ -19,3 +27,6 @@ index 710ebbf..6259893 100644
  
  
  clean:
+-- 
+2.34.1
+
diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0002-define-loff_t-if-not-already-defined.patch
index 6cedc3cb4e..24d1eaa596 100644
--- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch
+++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0002-define-loff_t-if-not-already-defined.patch
@@ -1,22 +1,22 @@
-From 848717da4a28d33f8aa8f889377e61e6b1b8ae67 Mon Sep 17 00:00:00 2001
+From 72f923440fef3b875e5570094e4cf398a201521f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 13 Jul 2017 18:29:52 -0700
 Subject: [PATCH] define loff_t if not already defined
 
 Helps to build with musl
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
 Upstream-Status: Pending
 
- yaffs_guts.h | 4 ++++
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ core/yaffs_guts.h | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/yaffs_guts.h b/yaffs_guts.h
-index 6bcf12d..4af17ce 100644
---- a/yaffs_guts.h
-+++ b/yaffs_guts.h
-@@ -18,6 +18,10 @@
+diff --git a/core/yaffs_guts.h b/core/yaffs_guts.h
+index 74ded0b..4bd2646 100644
+--- a/core/yaffs_guts.h
++++ b/core/yaffs_guts.h
+@@ -17,6 +17,10 @@
  
  #include "yportenv.h"
  
@@ -28,5 +28,5 @@ index 6bcf12d..4af17ce 100644
  #define YAFFS_FAIL  0
  
 -- 
-2.13.2
+2.34.1
 
diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0003-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch
index 98c27d2654..5b67ceddff 100644
--- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch
+++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0003-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch
@@ -1,4 +1,4 @@
-From 05cc2b958090f96d6fa128da43aa69669625e529 Mon Sep 17 00:00:00 2001
+From 75fe0fbe254f63fe58d22f2d6090e9a8b3a6fe41 Mon Sep 17 00:00:00 2001
 From: Robert Yang <liezhi.yang@windriver.com>
 Date: Tue, 5 Mar 2024 12:03:23 +0000
 Subject: [PATCH] yaffs_guts.h: define YTIME_T if not already defined
@@ -11,14 +11,14 @@ Upstream-Status: Pending
 
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 ---
- yaffs_guts.h | 4 ++++
+ core/yaffs_guts.h | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/yaffs_guts.h b/yaffs_guts.h
-index 74ded0b..598271b 100644
---- a/yaffs_guts.h
-+++ b/yaffs_guts.h
-@@ -487,6 +487,10 @@ struct yaffs_obj {
+diff --git a/core/yaffs_guts.h b/core/yaffs_guts.h
+index 4bd2646..507bf16 100644
+--- a/core/yaffs_guts.h
++++ b/core/yaffs_guts.h
+@@ -491,6 +491,10 @@ struct yaffs_obj {
  
         YCHAR short_name[YAFFS_SHORT_NAME_LENGTH + 1];
  
@@ -30,5 +30,5 @@ index 74ded0b..598271b 100644
         //these are always 64 bits
         u32 win_ctime[2];
 -- 
-2.35.5
+2.34.1
 
diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0004-utils-Makefile-fix-symbolic-links.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0004-utils-Makefile-fix-symbolic-links.patch
new file mode 100644
index 0000000000..987652afce
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0004-utils-Makefile-fix-symbolic-links.patch
@@ -0,0 +1,34 @@
+From 8349d121e3595ac4d935169150984260f8b697b9 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Fri, 20 Jun 2025 15:20:05 +0800
+Subject: [PATCH] utils/Makefile: fix symbolic links
+
+Create correct symlinks to fix the following error:
+
+mkyaffsimage.c:29:10: fatal error: yaffs_ecc.h: No such file or directory
+   29 | #include "yaffs_ecc.h"
+      |          ^~~~~~~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/Aleph-One-Ltd/yaffs2/pull/13]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ utils/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/Makefile b/utils/Makefile
+index a00fa13..22c2fdb 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -45,7 +45,7 @@ ALL_LINKS = $(BASE_LINKS) $(DIRECT_LINKS)
+ all: mkyaffsimage mkyaffs2image
+ 
+ $(BASE_LINKS):
+-       ln -s ../$@ $@
++       ln -s ../core/$@ $@
+ 
+ $(DIRECT_LINKS):
+        ln -s ../direct/$@ $@
+-- 
+2.34.1
+
diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
index ca5e3302b3..d30309a95a 100644
--- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
+++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
@@ -14,18 +14,17 @@ PV = "20221209"
 
 DEPENDS = "mtd-utils"
 
-# Source is the HEAD of master branch at the time of writing this recipe
-SRC_URI = "git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master \
-           file://makefile-add-ldflags.patch \
-           file://0001-define-loff_t-if-not-already-defined.patch \
-           file://0001-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch \
+SRC_URI = "git://github.com/Aleph-One-Ltd/yaffs2;protocol=https;branch=master \
+           file://0001-Makefile-add-LDFLAGS.patch \
+           file://0002-define-loff_t-if-not-already-defined.patch \
+           file://0003-yaffs_guts.h-define-YTIME_T-if-not-already-defined.patch \
+           file://0004-utils-Makefile-fix-symbolic-links.patch \
            "
 
-SRCREV = "613a901a229e8a701c18f003dd0aee18453e0670"
+SRCREV = "68030683543cccb4d942e3fedbcad1dc267e261c"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 CFLAGS:append = " -I.. -DCONFIG_YAFFS_UTIL -DCONFIG_YAFFS_DEFINES_TYPES"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb
index d3ea6797e7..cf56cca84c 100644
--- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb
+++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb
@@ -2,16 +2,15 @@ SUMMARY = "OpenZFS on Linux and FreeBSD"
 DESCRIPTION = "OpenZFS on Linux and FreeBSD"
 LICENSE = "CDDL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa"
-HOMEPAGE ="https://github.com/openzfs/zfs"
+HOMEPAGE = "https://github.com/openzfs/zfs"
 
-SRCREV = "494aaaed89cb9fe9f2da3b6c6f465a4bc9f6a7e1"
+SRCREV = "33174af15112ed5c53299da2d28e763b0163f428"
 SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \
            file://0001-Define-strndupa-if-it-does-not-exist.patch \
            file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \
            file://0001-fs-tests-cmd-readmmap-Replace-uint_t-with-uint32_t.patch \
 "
 
-S = "${WORKDIR}/git"
 
 # Using both 'module' and 'autotools' classes seems a bit odd, they both
 # define a do_compile function.
@@ -20,9 +19,11 @@ inherit module-base pkgconfig autotools bash-completion
 
 DEPENDS = "virtual/kernel zlib util-linux libtirpc openssl curl"
 
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd sysvinit', d)}"
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd sysvinit', d)} \
+                  ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
+                 "
 
-PACKAGECONFIG[pam] = "--enable-pam --with-pamconfigsdir=${datadir}/pam-configs --with-pammoduledir=${libdir}/security, --disable-pam"
+PACKAGECONFIG[pam] = "--enable-pam --with-pamconfigsdir=${datadir}/pam-configs --with-pammoduledir=${base_libdir}/security, --disable-pam"
 PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,"
 PACKAGECONFIG[sysvinit] = "--enable-sysvinit,--disable-sysvinit,"
 
@@ -35,9 +36,15 @@ EXTRA_OECONF:append = " \
     --with-systemdgeneratordir=${nonarch_base_libdir}/systemd/system-generators \
     --with-systemdpresetdir=${nonarch_base_libdir}/systemd/system-preset \
     --with-systemdmodulesloaddir=${sysconfdir}/module-load.d \
-    --without-dracutdir \
+    --without-dracutdir --enable-linux-builtin \
 "
 
+# Reproducibility: Force target distribution ("vendor") to Debian to match
+# default values for things like: NFS server service name, bash completion
+# path, configuration files, ...
+# The Debian values do match the OpenEmbedded ones.
+EXTRA_OECONF:append = " --with-vendor=debian"
+
 EXTRA_OEMAKE:append = " \
     INSTALL_MOD_PATH=${D}${root_prefix} \
 "
@@ -63,6 +70,8 @@ FILES:${PN} += "\
     ${bindir} \
     ${libexecdir}/${BPN} \
     ${libdir} \
+    ${datadir}/pam-configs \
+    ${base_libdir}/security \
 "
 
 FILES:${PN}-dev += "\
diff --git a/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch b/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch
deleted file mode 100644
index d47f692c0e..0000000000
--- a/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-fuse: Fix linking issues with gold linker
-
-fuse has problems when linking with gold since it uses version
-scripts in a way thats so perticular to bfd ld
-
-/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc/sysroots/x86_64-linux/usr/libexec/armv5te-angstrom-linux-gnueabi/gcc/arm-angstro
-error: symbol __fuse_exited has undefined version
-| collect2: ld returned 1 exit status
-| make[1]: *** [libfuse.la] Error 1
-| make[1]: *** Waiting for unfinished jobs....
-
-For more details
-
-http://blog.flameeyes.eu/2011/06/01/gold-readiness-obstacle-2-base-versioning
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=10861
-http://comments.gmane.org/gmane.comp.file-systems.fuse.devel/9524
-http://www.airs.com/blog/archives/300
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- lib/fuse.c             | 10 +++++-----
- lib/fuse_mt.c          |  2 +-
- lib/fuse_versionscript |  3 +++
- lib/helper.c           |  6 +++---
- 4 files changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/lib/fuse.c b/lib/fuse.c
-index 067d0dc..6d27711 100644
---- a/lib/fuse.c
-+++ b/lib/fuse.c
-@@ -4873,11 +4873,11 @@ struct fuse *fuse_new_compat1(int fd, int flags,
-                                      11);
- }
- 
--FUSE_SYMVER(".symver fuse_exited,__fuse_exited@");
--FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@");
--FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@");
--FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@");
--FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@");
-+FUSE_SYMVER(".symver fuse_exited,__fuse_exited@FUSE_UNVERSIONED");
-+FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@FUSE_UNVERSIONED");
-+FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@FUSE_UNVERSIONED");
-+FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@FUSE_UNVERSIONED");
-+FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@FUSE_UNVERSIONED");
- FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2");
- 
- #endif /* __FreeBSD__ || __NetBSD__  */
-diff --git a/lib/fuse_mt.c b/lib/fuse_mt.c
-index f6dbe71..fd5ac23 100644
---- a/lib/fuse_mt.c
-+++ b/lib/fuse_mt.c
-@@ -119,4 +119,4 @@ int fuse_loop_mt(struct fuse *f)
-        return res;
- }
- 
--FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@");
-+FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@FUSE_UNVERSIONED");
-diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
-index 8d91887..de16ab2 100644
---- a/lib/fuse_versionscript
-+++ b/lib/fuse_versionscript
-@@ -1,3 +1,6 @@
-+FUSE_UNVERSIONED {
-+};
-+
- FUSE_2.2 {
-        global:
-                fuse_destroy;
-diff --git a/lib/helper.c b/lib/helper.c
-index b644012..c5349bf 100644
---- a/lib/helper.c
-+++ b/lib/helper.c
-@@ -436,10 +436,10 @@ int fuse_mount_compat1(const char *mountpoint, const char *args[])
-        return fuse_mount_compat22(mountpoint, NULL);
- }
- 
--FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@");
-+FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@FUSE_UNVERSIONED");
- FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2");
--FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@");
--FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@");
-+FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@FUSE_UNVERSIONED");
-+FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@FUSE_UNVERSIONED");
- FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2");
- 
- #endif /* __FreeBSD__ || __NetBSD__ */
--- 
-1.8.1.2
-
diff --git a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
index 6f613e9cd1..094ed8c8ad 100644
--- a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
+++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "https://github.com/libfuse/libfuse/releases/download/${BP}/${BP}.tar.gz \
-           file://gold-unversioned-symbol.patch \
            file://aarch64.patch \
            file://0001-fuse-fix-the-return-value-of-help-option.patch \
            file://fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch \
@@ -23,7 +22,7 @@ SRC_URI[sha256sum] = "d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7
 UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases"
 UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>2(\.\d+)+).tar.gz"
 
-CVE_PRODUCT = "fuse_project:fuse"
+CVE_PRODUCT = "fuse_project:fuse fuse:fuse"
 
 inherit autotools pkgconfig update-rc.d systemd
 
diff --git a/meta-filesystems/recipes-support/python3-fuse/python3-fuse_1.0.9.bb b/meta-filesystems/recipes-support/python3-fuse/python3-fuse_1.0.9.bb
new file mode 100644
index 0000000000..95351cc314
--- /dev/null
+++ b/meta-filesystems/recipes-support/python3-fuse/python3-fuse_1.0.9.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Python bindings for libfuse2."
+
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
+
+inherit setuptools3 pypi pkgconfig
+
+SRC_URI[sha256sum] = "9ed59577c36ab218d700aa2839f021f12c252b357186057572b98e19bc2a8589"
+
+DEPENDS = "fuse python3-setuptools-native"
+
+PYPI_PACKAGE = "fuse_python"
diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
index 4d2b909809..913b2c1d32 100644
--- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
+++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
@@ -21,7 +21,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 PV = "4.9+git"
 
-S = "${WORKDIR}/git"
 
 export HOSTCC = "${BUILD_CC}"
 do_configure:prepend() {
diff --git a/meta-filesystems/recipes-utils/binfs/bindfs_1.17.7.bb b/meta-filesystems/recipes-utils/binfs/bindfs_1.18.1.bb
index 788c85b7ce..abb7dceaa7 100644
--- a/meta-filesystems/recipes-utils/binfs/bindfs_1.17.7.bb
+++ b/meta-filesystems/recipes-utils/binfs/bindfs_1.18.1.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "fuse"
 RDEPENDS:${PN} = "fuse"
 
-SRC_URI = "git://github.com/mpartel/bindfs;protocol=https;branch=master"
-SRCREV = "3f5e3cb1fcac5fb8034fa4712764317fab51ebe0"
+SRC_URI = "git://github.com/mpartel/bindfs;protocol=https;branch=master;tag=${PV}"
+SRCREV = "70a663b3476c0b9b21b626473c00c68a3dc97b92"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gettext
diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb
index b4e5da6e20..645e38ca49 100644
--- a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb
+++ b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb
@@ -20,7 +20,6 @@ UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)"
 
 RDEPENDS:${PN} = "bash btrfs-tools"
 
-S = "${WORKDIR}/git"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
new file mode 100644
index 0000000000..a60fbec821
--- /dev/null
+++ b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
@@ -0,0 +1,46 @@
+SUMMARY = "Set of GPL'ed utilities to ext2/ext3 filesystem."
+DESCRIPTION = "e2tools is a simple set of GPL'ed utilities to read, write, \
+and manipulate files in an ext2/ext3 filesystem. These utilities access a \
+filesystem directly using the ext2fs library. Can also be used on a Linux \
+machine to read/write to disk images or floppies without having to mount \
+them or have root access."
+HOMEPAGE = "https://github.com/e2tools/e2tools"
+SECTION = "base"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS += "coreutils e2fsprogs"
+
+SRC_URI = " \
+           git://github.com/e2tools/e2tools;protocol=https;branch=master \
+           file://run-ptest \
+"
+
+SRCREV = "46da6c398e70635a296245851fcedbc56c35e824"
+
+
+inherit autotools pkgconfig ptest
+
+# Otherwise these tools will be detected from build host and
+# assumptions will go wrong, Fun of cross compiling
+EXTRA_OECONF += "\
+                ac_cv_path_MKE2FS=${base_sbindir}/mke2fs \
+                ac_cv_path_CHMOD=${base_bindir}/chmod \
+                ac_cv_path_DD=${base_bindir}/dd \
+                ac_cv_path_GREP=${base_bindir}/grep \
+                "
+
+do_install_ptest() {
+    rm -rf "${D}${PTEST_PATH}/*"
+    cp -r ../build "${D}${PTEST_PATH}"
+    cp -r "${S}/build-aux" "${D}${PTEST_PATH}/build"
+    cp -r "${S}" "${D}${PTEST_PATH}"
+    rm -rf ${D}${PTEST_PATH}/build/config.log ${D}${PTEST_PATH}/build/autom4te.cache \
+        ${D}${PTEST_PATH}/git/.git ${D}${PTEST_PATH}/git/autom4te.cache
+    sed -i -e 's;${TMPDIR};;g' ${D}${PTEST_PATH}/build/config.status
+    sed -i -e 's;${STAGING_DIR_NATIVE};;g' ${D}${PTEST_PATH}/${BP}/autom4te.cache/*
+}
+
+RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl"
+
+BBCLASSEXTEND = "native"
diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb
deleted file mode 100644
index 1fa5e01874..0000000000
--- a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb
+++ /dev/null
@@ -1,75 +0,0 @@
-SUMMARY = "Set of GPL'ed utilities to ext2/ext3 filesystem."
-DESCRIPTION = "e2tools is a simple set of GPL'ed utilities to read, write, \
-and manipulate files in an ext2/ext3 filesystem. These utilities access a \
-filesystem directly using the ext2fs library. Can also be used on a Linux \
-machine to read/write to disk images or floppies without having to mount \
-them or have root access."
-HOMEPAGE = "https://github.com/e2tools/e2tools"
-SECTION = "base"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-DEPENDS += "coreutils e2fsprogs"
-
-PV = "0.1.0+git"
-
-SRC_URI = " \
-           git://github.com/e2tools/e2tools;protocol=https;branch=master \
-           file://run-ptest \
-"
-
-SRCREV = "fd092754a6b65c3a769f74f888668c066f09c36d"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig ptest
-
-do_configure:prepend() {
-    git -C "${WORKDIR}/git" reset --hard HEAD
-
-    # To install ptest for this package, special configuration needs to be
-    # done before do_configure(). So, do_configure_ptest() which is scheduled
-    # after do_configure() cannot be used.
-
-    # We only do special configuration if we are installing ptest for this
-    # package.
-    if [ "${@d.getVar('PTEST_ENABLED')}" -eq "1" ]; then
-        # Since we guarantee run-time dependency when installing the ptest for
-        # this package, we do not need the check macros under section "checks
-        # for programs" in "configure.ac". Plus, these check macros set the
-        # ouput variables to incorrect values as these checks are performed on
-        # the host environment. Still, we need these variables outputted from
-        # these check macros. So, we insert the following lines to manually
-        # set these output variables to the correct value in "configure.ac".
-
-        # Note that HAVE_DD_COMMAND and HAVE_MKE2FS_COMMAND are only ever used
-        # in tests/Makefile-files which determines whether to include the test
-        # cases. As for output variables CHMOD, DD, and MKE2FS, they only
-        # point to the programs which test cases need to run. Since these
-        # commands are guaranteed to be present due to RDEPENDS and are
-        # guaranteed to be accessible under PATH environment variable on the
-        # target, we only need to specify the name of these programs.
-
-        perl -i -0777 -pe 's/(^dnl\s*=+\s*^dnl\s*Checks for compiler flags\s*^dnl\s*=+)/
-AC_SUBST([CHMOD], 'chmod')
-AC_SUBST([DD], 'dd')
-AC_SUBST([MKE2FS], 'mke2fs')
-AM_CONDITIONAL([HAVE_DD_COMMAND], [true])
-AM_CONDITIONAL([HAVE_MKE2FS_COMMAND], [true])
-\1/ms' "${WORKDIR}/git/configure.ac"
-    fi
-}
-
-do_install_ptest() {
-    rm -rf "${D}${PTEST_PATH}/*"
-    cp -r ../build "${D}${PTEST_PATH}"
-    cp -r "${S}/build-aux" "${D}${PTEST_PATH}/build"
-    cp -r "${S}" "${D}${PTEST_PATH}"
-    rm -rf ${D}${PTEST_PATH}/build/config.log ${D}${PTEST_PATH}/build/autom4te.cache \
-        ${D}${PTEST_PATH}/git/.git ${D}${PTEST_PATH}/git/autom4te.cache
-    sed -i -e 's;${RECIPE_SYSROOT};;g' ${D}${PTEST_PATH}/build/config.status
-}
-
-RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl"
-
-BBCLASSEXTEND = "native"
diff --git a/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.4.bb b/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.6.bb
index aa6a199784..39411b4cee 100644
--- a/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.4.bb
+++ b/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.6.bb
@@ -12,7 +12,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "ad38126dfd9f74f8c6ecb35ddfd34d2582601d6c3ff26756610b8418360c8ee2"
+SRC_URI[sha256sum] = "89d05b7a9537f2413079b724ec8d02d7a2e291c29c52e7256303e9456200fb0f"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch
new file mode 100644
index 0000000000..4981c2151d
--- /dev/null
+++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch
@@ -0,0 +1,40 @@
+From 6617d15a660becc23825007ab3fc2d270b5b250f Mon Sep 17 00:00:00 2001
+From: Jaegeuk Kim <jaegeuk@kernel.org>
+Date: Thu, 24 Oct 2024 20:33:38 +0000
+Subject: [PATCH] f2fs-tools: use stdbool.h instead of bool
+
+The existing bool definition is broken for c23,i where bool is now a keyword.
+
+Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=6617d15a660becc23825007ab3fc2d270b5b250f]
+
+Signed-off-by: Elliott Hughes <enh@google.com>
+Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+---
+ include/f2fs_fs.h | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
+index 9534da9..0cb9228 100644
+--- a/include/f2fs_fs.h
++++ b/include/f2fs_fs.h
+@@ -28,6 +28,7 @@
+ #include <stddef.h>
+ #include <string.h>
+ #include <time.h>
++#include <stdbool.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+@@ -119,9 +120,6 @@ typedef uint16_t    u16;
+ typedef uint8_t                u8;
+ typedef u32            block_t;
+ typedef u32            nid_t;
+-#ifndef bool
+-typedef u8             bool;
+-#endif
+ typedef unsigned long  pgoff_t;
+ typedef unsigned short umode_t;
+ 
+-- 
+2.34.1
+
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb
index 997fa1240a..68727b008e 100644
--- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb
+++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb
@@ -9,11 +9,11 @@ DEPENDS = "util-linux"
 
 SRCREV = "06c027abc6153c4a97cba5317844e8dcaaee3cf7"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;branch=master \
+           file://0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch \
            file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools
 
diff --git a/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb b/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb
index 214b3f914c..bdde0d311a 100644
--- a/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb
+++ b/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb
@@ -15,6 +15,5 @@ SRC_URI = "git://github.com/Gregwar/fatcat.git;branch=master;protocol=https \
 
 SRCREV = "99cb99fc86eb1601ac7ae27f5bba23add04d2543"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
diff --git a/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb b/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb
index cf7ac62be8..7f90bfd666 100644
--- a/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb
+++ b/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Resize FAT partitions using libparted"
 SECTION = "console/tools"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https;branch=master \
@@ -9,7 +9,6 @@ SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https;branc
           "
 SRCREV = "12da22087de2ec43f0fe5af1237389e94619c483"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "parted"
 
diff --git a/meta-filesystems/recipes-utils/nilfs-utils/nilfs-utils_v2.2.11.bb b/meta-filesystems/recipes-utils/nilfs-utils/nilfs-utils_v2.2.11.bb
new file mode 100644
index 0000000000..507684a395
--- /dev/null
+++ b/meta-filesystems/recipes-utils/nilfs-utils/nilfs-utils_v2.2.11.bb
@@ -0,0 +1,12 @@
+SUMMARY = "nilfs-utils is a set of utilities for managing the NILFS filesystem."
+HOMEPAGE = "https://nilfs.sourceforge.io/"
+
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=385034ac639a62b8415db9814582ee98"
+SRC_URI = "git://github.com/nilfs-dev/nilfs-utils.git;protocol=https;branch=v2.2.y;tag=${PV}"
+
+SRCREV = "507064bb3604d0fd88f5e3f6422d9ade73a26120"
+
+DEPENDS = "util-linux util-linux-libuuid"
+
+inherit autotools
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch
new file mode 100644
index 0000000000..78802e39ab
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch
@@ -0,0 +1,38 @@
+From 2fa94fc7adf05fae46204f4665216c8b019010f3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 5 Jul 2024 23:16:38 -0700
+Subject: [PATCH 1/2] always use glibc basename()
+
+There is a use of basename() which expects it to be GNU version of
+basename, which is not available in other libcs e.g. musl on Linux
+therefore provide a version for such cases
+
+Upstream-Status: Submitted [https://github.com/kmxz/overlayfs-tools/pull/26]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ main.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/main.c b/main.c
+index 7b669eb..ea0f5a5 100644
+--- a/main.c
++++ b/main.c
+@@ -30,6 +30,18 @@ bool brief;
+ bool ignore;
+ extern char *program_name;
+ 
++#ifndef __GLIBC__
++/*
++ * GNU basename implementation
++ */
++static const char *__basename(const char *filename) {
++    char *p = strrchr(filename, '/');
++    return p ? p + 1 : filename;
++}
++
++#define basename(x) __basename(x)
++#endif
++
+ void print_help(const char *program) {
+     printf("Usage: %s command options\n", program);
+     puts("");
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch
new file mode 100644
index 0000000000..845306292e
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch
@@ -0,0 +1,56 @@
+From be694ba90aa2e0fed3a4e9b53ad7a61efd0430c5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 5 Jul 2024 23:18:07 -0700
+Subject: [PATCH 2/2] Change program_name to have const attribute
+
+This is how it is used in all places and it also avoids a const to
+non-const conversion warning
+
+Upstream-Status: Submitted [https://github.com/kmxz/overlayfs-tools/pull/26]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ common.c | 2 +-
+ fsck.c   | 2 +-
+ main.c   | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/common.c b/common.c
+index eaf24a8..a15b66f 100644
+--- a/common.c
++++ b/common.c
+@@ -29,7 +29,7 @@
+ #include "common.h"
+ #include "config.h"
+ 
+-char *program_name;
++const char *program_name;
+ 
+ /* #define DEBUG 1 */
+ #ifdef DEBUG
+diff --git a/fsck.c b/fsck.c
+index 4e513f5..285b9f1 100644
+--- a/fsck.c
++++ b/fsck.c
+@@ -46,7 +46,7 @@
+ #include "mount.h"
+ #include "overlayfs.h"
+ 
+-extern char *program_name;
++extern const char *program_name;
+ 
+ struct ovl_fs ofs = {};
+ int flags = 0;         /* user input option flags */
+diff --git a/main.c b/main.c
+index ea0f5a5..1a8b239 100644
+--- a/main.c
++++ b/main.c
+@@ -28,7 +28,7 @@
+ bool verbose;
+ bool brief;
+ bool ignore;
+-extern char *program_name;
++extern const char *program_name;
+ 
+ #ifndef __GLIBC__
+ /*
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb
deleted file mode 100644
index 47613207af..0000000000
--- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Maintenance tools for OverlayFS"
-HOMEPAGE = "https://github.com/kmxz/overlayfs-tools"
-LICENSE = "WTFPL"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69"
-
-SRC_URI = "\
-    git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \
-"
-
-PV = "1.0+git"
-SRCREV = "b5e5a829895ac98ccfe4629fbfbd8b819262bd00"
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-# Required to have the fts.h header for musl
-DEPENDS:append:libc-musl = " fts"
-
-EXTRA_OEMAKE += "'CC=${CC} -O2'"
-# Fix the missing fts libs when using musl
-EXTRA_OEMAKE:append:libc-musl = " LDLIBS=-lfts"
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_install () {
-    install -d ${D}${bindir}
-    install -m 0755 ${B}/overlay ${D}${bindir}
-    install -m 0755 ${B}/fsck.overlay ${D}${bindir}
-}
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb
new file mode 100644
index 0000000000..708bbfcf02
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Maintenance tools for OverlayFS"
+HOMEPAGE = "https://github.com/kmxz/overlayfs-tools"
+LICENSE = "WTFPL"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69"
+
+SRC_URI = "\
+    git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \
+    file://0001-always-use-glibc-basename.patch \
+    file://0002-Change-program_name-to-have-const-attribute.patch \
+"
+
+SRCREV = "7a4a0c4f2c6c86aa46a40e3468e394fd4a237491"
+
+
+inherit meson pkgconfig
+
+DEPENDS:append:libc-musl = " fts"
diff --git a/meta-filesystems/recipes-utils/udevil/files/Fix-build-with-gcc15.patch b/meta-filesystems/recipes-utils/udevil/files/Fix-build-with-gcc15.patch
new file mode 100644
index 0000000000..bad23327bf
--- /dev/null
+++ b/meta-filesystems/recipes-utils/udevil/files/Fix-build-with-gcc15.patch
@@ -0,0 +1,68 @@
+Fix build with gcc-15
+
+Fix the following errors:
+../../udevil-0.4.4/src/udevil.c: In function 'command_monitor':
+../../udevil-0.4.4/src/udevil.c:4891:21: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
+ 4891 |     signal(SIGTERM, command_monitor_finalize );
+      |                     ^~~~~~~~~~~~~~~~~~~~~~~~
+      |                     |
+      |                     void (*)(void)
+In file included from /home/worker/nano-ai/build-nano-ai/BUILD/work/qcs8550_aihub-webos-linux/udevil/0.4.4/recipe-sysroot/usr/include/sys/wait.h:36,
+                 from ../../udevil-0.4.4/src/udevil.c:10:
+/home/worker/nano-ai/build-nano-ai/BUILD/work/qcs8550_aihub-webos-linux/udevil/0.4.4/recipe-sysroot/usr/include/signal.h:88:57: note: expected '__sighandler_t' {aka 'void (*)(int)'} but argument is of type 'void (*)(void)'
+   88 | extern __sighandler_t signal (int __sig, __sighandler_t __handler)
+      |                                          ~~~~~~~~~~~~~~~^~~~~~~~~
+../../udevil-0.4.4/src/udevil.c:4798:6: note: 'command_monitor_finalize' declared here
+ 4798 | void command_monitor_finalize()
+      |      ^~~~~~~~~~~~~~~~~~~~~~~~
+/home/worker/nano-ai/build-nano-ai/BUILD/work/qcs8550_aihub-webos-linux/udevil/0.4.4/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
+   72 | typedef void (*__sighandler_t) (int);
+      |                ^~~~~~~~~~~~~~
+...
+../../udevil-0.4.4/src/udevil.c: In function 'main':
+../../udevil-0.4.4/src/udevil.c:5035:22: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
+ 5035 |     signal( SIGTERM, command_interrupt );
+      |                      ^~~~~~~~~~~~~~~~~
+      |                      |
+      |                      void (*)(void)
+/home/worker/nano-ai/build-nano-ai/BUILD/work/qcs8550_aihub-webos-linux/udevil/0.4.4/recipe-sysroot/usr/include/signal.h:88:57: note: expected '__sighandler_t' {aka 'void (*)(int)'} but argument is of type 'void (*)(void)'
+   88 | extern __sighandler_t signal (int __sig, __sighandler_t __handler)
+      |                                          ~~~~~~~~~~~~~~~^~~~~~~~~
+../../udevil-0.4.4/src/udevil.c:4916:6: note: 'command_interrupt' declared here
+ 4916 | void command_interrupt()
+      |      ^~~~~~~~~~~~~~~~~
+/home/worker/nano-ai/build-nano-ai/BUILD/work/qcs8550_aihub-webos-linux/udevil/0.4.4/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
+   72 | typedef void (*__sighandler_t) (int);
+      |                ^~~~~~~~~~~~~~
+../../udevil-0.4.4/src/udevil.c:5036:22: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
+ 5036 |     signal( SIGINT,  command_interrupt );
+      |                      ^~~~~~~~~~~~~~~~~
+      |                      |
+      |                      void (*)(void)
+
+Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
+
+Upstream-Status: Inactive-Upstream [lastrelease: 10years ago]
+---
+diff --git a/src/udevil.c b/src/udevil.c
+index bab80e9..da629d9 100644
+--- a/src/udevil.c
++++ b/src/udevil.c
+@@ -4795,7 +4795,7 @@ static int command_info( CommandData* data )
+     return ret;
+ }
+ 
+-void command_monitor_finalize()
++void command_monitor_finalize(int)
+ {
+     //if (signal == SIGINT || signal == SIGTERM)
+     //printf( "\nudevil: SIGINT || SIGTERM\n");
+@@ -4913,7 +4913,7 @@ finish_:
+     return 1;
+ }
+ 
+-void command_interrupt()
++void command_interrupt(int)
+ {
+     if ( udev )
+     {
diff --git a/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb b/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
index 20d6036686..c745485a64 100644
--- a/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
+++ b/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
@@ -16,6 +16,7 @@ inherit autotools pkgconfig systemd
 SRC_URI = "https://github.com/IgnorantGuru/udevil/raw/pkg/${PV}/udevil-${PV}.tar.xz \
     file://0001-udevil-0.4.3-fix-compile-with-gcc6.patch \
     file://0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch \
+    file://Fix-build-with-gcc15.patch \
 "
 
 SRC_URI[md5sum] = "dc1c489b603a0500a04dc7e1805ac1d9"
diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_4.13.5.bb b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_6.14.11.bb
index 7126684e61..a22e54e24c 100644
--- a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_4.13.5.bb
+++ b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_6.14.11.bb
@@ -4,14 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 BRANCH ?= "dev"
 
-SRCREV = "18c0a8454ca1cf8969170049f8c628d88627beec"
+SRCREV = "5539a8ad8e1a9b7ea8b62213ed72eb939c5381b7"
 
 SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=https;branch=${BRANCH} \
           "
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" CFLAGS="${CFLAGS}""
 
diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.12.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.2.0.bb
index 9c0394918e..c65344f536 100644
--- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.12.bb
+++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.2.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \
            file://0001-include-libgen.h-for-basename-API-prototype.patch \
            ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \
            "
-SRC_URI[sha256sum] = "f39c4c1b306b2dd7ec979c0e94d60fe69083d2ecf9af051cac5ef3bed772c74a"
+SRC_URI[sha256sum] = "2914dbbe1ebc88c7d93ad88e220aa57dabc43d216e11f06221c01edf3cc10732"
 
 inherit autotools-brokensep
 
diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb
index 07c5e97dbb..907b875718 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb
+++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb
@@ -44,9 +44,9 @@ PACKAGECONFIG ??= "blkid"
 
 PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux"
 
-export DEBUG="-DNDEBUG"
-export BUILD_VERBOSE="1"
-export tagname="CC"
+export DEBUG = "-DNDEBUG"
+export BUILD_VERBOSE = "1"
+export tagname = "CC"
 
 EXTRA_OEMAKE = "DIST_ROOT='${D}'"
 
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch
new file mode 100644
index 0000000000..6ac2dd92b4
--- /dev/null
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch
@@ -0,0 +1,33 @@
+From c3cc5c68a297a98adb9a7046c7563d0678245243 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Sun, 27 Apr 2025 20:29:09 +0200
+Subject: [PATCH] bstat: use uint32_t instead of __uint32_t to fix build with
+ musl
+
+* with musl this fails with:
+  http://errors.yoctoproject.org/Errors/Details/853041/
+
+bstat.c:65:33: error: unknown type name '__uint32_t'; did you mean 'uint32_t'?
+   65 | static inline int xfs_highbit32(__uint32_t v)
+      |                                 ^~~~~~~~~~
+      |                                 uint32_t
+
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/bstat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bstat.c b/src/bstat.c
+index 9a028a0d..a833af59 100644
+--- a/src/bstat.c
++++ b/src/bstat.c
+@@ -62,7 +62,7 @@ static inline int fls(int x)
+        return r;
+ }
+ 
+-static inline int xfs_highbit32(__uint32_t v)
++static inline int xfs_highbit32(uint32_t v)
+ {
+        return fls(v) - 1;
+ }
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch
index e823297343..9fdf69ff46 100644
--- a/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch
@@ -1,4 +1,4 @@
-From 79c4715a46b80653eb98b61731c094c85e969220 Mon Sep 17 00:00:00 2001
+From 340e708f79b824816aacfa74e330d8acdafc5129 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 14 Aug 2022 13:33:05 -0700
 Subject: [PATCH] Drop detached_mounts_propagation and remove sys/mount.h from
@@ -17,15 +17,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index e7442487..970f087a 100644
+index 6ac72b36..5472ba66 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -33,7 +33,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
+@@ -34,7 +34,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
         dio-invalidate-cache stat_test t_encrypted_d_revalidate \
         attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \
         fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \
 -       detached_mounts_propagation ext4_resize t_readdir_3 splice2pipe \
 +       ext4_resize t_readdir_3 splice2pipe \
-        uuid_ioctl t_snapshot_deleted_subvolume
+        uuid_ioctl t_snapshot_deleted_subvolume fiemap-fault min_dio_alignment
  
  EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2025.04.27.bb
index 9e82b0f749..9e86b77c5e 100644
--- a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2025.04.27.bb
@@ -2,22 +2,22 @@ SUMMARY = "File system QA test suite"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038"
 
-SRCREV = "088e5bd4cb6d7295612430a56ae84ff5c8f54730"
-SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914"
+SRCREV = "92c428db1fe3fa4f7bd2593788bc9b71403d59ae"
+SRCREV_unionmount = "c6ab621ac19f2b96d34cd98f244e611750e2bb23"
 SRCREV_FORMAT = "default_unionmount"
 
-SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master \
+SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master;tag=v${PV} \
            git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \
            file://0001-add-missing-FTW_-macros-when-not-available-in-libc.patch \
            file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \
            file://0001-include-libgen.h-for-basename-API-prototype.patch \
            file://0002-Add-missing-STATX_ATTR_-defines-from-musl-sys-stat.h.patch \
+           file://0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch \
            "
 
-S = "${WORKDIR}/git"
 
 # brokensep because m4/package_globals.m4 calls ". ./VERSION" (and that's not the only issue)
-inherit autotools-brokensep useradd
+inherit autotools-brokensep useradd pkgconfig
 
 DEPENDS += "xfsprogs acl"
 RDEPENDS:${PN} += "\
@@ -36,6 +36,11 @@ RDEPENDS:${PN} += "\
     xfsprogs \
     acl \
     gawk \
+    util-linux-mkfs \
+    util-linux-mount \
+    util-linux-findmnt \
+    inetutils-hostname \
+    grep \
 "
 
 USERADD_PACKAGES = "${PN}"
@@ -65,3 +70,9 @@ do_install() {
 }
 
 FILES:${PN} += "${prefix}/xfstests"
+
+# This one is reproducible only on 32bit MACHINEs
+# http://errors.yoctoproject.org/Errors/Details/766963/
+# lstat64.c:65:14: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types]
+# bstat.c:18:19: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"