From d53205ad36358c723cc79d49595665e5e96738ef Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Fri, 26 Dec 2025 20:09:59 +0100 Subject: [PATCH] unionfs-fuse: upgarde 3.4 -> 3.7 License-Update: copyright year bump Drop patch which became unneeded (CFLAGS are not overwritten anymore) Selected shortlog (without readme and CI changes): - Use fchmodat with AT_SYMLINK_NOFOLLOW if available - Use utimensat on macOS - tests: properly test for directory existence using os.path.isdir - Enable commented test for rmdir - Add more tests for renaming using cow - Allow directory renaming when cow is disabled but it only exists in one branch - Use existing function for checking if file exists - Fix directory rename hiding files from lower branches - remove deprecated "use_ino" option from examples and documentation - CMake: Support CFLAGS= and -DCMAKE_C_FLAGS= from the outside - set -D_FILE_OFFSET_BITS=64 unconditionally so that compilation does not fail on 32bit systems Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj --- .../files/0001-support-cross-compiling.patch | 31 ------------------- ...nionfs-fuse_3.4.bb => unionfs-fuse_3.7.bb} | 8 ++--- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch rename meta-filesystems/recipes-filesystems/unionfs-fuse/{unionfs-fuse_3.4.bb => unionfs-fuse_3.7.bb} (65%) diff --git a/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch b/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch deleted file mode 100644 index 9b4d0f6cae..0000000000 --- a/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6e794a36564a2639a07d8720260e33d7c9435aa4 Mon Sep 17 00:00:00 2001 -From: Alper Ak -Date: Fri, 10 Nov 2023 20:50:48 +0300 -Subject: [PATCH] support cross compiling - -Do not override OE CMAKE variables - -Signed-off-by: Hongxu Jia -Signed-off-by: Alper Ak - -Upstream-Status: Pending ---- - src/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f549496..ab71fb2 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -4,9 +4,9 @@ set(UNIONFS_SRCS unionfs.c opts.c debug.c findbranch.c readdir.c - fuse_ops.c) - set(UNIONFSCTL_SRCS unionfsctl.c) - --SET(CMAKE_C_FLAGS "-pipe -W -Wall -D_FORTIFY_SOURCE=2") -+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -D_FORTIFY_SOURCE=2") - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") --SET(CMAKE_C_FLAGS_RELEASE "-O2") -+SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2") - SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -DDEBUG") - - add_executable(unionfs ${UNIONFS_SRCS} ${HASHTABLE_SRCS}) diff --git a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.7.bb similarity index 65% rename from meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb rename to meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.7.bb index fc474e3238..5ba202b90c 100644 --- a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.4.bb +++ b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_3.7.bb @@ -3,13 +3,11 @@ HOMEPAGE = "https://github.com/rpodgorny/unionfs-fuse" SECTION = "console/network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://src/unionfs.c;beginline=3;endline=8;md5=30fa8de70fd8abab00b483a1b7943a32 \ - file://LICENSE;md5=7e5a37fce17307066eec6b23546da3b3 \ + file://LICENSE;md5=0e75c95b3e0e1c01489b39e7fadd3e2d \ " -SRC_URI = "git://github.com/rpodgorny/${BPN}.git;branch=master;protocol=https \ - file://0001-support-cross-compiling.patch \ - " -SRCREV = "773f1853b043eeb64b7459f903a2c65bd096f9d9" +SRC_URI = "git://github.com/rpodgorny/${BPN}.git;branch=master;protocol=https;tag=v${PV}" +SRCREV = "3fcbd11f78b9a9e02ea0e861d741840fe45dc9c8" DEPENDS = "fuse3" RDEPENDS:${PN} = "bash"