upgrade busybox to v1.11.1 and add current upstream fixes

[openwrt.git] / package / kernel / modules / fs.mk

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 4516105..a7829d5 100644 (file)
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -10,14 +10,13 @@ FS_MENU:=Filesystems
 
 define KernelPackage/nls/Depends
   ifneq ($(KERNEL),2.4)
-    DEPENDS+= +kmod-nls-base $(foreach m,$(1),+kmod-nls-$(m))
+    DEPENDS:= +kmod-nls-base
   endif
 endef
 
 define KernelPackage/fs-cifs
   SUBMENU:=$(FS_MENU)
   TITLE:=CIFS support
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_CIFS
   FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,cifs)
@@ -62,10 +61,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:=$(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
@@ -83,6 +100,7 @@ define KernelPackage/fs-ext3
   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)
@@ -99,7 +117,6 @@ $(eval $(call KernelPackage,fs-ext3))
 define KernelPackage/fs-hfs
   SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_HFS_FS
   FILES:=$(LINUX_DIR)/fs/hfs/hfs.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,hfs)
@@ -116,7 +133,6 @@ $(eval $(call KernelPackage,fs-hfs))
 define KernelPackage/fs-hfsplus
   SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_HFSPLUS_FS
   FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,hfsplus)
@@ -151,7 +167,6 @@ $(eval $(call KernelPackage,fs-isofs))
 define KernelPackage/fs-udf
   SUBMENU:=$(FS_MENU)
   TITLE:=UDF filesystem support
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_UDF_FS
   FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,udf)
@@ -165,19 +180,30 @@ endef
 
 $(eval $(call KernelPackage,fs-udf))
 
-
-define KernelPackage/fs-nfs
+define KernelPackage/fs-nfs-common
   SUBMENU:=$(FS_MENU)
-  TITLE:=NFS filesystem support
+  TITLE:=Common NFS filesystem modules
   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)
-  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
+  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd)
+endef
+
+$(eval $(call KernelPackage,fs-nfs-common))
+
+
+define KernelPackage/fs-nfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=NFS filesystem support
+  DEPENDS:=kmod-fs-nfs-common
+  KCONFIG:= \
+       CONFIG_NFS_FS
+  FILES:= \
+       $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,nfs)
 endef
 
 define KernelPackage/fs-nfs/description
@@ -190,17 +216,18 @@ $(eval $(call KernelPackage,fs-nfs))
 define KernelPackage/fs-nfsd
   SUBMENU:=$(FS_MENU)
   TITLE:=NFS kernel server support
-  KCONFIG:= \
-       CONFIG_NFSD \
-       CONFIG_EXPORTFS
+  DEPENDS:=kmod-fs-nfs-common
+  KCONFIG:=CONFIG_NFSD
   FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,nfsd)
 endef
 
 define KernelPackage/fs-nfsd/2.6
-#  KCONFIG+=CONFIG_EXPORTFS
-  FILES+=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD+=$(call AutoLoad,30,exportfs)
+  KCONFIG+=CONFIG_EXPORTFS \
+       CONFIG_SUNRPC_GSS
+  FILES+=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD+=$(call AutoLoad,40,auth_rpcgss exportfs nfsd)
 endef
 
 define KernelPackage/fs-nfsd/description
@@ -213,7 +240,6 @@ $(eval $(call KernelPackage,fs-nfsd))
 define KernelPackage/fs-msdos
   SUBMENU:=$(FS_MENU)
   TITLE:=MSDOS filesystem support
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_MSDOS_FS
   FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,msdos)
@@ -297,7 +323,6 @@ $(eval $(call KernelPackage,nls-base))
 define KernelPackage/nls-cp437
   SUBMENU:=$(FS_MENU)
   TITLE:=Codepage 437 (United States, Canada)
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_CODEPAGE_437
   FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
@@ -315,7 +340,6 @@ $(eval $(call KernelPackage,nls-cp437))
 define KernelPackage/nls-cp850
   SUBMENU:=$(FS_MENU)
   TITLE:=Codepage 850 (Europe)
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_CODEPAGE_850
   FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
@@ -333,7 +357,6 @@ $(eval $(call KernelPackage,nls-cp850))
 define KernelPackage/nls-cp1250
   SUBMENU:=$(FS_MENU)
   TITLE:=Codepage 1250 (Eastern Europe)
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_CODEPAGE_1250
   FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_cp1250)
@@ -348,10 +371,26 @@ endef
 $(eval $(call KernelPackage,nls-cp1250))
 
 
+define KernelPackage/nls-cp1251
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Codepage 1251 (Russian)
+  KCONFIG:=CONFIG_NLS_CODEPAGE_1251
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1251.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp1251)
+$(call KernelPackage/nls/Depends)
+endef
+
+
+define KernelPackage/nls-cp1251/description
+ Kernel module for NLS Codepage 1251 (Russian)
+endef
+
+$(eval $(call KernelPackage,nls-cp1251))
+
+
 define KernelPackage/nls-iso8859-1
   SUBMENU:=$(FS_MENU)
   TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_ISO8859_1
   FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
@@ -369,7 +408,6 @@ $(eval $(call KernelPackage,nls-iso8859-1))
 define KernelPackage/nls-iso8859-2
   SUBMENU:=$(FS_MENU)
   TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_ISO8859_2
   FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-2)
@@ -387,7 +425,6 @@ $(eval $(call KernelPackage,nls-iso8859-2))
 define KernelPackage/nls-iso8859-15
   SUBMENU:=$(FS_MENU)
   TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_ISO8859_15
   FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
@@ -405,7 +442,6 @@ $(eval $(call KernelPackage,nls-iso8859-15))
 define KernelPackage/nls-koi8r
   SUBMENU:=$(FS_MENU)
   TITLE:=KOI8-R (Russian)
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_KOI8_R
   FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r)
@@ -423,7 +459,6 @@ $(eval $(call KernelPackage,nls-koi8r))
 define KernelPackage/nls-utf8
   SUBMENU:=$(FS_MENU)
   TITLE:=UTF-8
-  DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_NLS_UTF8
   FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_utf8)