8 files changed, 133 insertions, 8 deletions

diff --git a/meta-filesystems/recipes-support/physfs/physfs/0001-allow-build-with-cmake-4.patch b/meta-filesystems/recipes-support/physfs/physfs/0001-allow-build-with-cmake-4.patch
new file mode 100644
index 0000000000..1584921e65
--- /dev/null
+++ b/meta-filesystems/recipes-support/physfs/physfs/0001-allow-build-with-cmake-4.patch
@@ -0,0 +1,43 @@
+From 09f8ca5776f5265571d95454b7307bbee56474da Mon Sep 17 00:00:00 2001
+From: Alper Ak <alperyasinak1@gmail.com>
+Date: Thu, 10 Jul 2025 13:19:24 +0300
+Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
+ compatibility
+
+Fix:
+
+| CMake Error at CMakeLists.txt:12 (cmake_minimum_required):
+|   Compatibility with CMake < 3.5 has been removed from CMake.
+|
+|   Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
+|   to tell CMake that the project requires at least <min> but has been updated
+|   to work with policies introduced by <max> or earlier.
+|
+|   Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
+|
+|
+| -- Configuring incomplete, errors occurred!
+
+Upstream-Status: Backport [https://github.com/icculus/physfs/commit/f7d24ce8486d9229207cca1ff98858fe60ffe583]
+
+Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4a67c27..f0f0183 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,7 +9,7 @@
+ #  compile, using preprocessor checks for platform-specific bits instead of
+ #  testing in here.
+ 
+-cmake_minimum_required(VERSION 2.8.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ project(PhysicsFS)
+ set(PHYSFS_VERSION 3.0.2)
+-- 
+2.43.0
+
diff --git a/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb b/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb
index 57cfdcdf82..2571d3f6a0 100644
--- a/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb
+++ b/meta-filesystems/recipes-support/physfs/physfs_3.0.2.bb
@@ -8,7 +8,8 @@ inherit cmake
 
 PE = "1"
 
-SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2"
+SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2 \
+        file://0001-allow-build-with-cmake-4.patch"
 SRC_URI[md5sum] = "dc751294aaf59d1359bbe34e693d1d87"
 SRC_URI[sha256sum] = "304df76206d633df5360e738b138c94e82ccf086e50ba84f456d3f8432f9f863"
 
diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
index a60fbec821..38fa8b439e 100644
--- a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
+++ b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
@@ -35,10 +35,11 @@ do_install_ptest() {
     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
+    rm -rf ${D}${PTEST_PATH}/build/config.log \
+        ${D}${PTEST_PATH}/build/autom4te.cache \
+        ${D}${PTEST_PATH}/*/.git ${D}${PTEST_PATH}/*/.github \
+        ${D}${PTEST_PATH}/*/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"
diff --git a/meta-filesystems/recipes-utils/fatcat/fatcat/0003-allow-build-with-cmake-4.patch b/meta-filesystems/recipes-utils/fatcat/fatcat/0003-allow-build-with-cmake-4.patch
new file mode 100644
index 0000000000..1baa9c7e87
--- /dev/null
+++ b/meta-filesystems/recipes-utils/fatcat/fatcat/0003-allow-build-with-cmake-4.patch
@@ -0,0 +1,40 @@
+From a2a3d85d44fc27edfee5c4d9667b2c315dfacd23 Mon Sep 17 00:00:00 2001
+From: Alper Ak <alperyasinak1@gmail.com>
+Date: Wed, 9 Jul 2025 19:38:06 +0300
+Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
+ compatibility
+
+Fix:
+
+| CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
+|   Compatibility with CMake < 3.5 has been removed from CMake.
+|
+|   Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
+|   to tell CMake that the project requires at least <min> but has been updated
+|   to work with policies introduced by <max> or earlier.
+|
+|   Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
+|
+|
+| -- Configuring incomplete, errors occurred!
+
+Upstream-Status: Submitted [https://github.com/Gregwar/fatcat/pull/46]
+
+Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d6a2649..8f3eadc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(fatcat)
+ 
+ OPTION(DEFINE_WIN "Compiling windows" OFF)
+-- 
+2.43.0
+
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 bdde0d311a..876e8618eb 100644
--- a/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb
+++ b/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb
@@ -11,9 +11,9 @@ SRC_URI = "git://github.com/Gregwar/fatcat.git;branch=master;protocol=https \
            file://0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch \
            file://0002-Enable-64bit-off_t.patch \
            file://0001-Replace-std-ptr_fun-for-c-17.patch \
+           file://0003-allow-build-with-cmake-4.patch \
            "
 
 SRCREV = "99cb99fc86eb1601ac7ae27f5bba23add04d2543"
 
-
 inherit cmake
diff --git a/meta-filesystems/recipes-utils/nilfs-utils/nilfs-utils/0001-configure.ac-Add-knob-to-define-base-sbindir.patch b/meta-filesystems/recipes-utils/nilfs-utils/nilfs-utils/0001-configure.ac-Add-knob-to-define-base-sbindir.patch
new file mode 100644
index 0000000000..e53d2bdc8b
--- /dev/null
+++ b/meta-filesystems/recipes-utils/nilfs-utils/nilfs-utils/0001-configure.ac-Add-knob-to-define-base-sbindir.patch
@@ -0,0 +1,35 @@
+From 1b8f420ec8852355580dd925c0316798d4fa7449 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 3 Jul 2025 19:32:12 -0700
+Subject: [PATCH] configure.ac: Add knob to define base sbindir
+
+This helps when distros use converged directories with usrmerge
+set --with-base-sbindir=DIR accordingly so it respects the
+distro policy
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9a2f5ff..ce2c853 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -186,7 +186,14 @@ AC_SYS_LARGEFILE
+ AC_PREFIX_DEFAULT([/usr])
+ test "x$prefix" = "xNONE" && prefix="/usr"
+ test "x$exec_prefix" = "xNONE" && exec_prefix="${prefix}"
+-AC_SUBST([root_sbindir], [/sbin])
++
++AC_ARG_WITH([base-sbindir],
++    [AS_HELP_STRING([--with-base-sbindir=DIR],
++        [specify root system binary directory @<:@default=/sbin@:>@])],
++    [root_sbindir="$withval"],
++    [root_sbindir="/sbin"])
++
++AC_SUBST([root_sbindir])
+ AC_SUBST([sbindir], [${exec_prefix}/sbin])
+ AC_SUBST([sysconfdir], [/etc])
+ AC_SUBST([localstatedir], [/var])
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
index 507684a395..a09f01282f 100644
--- 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
@@ -3,10 +3,14 @@ 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}"
+SRC_URI = "git://github.com/nilfs-dev/nilfs-utils.git;protocol=https;branch=v2.2.y;tag=${PV} \
+           file://0001-configure.ac-Add-knob-to-define-base-sbindir.patch"
 
 SRCREV = "507064bb3604d0fd88f5e3f6422d9ade73a26120"
 
 DEPENDS = "util-linux util-linux-libuuid"
 
 inherit autotools
+
+# make install is trying to run ldconfig, not suitable for cross builds
+EXTRA_OECONF += "LDCONFIG=true --with-base-sbindir=${base_sbindir}"
diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_6.14.11.bb b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.11.bb
index a22e54e24c..50b6b5a16c 100644
--- a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_6.14.11.bb
+++ b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.11.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 BRANCH ?= "dev"
 
-SRCREV = "5539a8ad8e1a9b7ea8b62213ed72eb939c5381b7"
+SRCREV = "92c8e4d732c34f8d0754d0e076879ca7008bace4"
 
 SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=https;branch=${BRANCH} \
           "
@@ -14,7 +14,8 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" CFLAGS="${CFLAGS}""
 
-CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__ -D_GNU_SOURCE"
+CFLAGS:append = " -D_GNU_SOURCE"
+CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
 
 do_configure() {
         sed -i -e "s|-static$||g" ${S}/Makefile