summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-16 21:06:24 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-16 21:06:24 +0000
commit659b283c6c911d425e2c824b051d4c118469b75f (patch)
tree70563ad0348bc96149489787d253ebbcfc4b9528
parentfcbd67c59997219cbecf5f568ef5032b10fa957c (diff)
fuse: move kmod-fuse to package/kernel
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32394 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/fuse/Makefile16
-rw-r--r--package/kernel/modules/fs.mk15
2 files changed, 15 insertions, 16 deletions
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 40edd909c0..a7d4d7c544 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -45,21 +45,6 @@ $(call Package/fuse/Default/description)
- ulockmgr_server
endef
-define KernelPackage/fuse
- $(call Package/fuse/Default)
- SUBMENU:=Filesystems
- TITLE+= (kernel module)
- KCONFIG:= CONFIG_FUSE_FS
- FILES:=$(LINUX_DIR)/fs/fuse/fuse.ko
- VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)
- AUTOLOAD:=$(call AutoLoad,80,fuse)
-endef
-
-define KernelPackage/fuse/description
-$(call Package/fuse/Default/description)
- This package contains the FUSE kernel module.
-endef
-
define Package/libfuse
$(call Package/fuse/Default)
SECTION:=libs
@@ -121,4 +106,3 @@ endef
$(eval $(call BuildPackage,fuse-utils))
$(eval $(call BuildPackage,libfuse))
-$(eval $(call KernelPackage,fuse))
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 9226ad9031..0bc0d55787 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -104,6 +104,21 @@ endef
$(eval $(call KernelPackage,fs-ext4))
+define KernelPackage/fuse
+ SUBMENU:=$(FS_MENU)
+ TITLE:=FUSE (Filesystem in Userspace) support
+ KCONFIG:= CONFIG_FUSE_FS
+ FILES:=$(LINUX_DIR)/fs/fuse/fuse.ko
+ AUTOLOAD:=$(call AutoLoad,80,fuse)
+endef
+
+define KernelPackage/fuse/description
+ Kernel module for userspace filesystem support
+endef
+
+$(eval $(call KernelPackage,fuse))
+
+
define KernelPackage/fs-hfs
SUBMENU:=$(FS_MENU)
TITLE:=HFS+ filesystem support