X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/640652a244c6916ea5c2a886c52d477d5742e0d8..b4ca45931c08e23b81e7a2d3c5cf6fa3aea151ef:/package/fuse/Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 927c35016..d5e108685 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -1,27 +1,25 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
-PKG_VERSION:=2.6.5
+PKG_VERSION:=2.7.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=66bd30503df55a87b9868835ca5a45bc
+PKG_MD5SUM:=4879f06570d2225667534c37fea04213
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fuse/Default
   TITLE:=FUSE
-  DEPENDS:=@LINUX_2_6
   URL:=http://fuse.sourceforge.net/
 endef
 
@@ -33,13 +31,14 @@ define Package/fuse-utils
 $(call Package/fuse/Default)
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6
+  DEPENDS:=+libfuse
   TITLE+= (utilities)
+  SUBMENU:=Filesystem
 endef
 
 define Package/fuse-utils/description
 $(call Package/fuse/Default/description)
- This package contains the FUSE utilities.
+ This package contains the FUSE utility 'fusermount'.
 endef
 
 define KernelPackage/fuse
@@ -47,11 +46,13 @@ $(call Package/fuse/Default)
   SUBMENU:=Filesystems
   DEPENDS:=@LINUX_2_6
   TITLE+= (kernel module)
-  FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:= CONFIG_FUSE_FS
+  FILES:=$(LINUX_DIR)/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,80,fuse)
+  VERSION:=$(LINUX_VERSION)
 endef
 
-define Kernel/Package/fuse/description
+define KernelPackage/fuse/description
 $(call Package/fuse/Default/description)
  This package contains the FUSE kernel module.
 endef
@@ -60,8 +61,9 @@ define Package/libfuse
 $(call Package/fuse/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@LINUX_2_6
   TITLE+= (library)
+  DEPENDS:=+LINUX_2_4:kmod-fuse24 +LINUX_2_6:kmod-fuse
+  SUBMENU:=Filesystem
 endef
 
 define Package/libfuse/description
@@ -76,13 +78,30 @@ CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 	--disable-rpath \
-	--enable-kernel-module \
 	--enable-lib \
 	--enable-util \
 	--disable-example \
 	--disable-auto-modprobe \
 	--with-kernel="$(LINUX_DIR)" \
-	--disable-mtab
+	--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.
+#
+#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
 
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
@@ -115,16 +134,10 @@ define Build/InstallDev
 	$(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc
 	$(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc
 endef
-	
-define Build/UninstallDev
-	rm -rf	$(1)/usr/include/fuse{,.h} \
-		$(1)/usr/lib/libfuse.{a,so*} \
-		$(1)/usr/lib/pkgconfig/fuse.pc
-endef
 
 define Package/fuse-utils/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
 endef
 
 define Package/libfuse/install