From 78dce969922dc525151f0ff6ae51b3b6cdeebe96 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 22 Feb 2024 14:12:36 +0100 Subject: fuse: fix compile issue --- package/fuse/Makefile | 1 - package/fuse/patches/patch-configure_ac | 10 -------- package/fuse/patches/patch-util_install_helper_sh | 22 ----------------- package/fuse/patches/patch-util_meson_build | 12 ---------- package/fuse/patches/patch-util_ulockmgr_server_c | 29 ----------------------- 5 files changed, 74 deletions(-) delete mode 100644 package/fuse/patches/patch-configure_ac delete mode 100644 package/fuse/patches/patch-util_install_helper_sh delete mode 100644 package/fuse/patches/patch-util_meson_build delete mode 100644 package/fuse/patches/patch-util_ulockmgr_server_c (limited to 'package') diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 8eccfb51b..48061955f 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -29,7 +29,6 @@ CONFIGURE_ARGS+= --enable-lib \ --enable-util \ --with-libiconv-prefix="${STAGING_TARGET_DIR}/usr" \ --disable-example \ - --disable-auto-modprobe \ --disable-mtab \ --disable-kernel-module diff --git a/package/fuse/patches/patch-configure_ac b/package/fuse/patches/patch-configure_ac deleted file mode 100644 index 10c093358..000000000 --- a/package/fuse/patches/patch-configure_ac +++ /dev/null @@ -1,10 +0,0 @@ ---- fuse-2.9.9.orig/configure.ac 2019-01-04 14:37:03.000000000 +0100 -+++ fuse-2.9.9/configure.ac 2024-02-12 17:14:14.790450294 +0100 -@@ -55,6 +55,7 @@ fi - - AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat]) - AC_CHECK_FUNCS([posix_fallocate]) -+AC_CHECK_FUNCS([closefrom]) - AC_CHECK_MEMBERS([struct stat.st_atim]) - AC_CHECK_MEMBERS([struct stat.st_atimespec]) - diff --git a/package/fuse/patches/patch-util_install_helper_sh b/package/fuse/patches/patch-util_install_helper_sh deleted file mode 100644 index 02aa038fc..000000000 --- a/package/fuse/patches/patch-util_install_helper_sh +++ /dev/null @@ -1,22 +0,0 @@ ---- libfuse-fuse-3.16.2.orig/util/install_helper.sh 2023-10-10 09:38:49.000000000 +0200 -+++ libfuse-fuse-3.16.2/util/install_helper.sh 2024-02-11 19:19:21.423803542 +0100 -@@ -37,19 +37,3 @@ if $useroot; then - fi - fi - --if [ "${udevrulesdir}" != "" ]; then -- install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ -- "${DESTDIR}${udevrulesdir}/99-fuse3.rules" --fi -- --if [ "$initscriptdir" != "" ]; then -- install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ -- "${DESTDIR}${initscriptdir}/fuse3" -- -- if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then -- /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true -- else -- echo "== FURTHER ACTION REQUIRED ==" -- echo "Make sure that your init system will start the ${DESTDIR}${initscriptdir}/init.d/fuse3 init script" -- fi --fi diff --git a/package/fuse/patches/patch-util_meson_build b/package/fuse/patches/patch-util_meson_build deleted file mode 100644 index 6b8f915f8..000000000 --- a/package/fuse/patches/patch-util_meson_build +++ /dev/null @@ -1,12 +0,0 @@ ---- libfuse-fuse-3.16.2.orig/util/meson.build 2023-10-10 09:38:49.000000000 +0200 -+++ libfuse-fuse-3.16.2/util/meson.build 2024-02-11 19:25:24.107798622 +0100 -@@ -26,9 +26,3 @@ if udevrulesdir == '' - warning('could not determine udevdir, udev.rules will not be installed') - endif - --meson.add_install_script('install_helper.sh', -- join_paths(get_option('prefix'), get_option('sysconfdir')), -- join_paths(get_option('prefix'), get_option('bindir')), -- udevrulesdir, -- '@0@'.format(get_option('useroot')), -- get_option('initscriptdir')) diff --git a/package/fuse/patches/patch-util_ulockmgr_server_c b/package/fuse/patches/patch-util_ulockmgr_server_c deleted file mode 100644 index ddf0472e1..000000000 --- a/package/fuse/patches/patch-util_ulockmgr_server_c +++ /dev/null @@ -1,29 +0,0 @@ ---- fuse-2.9.9.orig/util/ulockmgr_server.c 2019-01-04 14:33:33.000000000 +0100 -+++ fuse-2.9.9/util/ulockmgr_server.c 2024-02-12 17:14:14.798450294 +0100 -@@ -22,6 +22,10 @@ - #include - #include - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - struct message { - unsigned intr : 1; - unsigned nofd : 1; -@@ -124,6 +128,7 @@ static int receive_message(int sock, voi - return res; - } - -+#if !defined(HAVE_CLOSEFROM) - static int closefrom(int minfd) - { - DIR *dir = opendir("/proc/self/fd"); -@@ -141,6 +146,7 @@ static int closefrom(int minfd) - } - return 0; - } -+#endif - - static void send_reply(int cfd, struct message *msg) - { -- cgit v1.2.3