mac80211: fix patch naming

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 8d280e1..152c540 100644 (file)
--- 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.
 #
 #
 # 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
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fuse

-PKG_VERSION:=2.7.1
-PKG_RELEASE:=1
+PKG_VERSION:=2.7.4
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)

-PKG_MD5SUM:=f95b4a238a3df5a92e9013ecb55c2c17
+PKG_MD5SUM:=4879f06570d2225667534c37fea04213

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fuse/Default
   TITLE:=FUSE
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fuse/Default
   TITLE:=FUSE

-  DEPENDS:=@LINUX_2_6

   URL:=http://fuse.sourceforge.net/
 endef
 
   URL:=http://fuse.sourceforge.net/
 endef
 


@@ -33,14 +31,14 @@ define Package/fuse-utils
 $(call Package/fuse/Default)
   SECTION:=utils
   CATEGORY:=Utilities
 $(call Package/fuse/Default)
   SECTION:=utils
   CATEGORY:=Utilities

-  DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6
+  DEPENDS:=+libfuse

   TITLE+= (utilities)
   TITLE+= (utilities)

-  SUBMENU:=disc
+  SUBMENU:=Filesystem

 endef
 
 define Package/fuse-utils/description
 $(call Package/fuse/Default/description)
 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
 endef
 
 define KernelPackage/fuse


@@ -48,11 +46,13 @@ $(call Package/fuse/Default)
   SUBMENU:=Filesystems
   DEPENDS:=@LINUX_2_6
   TITLE+= (kernel module)
   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)
   AUTOLOAD:=$(call AutoLoad,80,fuse)

+  VERSION:=$(LINUX_VERSION)

 endef
 
 endef
 

-define Kernel/Package/fuse/description
+define KernelPackage/fuse/description

 $(call Package/fuse/Default/description)
  This package contains the FUSE kernel module.
 endef
 $(call Package/fuse/Default/description)
  This package contains the FUSE kernel module.
 endef


@@ -61,9 +61,9 @@ define Package/libfuse
 $(call Package/fuse/Default)
   SECTION:=libs
   CATEGORY:=Libraries
 $(call Package/fuse/Default)
   SECTION:=libs
   CATEGORY:=Libraries

-  DEPENDS:=@LINUX_2_6

   TITLE+= (library)
   TITLE+= (library)

-  SUBMENU:=disc
+  DEPENDS:=+LINUX_2_4:kmod-fuse24 +LINUX_2_6:kmod-fuse
+  SUBMENU:=Filesystem

 endef
 
 define Package/libfuse/description
 endef
 
 define Package/libfuse/description


@@ -78,13 +78,19 @@ CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
        --disable-rpath \
        --enable-shared \
        --enable-static \
        --disable-rpath \

-       --enable-kernel-module \

        --enable-lib \
        --enable-util \
        --disable-example \
        --disable-auto-modprobe \
        --with-kernel="$(LINUX_DIR)" \
        --enable-lib \
        --enable-util \
        --disable-example \
        --disable-auto-modprobe \
        --with-kernel="$(LINUX_DIR)" \

-       --disable-mtab
+       --disable-mtab 
+
+# 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.
+#
+CONFIGURE_ARGS += --disable-kernel-module

 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \