fuse3: update to 3.9.2

Added the mount utilities. It turns out that udev is not a requirement.

Renamed package to fuse3 and moved to utils, as with fuse2.

Signed-off-by: Rosen Penev <redacted>

diff --git a/libs/libfuse3/Makefile b/utils/fuse3/Makefile
similarity index 59%
rename from libs/libfuse3/Makefile
rename to utils/fuse3/Makefile
index 3caf1d7be92b46afb594e32cc02d6ddb28c791ce..0d0855ab03acd2a0bb34df76f4ab1597fe9d6f48 100644 (file)
--- a/libs/libfuse3/Makefile
+++ b/utils/fuse3/Makefile
@@ -8,46 +8,74 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_NAME:=libfuse3
-PKG_VERSION:=3.9.1
+PKG_NAME:=fuse3
+PKG_VERSION:=3.9.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=fuse-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/libfuse/libfuse/releases/download/fuse-$(PKG_VERSION)
-PKG_HASH:=1bafcfd6c66ba35b7b0beb822532a9106eb8409ad6cde988888fde85f89be645
+PKG_HASH:=6999b6d48e7c0a79628fa901f6e66def3513cab4ffdd8097821e7dc3cdeae08a
 PKG_BUILD_DIR:=$(BUILD_DIR)/fuse-$(PKG_VERSION)
 
 PKG_MAINTAINER:=
 PKG_CPE_ID:=cpe:/a:fuse_project:fuse
 
 PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=meson/host
 
 include $(INCLUDE_DIR)/package.mk
 include ../../devel/meson/meson.mk
 
+define Package/fuse3/Default
+  TITLE:=FUSE
+  URL:=https://github.com/libfuse/libfuse
+  SUBMENU:=Filesystem
+endef
+
+define Package/fuse3/Default/description
+ fuse3 (Filesystem in UserSpacE)
+endef
+
 define Package/libfuse3
-  TITLE:=FUSE3 library
+$(call Package/fuse3/Default)
+  TITLE+= library
   URL:=https://github.com/libfuse/libfuse
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+kmod-fuse +libpthread
-  SUBMENU:=Filesystem
-  ABI_VERSION:=1
+  ABI_VERSION:=3
   LICENSE:=LGPL-2.1-only
   LICENSE_FILES:=LGPL2.txt
 endef
 
 define Package/libfuse3/description
- fuse3 (Filesystem in UserSpacE)
+$(call Package/fuse3/Default/description)
  This package contains the fuse3 shared libraries, needed by other programs.
  - libfuse3
 endef
 
+define Package/fuse3-utils
+$(call Package/fuse3/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libfuse3
+  TITLE+= (utilities)
+  SUBMENU:=Filesystem
+  LICENSE:=GPL-2.0-only
+  LICENSE_FILES:=COPYING
+endef
+
+define Package/fuse3-utils/description
+$(call Package/fuse3/Default/description)
+ This package contains the FUSE utilities.
+ - fusermount3
+ - mount.fuse3
+endef
+
 MESON_ARGS += \
        -Ddisable-mtab=true \
-       -Dutils=false \
+       -Dudevrulesdir=/dev/null \
+       -Dutils=$(if $(CONFIG_PACKAGE_fuse3-utils),true,false) \
        -Dexamples=false \
        -Duseroot=false
 
@@ -65,4 +93,12 @@ define Package/libfuse3/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse3.so.* $(1)/usr/lib/
 endef
 
+define Package/fuse3-utils/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount3 $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mount.fuse3 $(1)/usr/sbin/
+endef
+
 $(eval $(call BuildPackage,libfuse3))
+$(eval $(call BuildPackage,fuse3-utils))