summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/kernel/modules/fs.mk12
-rw-r--r--package/kernel/modules/lib.mk11
2 files changed, 16 insertions, 7 deletions
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index c2ae55194..8b619f747 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -25,15 +25,13 @@ $(eval $(call KernelPackage,fs-autofs4))
define KernelPackage/fs-btrfs
SUBMENU:=$(FS_MENU)
TITLE:=BTRFS filesystem support
- DEPENDS:=+kmod-libcrc32c
+ DEPENDS:=+kmod-libcrc32c +kmod-zlib
KCONFIG:=\
CONFIG_BTRFS_FS \
- CONFIG_BTRFS_FS_POSIX_ACL=n \
- CONFIG_ZLIB_DEFLATE
+ CONFIG_BTRFS_FS_POSIX_ACL=n
FILES:=\
- $(LINUX_DIR)/fs/btrfs/btrfs.ko \
- $(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko
- AUTOLOAD:=$(call AutoLoad,30,zlib_deflate btrfs,1)
+ $(LINUX_DIR)/fs/btrfs/btrfs.ko
+ AUTOLOAD:=$(call AutoLoad,30,btrfs,1)
endef
define KernelPackage/fs-btrfs/description
diff --git a/package/kernel/modules/lib.mk b/package/kernel/modules/lib.mk
index 7c10f285f..b0970e696 100644
--- a/package/kernel/modules/lib.mk
+++ b/package/kernel/modules/lib.mk
@@ -100,3 +100,14 @@ SUBMENU:=$(LIB_MENU)
endef
$(eval $(call KernelPackage,textsearch))
+
+
+define KernelPackage/zlib
+ SUBMENU:=$(LIB_MENU)
+ TITLE:=zlib support is selected if needed
+ KCONFIG:=CONFIG_ZLIB_DEFLATE
+ FILES:=$(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko
+ AUTOLOAD:=$(call AutoLoad,20,zlib_deflate,1)
+endef
+
+$(eval $(call KernelPackage,zlib))