X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a4a6443af12b7758b12020f561fa7fe2e0a3e87f..6b7d7d8a9e23d9907dd5a2317cccaee1913caba9:/package/fuse/Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index fda8f1c51..66c2455e6 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
-PKG_VERSION:=2.5.3
+PKG_VERSION:=2.6.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c
+PKG_MD5SUM:=13e1873086a1d7a95f470bbc7428c528
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -25,6 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/fuse/Default
   TITLE:=FUSE
+  DEPENDS:=@LINUX_2_6
   DESCRIPTION:=\
 	FUSE (Filesystem in UserSpacE)
   URL:=http://fuse.sourceforge.net/
@@ -40,15 +41,15 @@ define Package/fuse-utils
 	This package contains the FUSE utilities.
 endef
 
-define Package/kmod-fuse
+define KernelPackage/fuse
+  SUBMENU:=Filesystems
   $(call Package/fuse/Default)
-  SECTION:=kernel
-  CATEGORY:=Kernel drivers
   TITLE+= (kernel module)
   DESCRIPTION+=\\\
 	\\\
 	This package contains the FUSE kernel module.
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
 endef
 
 define Package/libfuse
@@ -133,21 +134,11 @@ define Package/fuse-utils/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
 endef
 
-define Package/kmod-fuse/install
-	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
-	$(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \
-		$(1)/lib/modules/$(LINUX_VERSION)/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
-endef
-
 define Package/libfuse/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,fuse-utils))
-$(eval $(call BuildPackage,kmod-fuse))
 $(eval $(call BuildPackage,libfuse))
+$(eval $(call KernelPackage,fuse))