mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

fix fuse: use in-kernel module for 2.6.25+ kernels 

SVN-Revision: 11116
This commit is contained in:
Nicolas Thill 2008-05-11 22:27:32 +00:00
parent e93e293b41
commit 70a8c455b0
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/fuse/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2008 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.
@ -48,11 +48,12 @@ $(call Package/fuse/Default)
SUBMENU:=Filesystems SUBMENU:=Filesystems
DEPENDS:=@LINUX_2_6 DEPENDS:=@LINUX_2_6
TITLE+= (kernel module) 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)
endef endef
define Kernel/Package/fuse/description define KernelPackage/fuse/description
$(call Package/fuse/Default/description) $(call Package/fuse/Default/description)
This package contains the FUSE kernel module. This package contains the FUSE kernel module.
endef endef
@ -78,7 +79,6 @@ CONFIGURE_ARGS += \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--disable-rpath \ --disable-rpath \
--enable-kernel-module \
--enable-lib \ --enable-lib \
--enable-util \ --enable-util \
--disable-example \ --disable-example \
@ -86,6 +86,17 @@ CONFIGURE_ARGS += \
--with-kernel="$(LINUX_DIR)" \ --with-kernel="$(LINUX_DIR)" \
--disable-mtab --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 define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \ (cd $(PKG_BUILD_DIR); rm -f config.cache; \
touch configure.in ; \ touch configure.in ; \