fix ext3 compile (broken by [9822])

[openwrt/svn-archive/archive.git] / package / kernel / modules / fs.mk

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index dfe25a1cd74df6cbbe83fef97cf6cdc562b975df..2a64c8b78ab86b71df59a947562ebb42ad6bf10c 100644 (file)
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -1,4 +1,12 @@
-FSMENU:=Filesystems
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+FS_MENU:=Filesystems
 
 define KernelPackage/nls/Depends
   ifneq ($(KERNEL),2.4)
@@ -7,7 +15,7 @@ define KernelPackage/nls/Depends
 endef
 
 define KernelPackage/fs-cifs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=CIFS support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_CIFS
@@ -25,7 +33,7 @@ $(eval $(call KernelPackage,fs-cifs))
 
 
 define KernelPackage/fs-minix
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=Minix filesystem support
   KCONFIG:=CONFIG_MINIX_FS
   FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
@@ -40,7 +48,7 @@ $(eval $(call KernelPackage,fs-minix))
 
 
 define KernelPackage/fs-ntfs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=NTFS filesystem support
   KCONFIG:=CONFIG_NTFS_FS
   FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX)
@@ -54,10 +62,28 @@ endef
 $(eval $(call KernelPackage,fs-ntfs))
 
 
+define KernelPackage/fs-mbcache
+  SUBMENU:=$(FS_MENU)
+  TITLE:=mbcache (used by ext2/ext3)
+  KCONFIG:=CONFIG_FS_MBCACHE
+  ifneq ($(CONFIG_FS_MBCACHE),)
+    FILES:=$(LINUX_DIR)/fs/mbcache.$(LINUX_KMOD_SUFFIX)
+    AUTOLOAD:=$(call AutoLoad,20,mbcache)
+  endif
+endef
+
+define KernelPackage/fs-ext2/description
+ Meta Block cache used by ext2/ext3
+ This package will only be installed if extended attributes 
+ are enabled for ext2/ext3
+endef
+$(eval $(call KernelPackage,fs-mbcache))
+
 define KernelPackage/fs-ext2
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=EXT2 filesystem support
   KCONFIG:=CONFIG_EXT2_FS
+  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
   FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ext2)
 endef
@@ -70,11 +96,12 @@ $(eval $(call KernelPackage,fs-ext2))
 
 
 define KernelPackage/fs-ext3
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=EXT3 filesystem support
   KCONFIG:= \
        CONFIG_EXT3_FS \
        CONFIG_JBD
+  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
   FILES:= \
        $(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX)
@@ -89,7 +116,7 @@ $(eval $(call KernelPackage,fs-ext3))
 
 
 define KernelPackage/fs-hfs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_HFS_FS
@@ -106,7 +133,7 @@ $(eval $(call KernelPackage,fs-hfs))
 
 
 define KernelPackage/fs-hfsplus
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_HFSPLUS_FS
@@ -124,7 +151,7 @@ $(eval $(call KernelPackage,fs-hfsplus))
 
 
 define KernelPackage/fs-isofs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=ISO9660 filesystem support
   KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
   FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX)
@@ -141,7 +168,7 @@ $(eval $(call KernelPackage,fs-isofs))
 
 
 define KernelPackage/fs-udf
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=UDF filesystem support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_UDF_FS
@@ -159,16 +186,16 @@ $(eval $(call KernelPackage,fs-udf))
 
 
 define KernelPackage/fs-nfs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=NFS filesystem support
   KCONFIG:= \
        CONFIG_NFS_FS \
        CONFIG_LOCKD \
        CONFIG_SUNRPC
   FILES:= \
-       $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
 endef
 
@@ -180,15 +207,17 @@ $(eval $(call KernelPackage,fs-nfs))
 
 
 define KernelPackage/fs-nfsd
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=NFS kernel server support
-  KCONFIG:=CONFIG_NFSD
+  KCONFIG:= \
+       CONFIG_NFSD \
+       CONFIG_EXPORTFS
   FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,nfsd)
 endef
 
 define KernelPackage/fs-nfsd/2.6
-  KCONFIG+=CONFIG_EXPORTFS
+#  KCONFIG+=CONFIG_EXPORTFS
   FILES+=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD+=$(call AutoLoad,30,exportfs)
 endef
@@ -201,7 +230,7 @@ $(eval $(call KernelPackage,fs-nfsd))
 
 
 define KernelPackage/fs-msdos
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=MSDOS filesystem support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_MSDOS_FS
@@ -218,8 +247,23 @@ endef
 $(eval $(call KernelPackage,fs-msdos))
 
 
+define KernelPackage/fs-reiserfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=ReiserFS filesystem support
+  KCONFIG:=CONFIG_REISERFS_FS
+  FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,reiserfs)
+endef
+
+define KernelPackage/fs-reiserfs/description
+ Kernel module for ReiserFS support
+endef
+
+$(eval $(call KernelPackage,fs-reiserfs))
+
+
 define KernelPackage/fs-vfat
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=VFAT filesystem support
   KCONFIG:= \
        CONFIG_FAT_FS \
@@ -240,7 +284,7 @@ $(eval $(call KernelPackage,fs-vfat))
 
 
 define KernelPackage/fs-xfs
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=XFS filesystem support
   KCONFIG:=CONFIG_XFS_FS
   FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
@@ -255,7 +299,7 @@ $(eval $(call KernelPackage,fs-xfs))
 
 
 define KernelPackage/nls-base
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=Native Language Support
   KCONFIG:=CONFIG_NLS
   FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
@@ -270,7 +314,7 @@ $(eval $(call KernelPackage,nls-base))
 
 
 define KernelPackage/nls-cp437
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=Codepage 437 (United States, Canada)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_CODEPAGE_437
@@ -288,7 +332,7 @@ $(eval $(call KernelPackage,nls-cp437))
 
 
 define KernelPackage/nls-cp850
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=Codepage 850 (Europe)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_CODEPAGE_850
@@ -306,7 +350,7 @@ $(eval $(call KernelPackage,nls-cp850))
 
 
 define KernelPackage/nls-cp1250
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=Codepage 1250 (Eastern Europe)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_CODEPAGE_1250
@@ -324,7 +368,7 @@ $(eval $(call KernelPackage,nls-cp1250))
 
 
 define KernelPackage/nls-iso8859-1
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_ISO8859_1
@@ -342,7 +386,7 @@ $(eval $(call KernelPackage,nls-iso8859-1))
 
 
 define KernelPackage/nls-iso8859-2
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_ISO8859_2
@@ -360,7 +404,7 @@ $(eval $(call KernelPackage,nls-iso8859-2))
 
 
 define KernelPackage/nls-iso8859-15
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_ISO8859_15
@@ -378,7 +422,7 @@ $(eval $(call KernelPackage,nls-iso8859-15))
 
 
 define KernelPackage/nls-koi8r
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=KOI8-R (Russian)
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_KOI8_R
@@ -396,7 +440,7 @@ $(eval $(call KernelPackage,nls-koi8r))
 
 
 define KernelPackage/nls-utf8
-  SUBMENU:=$(FSMENU)
+  SUBMENU:=$(FS_MENU)
   TITLE:=UTF-8
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_UTF8