KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fuse: update to v2.7.4 (#5186)

Browse source 
SVN-Revision: 16410
This commit is contained in:
Jo-Philipp Wich 2009-06-11 02:09:13 +00:00
parent aaa0278c46
commit 99e23d2144
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
package/fuse/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2008 OpenWrt.org # Copyright (C) 2006-2009 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,18 +9,17 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fuse PKG_NAME:=fuse
PKG_VERSION:=2.7.3 PKG_VERSION:=2.7.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_MD5SUM:=98563fc7b265b7479a3178181cbcf59a PKG_MD5SUM:=4879f06570d2225667534c37fea04213
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/fuse/Default define Package/fuse/Default
TITLE:=FUSE TITLE:=FUSE
DEPENDS:=@LINUX_2_6
URL:=http://fuse.sourceforge.net/ URL:=http://fuse.sourceforge.net/
endef endef
@ -32,14 +31,14 @@ define Package/fuse-utils
$(call Package/fuse/Default) $(call Package/fuse/Default)
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6 DEPENDS:=+libfuse
TITLE+= (utilities) TITLE+= (utilities)
SUBMENU:=disc SUBMENU:=filesystem
endef endef
define Package/fuse-utils/description define Package/fuse-utils/description
$(call Package/fuse/Default/description) $(call Package/fuse/Default/description)
This package contains the FUSE utilities. This package contains the FUSE utility 'fusermount'.
endef endef
define KernelPackage/fuse define KernelPackage/fuse
@ -50,6 +49,7 @@ $(call Package/fuse/Default)
KCONFIG:= CONFIG_FUSE_FS KCONFIG:= CONFIG_FUSE_FS
FILES:=$(LINUX_DIR)/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) 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 KernelPackage/fuse/description define KernelPackage/fuse/description
@ -61,9 +61,9 @@ define Package/libfuse
$(call Package/fuse/Default) $(call Package/fuse/Default)
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries 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 endef
define Package/libfuse/description define Package/libfuse/description
@ -83,18 +83,25 @@ CONFIGURE_ARGS += \
--disable-example \ --disable-example \
--disable-auto-modprobe \ --disable-auto-modprobe \
--with-kernel="$(LINUX_DIR)" \ --with-kernel="$(LINUX_DIR)" \
--disable-mtab --disable-mtab
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.25)),1) # This section is disabled; since kernel 2.6.14 the fuse module is officially
define KernelPackage/fuse/2.6 # part of the kernel. The following enables this fuse packages kernel module
KCONFIG:= # instead of the kernel's, if the kernel is younger than 2.6.25.
FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) # Generally it is better to use the kernel's module. Because it is DCACHE BUG
endef # patched and from fuse 2.8.0 on it will be removed from the fuse package
# anyway.
CONFIGURE_ARGS += --enable-kernel-module #
else #ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.25)),1)
CONFIGURE_ARGS += --disable-kernel-module # define KernelPackage/fuse/2.6
endif # 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 define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \ (cd $(PKG_BUILD_DIR); rm -f config.cache; \