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

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 927c35016..8a5465be1 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -1,21 +1,20 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 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.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=66bd30503df55a87b9868835ca5a45bc
+PKG_MD5SUM:=98563fc7b265b7479a3178181cbcf59a
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -35,6 +34,7 @@ $(call Package/fuse/Default)
   CATEGORY:=Utilities
   DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6
   TITLE+= (utilities)
+  SUBMENU:=disc
 endef
 
 define Package/fuse-utils/description
@@ -47,11 +47,12 @@ $(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)
 endef
 
-define Kernel/Package/fuse/description
+define KernelPackage/fuse/description
 $(call Package/fuse/Default/description)
  This package contains the FUSE kernel module.
 endef
@@ -62,6 +63,7 @@ $(call Package/fuse/Default)
   CATEGORY:=Libraries
   DEPENDS:=@LINUX_2_6
   TITLE+= (library)
+  SUBMENU:=disc
 endef
 
 define Package/libfuse/description
@@ -76,7 +78,6 @@ CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 	--disable-rpath \
-	--enable-kernel-module \
 	--enable-lib \
 	--enable-util \
 	--disable-example \
@@ -84,6 +85,17 @@ CONFIGURE_ARGS += \
 	--with-kernel="$(LINUX_DIR)" \
 	--disable-mtab
 
+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; \
 		touch configure.in ; \
@@ -115,16 +127,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