X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/720644c3ace1c13cde6f8de55bfce5b22295f9f1..c8ae05cb22e9e21ceafb8ba8079ac814fccd8048:/package/kernel/modules/fs.mk

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index dc4e397bd..dfe25a1cd 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -1,17 +1,24 @@
 FSMENU:=Filesystems
 
+define KernelPackage/nls/Depends
+  ifneq ($(KERNEL),2.4)
+    DEPENDS+= +kmod-nls-base $(foreach m,$(1),+kmod-nls-$(m))
+  endif
+endef
+
 define KernelPackage/fs-cifs
   SUBMENU:=$(FSMENU)
   TITLE:=CIFS support
-  DESCRIPTION:=Kernel module for CIFS support
   DEPENDS:=+kmod-nls-base
   KCONFIG:=CONFIG_CIFS
   FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,cifs)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/fs-cifs/2.4
-  DEPENDS:=
+
+define KernelPackage/fs-cifs/description
+ Kernel module for CIFS support
 endef
 
 $(eval $(call KernelPackage,fs-cifs))
@@ -20,65 +27,79 @@ $(eval $(call KernelPackage,fs-cifs))
 define KernelPackage/fs-minix
   SUBMENU:=$(FSMENU)
   TITLE:=Minix filesystem support
-  DESCRIPTION:=Kernel module for Minix filesystem support
   KCONFIG:=CONFIG_MINIX_FS
   FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,minix)
 endef
 
+define KernelPackage/fs-minix/description
+ Kernel module for Minix filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-minix))
 
 
 define KernelPackage/fs-ntfs
   SUBMENU:=$(FSMENU)
   TITLE:=NTFS filesystem support
-  DESCRIPTION:=Kernel module for NTFS filesystem support
   KCONFIG:=CONFIG_NTFS_FS
   FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ntfs)
 endef
 
+define KernelPackage/fs-ntfs/description
+ Kernel module for NTFS filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-ntfs))
 
 
 define KernelPackage/fs-ext2
   SUBMENU:=$(FSMENU)
   TITLE:=EXT2 filesystem support
-  DESCRIPTION:=Kernel module for EXT2 filesystem support
   KCONFIG:=CONFIG_EXT2_FS
   FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ext2)
 endef
 
+define KernelPackage/fs-ext2/description
+ Kernel module for EXT2 filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-ext2))
 
 
 define KernelPackage/fs-ext3
   SUBMENU:=$(FSMENU)
   TITLE:=EXT3 filesystem support
-  DESCRIPTION:=Kernel module for EXT3 filesystem support
-  KCONFIG:=CONFIG_EXT3_FS
+  KCONFIG:= \
+	CONFIG_EXT3_FS \
+	CONFIG_JBD
   FILES:= \
-	$(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,jbd ext3)
 endef
 
+define KernelPackage/fs-ext3/description
+ Kernel module for EXT3 filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-ext3))
 
 
 define KernelPackage/fs-hfs
   SUBMENU:=$(FSMENU)
   TITLE:=HFS+ filesystem support
-  DESCRIPTION:=Kernel module for 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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/fs-hfs/2.4
-  DEPENDS:=
+define KernelPackage/fs-hfs/description
+ Kernel module for HFS filesystem support
 endef
 
 $(eval $(call KernelPackage,fs-hfs))
@@ -87,15 +108,16 @@ $(eval $(call KernelPackage,fs-hfs))
 define KernelPackage/fs-hfsplus
   SUBMENU:=$(FSMENU)
   TITLE:=HFS+ filesystem support
-  DESCRIPTION:=Kernel module for 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)
+$(call KernelPackage/nls/Depends,utf8)
 endef
 
-define KernelPackage/fs-hfsplus/2.4
-  DEPENDS:=
+
+define KernelPackage/fs-hfsplus/description
+ Kernel module for HFS+ filesystem support
 endef
 
 $(eval $(call KernelPackage,fs-hfsplus))
@@ -104,15 +126,15 @@ $(eval $(call KernelPackage,fs-hfsplus))
 define KernelPackage/fs-isofs
   SUBMENU:=$(FSMENU)
   TITLE:=ISO9660 filesystem support
-  DESCRIPTION:=Kernel module for ISO9660 filesystem support
-  DEPENDS:=+kmod-nls-base
-  KCONFIG:=CONFIG_ISO9660_FS
+  KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
   FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,isofs)
+$(call KernelPackage/nls/Depends)
 endef
 
-define Kernel/Package/fs-isofs/2.4
-  DEPENDS:=
+
+define KernelPackage/fs-isofs/description
+ Kernel module for ISO9660 filesystem support
 endef
 
 $(eval $(call KernelPackage,fs-isofs))
@@ -121,15 +143,16 @@ $(eval $(call KernelPackage,fs-isofs))
 define KernelPackage/fs-udf
   SUBMENU:=$(FSMENU)
   TITLE:=UDF filesystem support
-  DESCRIPTION:=Kernel module for 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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/fs-udf/2.4
-  DEPENDS:=
+
+define KernelPackage/fs-udf/description
+ Kernel module for UDF filesystem support
 endef
 
 $(eval $(call KernelPackage,fs-udf))
@@ -138,33 +161,40 @@ $(eval $(call KernelPackage,fs-udf))
 define KernelPackage/fs-nfs
   SUBMENU:=$(FSMENU)
   TITLE:=NFS filesystem support
-  DESCRIPTION:=Kernel module for NFS support
-  KCONFIG:=CONFIG_NFS_FS
+  KCONFIG:= \
+	CONFIG_NFS_FS \
+	CONFIG_LOCKD \
+	CONFIG_SUNRPC
   FILES:= \
-  	$(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)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX)
+  	$(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
 endef
 
+define KernelPackage/fs-nfs/description
+ Kernel module for NFS support
+endef
+
 $(eval $(call KernelPackage,fs-nfs))
 
 
 define KernelPackage/fs-nfsd
   SUBMENU:=$(FSMENU)
   TITLE:=NFS kernel server support
-  DESCRIPTION:=Kernel module for NFS kernel server support
   KCONFIG:=CONFIG_NFSD
   FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/fs-nfsd/2.4
-  AUTOLOAD:=$(call AutoLoad,30,nfsd)
+  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 nfsd)
+  AUTOLOAD+=$(call AutoLoad,30,exportfs)
+endef
+
+define KernelPackage/fs-nfsd/description
+ Kernel module for NFS kernel server support
 endef
 
 $(eval $(call KernelPackage,fs-nfsd))
@@ -173,15 +203,16 @@ $(eval $(call KernelPackage,fs-nfsd))
 define KernelPackage/fs-msdos
   SUBMENU:=$(FSMENU)
   TITLE:=MSDOS filesystem support
-  DESCRIPTION:=Kernel module for 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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/fs-msdos/2.4
-  DEPENDS:=
+
+define KernelPackage/fs-msdos/description
+ Kernel module for MSDOS filesystem support
 endef
 
 $(eval $(call KernelPackage,fs-msdos))
@@ -190,17 +221,19 @@ $(eval $(call KernelPackage,fs-msdos))
 define KernelPackage/fs-vfat
   SUBMENU:=$(FSMENU)
   TITLE:=VFAT filesystem support
-  DESCRIPTION:=Kernel module for VFAT filesystem support
-  DEPENDS:=+kmod-nls-base
-  KCONFIG:=CONFIG_VFAT_FS
+  KCONFIG:= \
+	CONFIG_FAT_FS \
+	CONFIG_VFAT_FS
   FILES:= \
 	$(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,fat vfat)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/fs-vfat/2.4
-  DEPENDS:=
+
+define KernelPackage/fs-vfat/description
+ Kernel module for VFAT filesystem support
 endef
 
 $(eval $(call KernelPackage,fs-vfat))
@@ -209,10 +242,13 @@ $(eval $(call KernelPackage,fs-vfat))
 define KernelPackage/fs-xfs
   SUBMENU:=$(FSMENU)
   TITLE:=XFS filesystem support
-  DESCRIPTION:=Kernel module for XFS support
   KCONFIG:=CONFIG_XFS_FS
   FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd xfs)
+  AUTOLOAD:=$(call AutoLoad,30,xfs)
+endef
+
+define KernelPackage/fs-xfs/description
+ Kernel module for XFS support
 endef
 
 $(eval $(call KernelPackage,fs-xfs))
@@ -221,26 +257,31 @@ $(eval $(call KernelPackage,fs-xfs))
 define KernelPackage/nls-base
   SUBMENU:=$(FSMENU)
   TITLE:=Native Language Support
-  DESCRIPTION:=Kernel module for Native Language Support
   KCONFIG:=CONFIG_NLS
   FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,nls_base)
 endef
+
+define KernelPackage/nls-base/description
+ Kernel module for NLS (Native Language Support)
+endef
+
 $(eval $(call KernelPackage,nls-base))
 
 
 define KernelPackage/nls-cp437
   SUBMENU:=$(FSMENU)
   TITLE:=Codepage 437 (United States, Canada)
-  DESCRIPTION:=Kernel module for NLS 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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/nfs-c437/2.4
-  DEPENDS:=
+
+define KernelPackage/nls-cp437/description
+ Kernel module for NLS Codepage 437 (United States, Canada)
 endef
 
 $(eval $(call KernelPackage,nls-cp437))
@@ -249,15 +290,16 @@ $(eval $(call KernelPackage,nls-cp437))
 define KernelPackage/nls-cp850
   SUBMENU:=$(FSMENU)
   TITLE:=Codepage 850 (Europe)
-  DESCRIPTION:=Kernel module for NLS 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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/nls-cp850/2.4
-  DEPENDS:=
+
+define KernelPackage/nls-cp850/description
+ Kernel module for NLS Codepage 850 (Europe)
 endef
 
 $(eval $(call KernelPackage,nls-cp850))
@@ -266,15 +308,16 @@ $(eval $(call KernelPackage,nls-cp850))
 define KernelPackage/nls-cp1250
   SUBMENU:=$(FSMENU)
   TITLE:=Codepage 1250 (Eastern Europe)
-  DESCRIPTION:=Kernel module for NLS 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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/nls-cp1250/2.4
-  DEPENDS:=
+
+define KernelPackage/nls-cp1250/description
+ Kernel module for NLS Codepage 1250 (Eastern Europe)
 endef
 
 $(eval $(call KernelPackage,nls-cp1250))
@@ -283,15 +326,16 @@ $(eval $(call KernelPackage,nls-cp1250))
 define KernelPackage/nls-iso8859-1
   SUBMENU:=$(FSMENU)
   TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
-  DESCRIPTION:=Kernel module for ISO 8859-1 (Latin 1)
   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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/nls-iso8859-1/2.4
-  DEPENDS:=
+
+define KernelPackage/nls-iso8859-1/description
+ Kernel module for NLS ISO 8859-1 (Latin 1)
 endef
 
 $(eval $(call KernelPackage,nls-iso8859-1))
@@ -300,15 +344,16 @@ $(eval $(call KernelPackage,nls-iso8859-1))
 define KernelPackage/nls-iso8859-2
   SUBMENU:=$(FSMENU)
   TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
-  DESCRIPTION:=Kernel module for ISO 8859-2 (Latin 2)
   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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/nls-iso8859-2/2.4
-  DEPENDS:=
+
+define KernelPackage/nls-iso8859-2/description
+ Kernel module for NLS ISO 8859-2 (Latin 2)
 endef
 
 $(eval $(call KernelPackage,nls-iso8859-2))
@@ -317,15 +362,16 @@ $(eval $(call KernelPackage,nls-iso8859-2))
 define KernelPackage/nls-iso8859-15
   SUBMENU:=$(FSMENU)
   TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
-  DESCRIPTION:=Kernel module for ISO 8859-15 (Latin 9)
   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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/nls-iso8859-15/2.4
-  DEPENDS:=
+
+define KernelPackage/nls-iso8859-15/description
+ Kernel module for NLS ISO 8859-15 (Latin 9)
 endef
 
 $(eval $(call KernelPackage,nls-iso8859-15))
@@ -334,15 +380,16 @@ $(eval $(call KernelPackage,nls-iso8859-15))
 define KernelPackage/nls-koi8r
   SUBMENU:=$(FSMENU)
   TITLE:=KOI8-R (Russian)
-  DESCRIPTION:=Kernel module for 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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/nls-koi8r/2.4
-  DEPENDS:=
+
+define KernelPackage/nls-koi8r/description
+ Kernel module for NLS KOI8-R (Russian)
 endef
 
 $(eval $(call KernelPackage,nls-koi8r))
@@ -350,16 +397,16 @@ $(eval $(call KernelPackage,nls-koi8r))
 
 define KernelPackage/nls-utf8
   SUBMENU:=$(FSMENU)
-  TITLE:=UTF8
-  DESCRIPTION:=Kernel module for NLS UTF8
+  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)
+$(call KernelPackage/nls/Depends)
 endef
 
-define KernelPackage/nls-utf8/2.4
-  DEPENDS:=
+define KernelPackage/nls-utf8/description
+ Kernel module for NLS UTF-8
 endef
 
 $(eval $(call KernelPackage,nls-utf8))