X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Ffuse%2FMakefile;h=afdaa774c81534227821d5597a023168af6f8a31;hb=0ed9124016866aba558c07b1cdde5cdc24627cf2;hp=5b94174bd004fdb996d9479579ee18abdae8f695;hpb=e1ab21a7666e9b12f64fed0619ea7f5a859abffa;p=openwrt%2Fopenwrt.git

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 5b94174bd0..afdaa774c8 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -10,21 +10,18 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse
-PKG_VERSION:=2.6.3
+PKG_VERSION:=2.6.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=3f4f5d07d12dedc0a3fd23472171fe94
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=66bd30503df55a87b9868835ca5a45bc
 
 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/
@@ -34,7 +31,7 @@ define Package/fuse-utils
   $(call Package/fuse/Default)
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libfuse +kmod-fuse
+  DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6
   TITLE+= (utilities)
   DESCRIPTION+=\\\
 	\\\
@@ -44,22 +41,16 @@ endef
 define KernelPackage/fuse
   SUBMENU:=Filesystems
   $(call Package/fuse/Default)
+  DEPENDS:=@LINUX_2_6
   TITLE+= (kernel module)
   DESCRIPTION+=\\\
 	\\\
 	This package contains the FUSE kernel module.
+  FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   AUTOLOAD:=$(call AutoLoad,80,fuse)
 endef
 
-define KernelPackage/fuse/2.4 
-  FILES:=$(PKG_BUILD_DIR)/lib/fuse.$(LINUX_KMOD_SUFFIX) 
-endef 
-
-define KernelPackage/fuse/2.6
-  FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
-endef
-
 define Package/libfuse
   $(call Package/fuse/Default)
   SECTION:=libs
@@ -71,6 +62,9 @@ define Package/libfuse
 	This package contains the FUSE shared library, needed by other programs.
 endef
 
+CONFIGURE_VARS += \
+	 kernsrcver="$(LINUX_VERSION)"
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \