aboutsummaryrefslogtreecommitdiffstats
path: root/package/fuse
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2008-05-11 22:27:32 +0000
committerNicolas Thill <nico@openwrt.org>2008-05-11 22:27:32 +0000
commit70a8c455b05c30dda1d6e9082b827ad0114027c3 (patch)
tree4a834b489b1945614c58496ddeee2961ab03f650 /package/fuse
parente93e293b4159df8beafa1d0cb219197dd6a61402 (diff)
downloadupstream-70a8c455b05c30dda1d6e9082b827ad0114027c3.tar.gz
upstream-70a8c455b05c30dda1d6e9082b827ad0114027c3.tar.bz2
upstream-70a8c455b05c30dda1d6e9082b827ad0114027c3.zip
fix fuse: use in-kernel module for 2.6.25+ kernels
SVN-Revision: 11116
Diffstat (limited to 'package/fuse')
-rw-r--r--package/fuse/Makefile19
1 files changed, 15 insertions, 4 deletions
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 2376eaae33..5c013a7bc7 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -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.
# See /LICENSE for more information.
@@ -48,11 +48,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
@@ -78,7 +79,6 @@ CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
--disable-rpath \
- --enable-kernel-module \
--enable-lib \
--enable-util \
--disable-example \
@@ -86,6 +86,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 ; \