X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/247904ddc9da729f05cfe857f647e0e12f95a6ba..062a258f588a3eea1f4d2154069828cce77e55bf:/package/fuse/Makefile?ds=sidebyside

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 21c978745..152c5402d 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
 PKG_VERSION:=2.7.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
@@ -33,7 +33,7 @@ $(call Package/fuse/Default)
   CATEGORY:=Utilities
   DEPENDS:=+libfuse
   TITLE+= (utilities)
-  SUBMENU:=filesystem
+  SUBMENU:=Filesystem
 endef
 
 define Package/fuse-utils/description
@@ -63,7 +63,7 @@ $(call Package/fuse/Default)
   CATEGORY:=Libraries
   TITLE+= (library)
   DEPENDS:=+LINUX_2_4:kmod-fuse24 +LINUX_2_6:kmod-fuse
-  SUBMENU:=filesystem
+  SUBMENU:=Filesystem
 endef
 
 define Package/libfuse/description
@@ -85,23 +85,12 @@ CONFIGURE_ARGS += \
 	--with-kernel="$(LINUX_DIR)" \
 	--disable-mtab 
 
-# This section is disabled; since kernel 2.6.14 the fuse module is officially 
-# part of the kernel. The following enables this fuse packages kernel module 
-# instead of the kernel's, if the kernel is younger than 2.6.25. 
-# Generally it is better to use the kernel's module. Because it is DCACHE BUG 
-# patched and from fuse 2.8.0 on it will be removed from the fuse package 
-# anyway.
+# Since kernel 2.6.14 the fuse module is officially part of the kernel. 
+# Generally it is better to use the kernel's module. Because it is patched
+# against the DCACHE BUG on arm architectures (currently brcm-2.4, brcm-47xx) 
+# and from fuse 2.8.0 on it will be removed from the fuse package anyway.
 #
-#ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.25)),1)
-#  define KernelPackage/fuse/2.6
-#    KCONFIG:=
-#    FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
-#  endef
-#
-# CONFIGURE_ARGS += --enable-kernel-module
-#else
-# CONFIGURE_ARGS += --disable-kernel-module
-#endif
+CONFIGURE_ARGS += --disable-kernel-module
 
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); rm -f config.cache; \