From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 24 Apr 2010 12:09:30 +0000 (+0000)
Subject: package/kernel: sort FS package definitions
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f02dad6aca839bfe4b18b8277f17073dd6c093e9;p=openwrt%2Fstaging%2Fjow.git

package/kernel: sort FS package definitions

SVN-Revision: 21126
---

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index ad2f9c2b80..30190f8640 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -7,70 +7,73 @@
 
 FS_MENU:=Filesystems
 
-define KernelPackage/fs-cifs
+define KernelPackage/fs-autofs4
   SUBMENU:=$(FS_MENU)
-  TITLE:=CIFS support
-  KCONFIG:=CONFIG_CIFS
-  FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,cifs)
-$(call AddDepends/nls)
+  TITLE:=AUTOFS4 filesystem support
+  KCONFIG:=CONFIG_AUTOFS4_FS 
+  FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,autofs4)
 endef
 
-
-define KernelPackage/fs-cifs/description
- Kernel module for CIFS support
+define KernelPackage/fs-autofs4/description
+  Kernel module for AutoFS4 support
 endef
 
-$(eval $(call KernelPackage,fs-cifs))
+$(eval $(call KernelPackage,fs-autofs4))
 
 
-define KernelPackage/fs-minix
+define KernelPackage/fs-btrfs
   SUBMENU:=$(FS_MENU)
-  TITLE:=Minix filesystem support
-  KCONFIG:=CONFIG_MINIX_FS
-  FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,minix)
+  TITLE:=BTRFS filesystem support
+  KCONFIG:=\
+	CONFIG_LIBCRC32C \
+	CONFIG_BTRFS_FS \
+	CONFIG_BTRFS_FS_POSIX_ACL=n
+  # for crc32c
+  DEPENDS:=+kmod-crypto-core +kmod-crypto-misc
+  FILES:=\
+	$(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/fs/btrfs/btrfs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,crc32c libcrc32c btrfs,1)
 endef
 
-define KernelPackage/fs-minix/description
- Kernel module for Minix filesystem support
+define KernelPackage/fs-btrfs/description
+  Kernel module for BTRFS support
 endef
 
-$(eval $(call KernelPackage,fs-minix))
+$(eval $(call KernelPackage,fs-btrfs))
 
 
-define KernelPackage/fs-ntfs
+define KernelPackage/fs-cifs
   SUBMENU:=$(FS_MENU)
-  TITLE:=NTFS filesystem support
-  KCONFIG:=CONFIG_NTFS_FS
-  FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,ntfs)
+  TITLE:=CIFS support
+  KCONFIG:=CONFIG_CIFS
+  FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,cifs)
 $(call AddDepends/nls)
 endef
 
-define KernelPackage/fs-ntfs/description
- Kernel module for NTFS filesystem support
+define KernelPackage/fs-cifs/description
+ Kernel module for CIFS support
 endef
 
-$(eval $(call KernelPackage,fs-ntfs))
+$(eval $(call KernelPackage,fs-cifs))
 
 
-define KernelPackage/fs-mbcache
+define KernelPackage/fs-exportfs
   SUBMENU:=$(FS_MENU)
-  TITLE:=mbcache (used by ext2/ext3/ext4)
-  KCONFIG:=CONFIG_FS_MBCACHE
-  ifneq ($(CONFIG_FS_MBCACHE),)
-    FILES:=$(LINUX_DIR)/fs/mbcache.$(LINUX_KMOD_SUFFIX)
-    AUTOLOAD:=$(call AutoLoad,20,mbcache,1)
-  endif
+  TITLE:=exportfs kernel server support
+  KCONFIG:=CONFIG_EXPORTFS
+  FILES=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,exportfs)
 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
+define KernelPackage/fs-exportfs/description
+ Kernel module for exportfs. Needed for some other modules.
 endef
-$(eval $(call KernelPackage,fs-mbcache))
+
+$(eval $(call KernelPackage,fs-exportfs))
+
 
 define KernelPackage/fs-ext2
   SUBMENU:=$(FS_MENU)
@@ -107,6 +110,7 @@ endef
 
 $(eval $(call KernelPackage,fs-ext3))
 
+
 define KernelPackage/fs-ext4
   SUBMENU:=$(FS_MENU)
   TITLE:=EXT4 filesystem support
@@ -131,7 +135,6 @@ endef
 $(eval $(call KernelPackage,fs-ext4))
 
 
-
 define KernelPackage/fs-hfs
   SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support
@@ -157,7 +160,6 @@ define KernelPackage/fs-hfsplus
 $(call AddDepends/nls,utf8)
 endef
 
-
 define KernelPackage/fs-hfsplus/description
  Kernel module for HFS+ filesystem support
 endef
@@ -174,7 +176,6 @@ define KernelPackage/fs-isofs
 $(call AddDepends/nls)
 endef
 
-
 define KernelPackage/fs-isofs/description
  Kernel module for ISO9660 filesystem support
 endef
@@ -182,54 +183,58 @@ endef
 $(eval $(call KernelPackage,fs-isofs))
 
 
-define KernelPackage/fs-udf
+define KernelPackage/fs-mbcache
   SUBMENU:=$(FS_MENU)
-  TITLE:=UDF filesystem support
-  KCONFIG:=CONFIG_UDF_FS
-  FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,udf)
-$(call AddDepends/nls)
+  TITLE:=mbcache (used by ext2/ext3/ext4)
+  KCONFIG:=CONFIG_FS_MBCACHE
+  ifneq ($(CONFIG_FS_MBCACHE),)
+    FILES:=$(LINUX_DIR)/fs/mbcache.$(LINUX_KMOD_SUFFIX)
+    AUTOLOAD:=$(call AutoLoad,20,mbcache,1)
+  endif
 endef
 
-
-define KernelPackage/fs-udf/description
- Kernel module for UDF filesystem support
+define KernelPackage/fs-mbcache/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-udf))
+$(eval $(call KernelPackage,fs-mbcache))
 
-define KernelPackage/fs-nfs-common
+
+define KernelPackage/fs-minix
   SUBMENU:=$(FS_MENU)
-  TITLE:=Common NFS filesystem modules
-  KCONFIG:= \
-	CONFIG_LOCKD \
-	CONFIG_SUNRPC
-  FILES:= \
-	$(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd)
+  TITLE:=Minix filesystem support
+  KCONFIG:=CONFIG_MINIX_FS
+  FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,minix)
 endef
 
-$(eval $(call KernelPackage,fs-nfs-common))
+define KernelPackage/fs-minix/description
+ Kernel module for Minix filesystem support
+endef
 
+$(eval $(call KernelPackage,fs-minix))
 
-define KernelPackage/fs-nfs-common-v4
+
+define KernelPackage/fs-msdos
   SUBMENU:=$(FS_MENU)
-  TITLE:=Common NFS V4 filesystem modules
-  KCONFIG+=\
-	CONFIG_SUNRPC_GSS\
-	CONFIG_NFS_V4=y\
-	CONFIG_NFSD_V4=y
-  DEPENDS:= @LINUX_2_6 @BROKEN
-  FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
+  TITLE:=MSDOS filesystem support
+  KCONFIG:=CONFIG_MSDOS_FS
+  FILES:=$(LINUX_DIR)/fs/fat/msdos.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,msdos)
+$(call AddDepends/nls)
 endef
 
-define KernelPackage/fs-nfs-common-v4/description
- Kernel modules for NFS V4 & NFSD V4 kernel support
+define KernelPackage/fs-msdos/2.4
+  FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
 endef
 
-$(eval $(call KernelPackage,fs-nfs-common-v4))
+define KernelPackage/fs-msdos/description
+ Kernel module for MSDOS filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-msdos))
 
 
 define KernelPackage/fs-nfs
@@ -250,19 +255,38 @@ endef
 $(eval $(call KernelPackage,fs-nfs))
 
 
-define KernelPackage/fs-exportfs
+define KernelPackage/fs-nfs-common
   SUBMENU:=$(FS_MENU)
-  TITLE:=exportfs kernel server support
-  KCONFIG:=CONFIG_EXPORTFS
-  FILES=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,exportfs)
+  TITLE:=Common NFS filesystem modules
+  KCONFIG:= \
+	CONFIG_LOCKD \
+	CONFIG_SUNRPC
+  FILES:= \
+	$(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd)
 endef
 
-define KernelPackage/fs-exportfs/description
- Kernel module for exportfs. Needed for some other modules.
+$(eval $(call KernelPackage,fs-nfs-common))
+
+
+define KernelPackage/fs-nfs-common-v4
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Common NFS V4 filesystem modules
+  KCONFIG+=\
+	CONFIG_SUNRPC_GSS\
+	CONFIG_NFS_V4=y\
+	CONFIG_NFSD_V4=y
+  DEPENDS:= @LINUX_2_6 @BROKEN
+  FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
 endef
 
-$(eval $(call KernelPackage,fs-exportfs))
+define KernelPackage/fs-nfs-common-v4/description
+ Kernel modules for NFS V4 & NFSD V4 kernel support
+endef
+
+$(eval $(call KernelPackage,fs-nfs-common-v4))
 
 
 define KernelPackage/fs-nfsd
@@ -280,24 +304,21 @@ endef
 
 $(eval $(call KernelPackage,fs-nfsd))
 
-define KernelPackage/fs-msdos
+
+define KernelPackage/fs-ntfs
   SUBMENU:=$(FS_MENU)
-  TITLE:=MSDOS filesystem support
-  KCONFIG:=CONFIG_MSDOS_FS
-  FILES:=$(LINUX_DIR)/fs/fat/msdos.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,msdos)
+  TITLE:=NTFS filesystem support
+  KCONFIG:=CONFIG_NTFS_FS
+  FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,ntfs)
 $(call AddDepends/nls)
 endef
 
-define KernelPackage/fs-msdos/2.4
-  FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/fs-msdos/description
- Kernel module for MSDOS filesystem support
+define KernelPackage/fs-ntfs/description
+ Kernel module for NTFS filesystem support
 endef
 
-$(eval $(call KernelPackage,fs-msdos))
+$(eval $(call KernelPackage,fs-ntfs))
 
 
 define KernelPackage/fs-reiserfs
@@ -314,6 +335,23 @@ endef
 
 $(eval $(call KernelPackage,fs-reiserfs))
 
+
+define KernelPackage/fs-udf
+  SUBMENU:=$(FS_MENU)
+  TITLE:=UDF filesystem support
+  KCONFIG:=CONFIG_UDF_FS
+  FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,udf)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/fs-udf/description
+ Kernel module for UDF filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-udf))
+
+
 define KernelPackage/fs-vfat
   SUBMENU:=$(FS_MENU)
   TITLE:=VFAT filesystem support
@@ -354,38 +392,3 @@ define KernelPackage/fs-xfs/description
 endef
 
 $(eval $(call KernelPackage,fs-xfs))
-
-define KernelPackage/fs-btrfs
-  SUBMENU:=$(FS_MENU)
-  TITLE:=BTRFS filesystem support
-  KCONFIG:=\
-	CONFIG_LIBCRC32C \
-	CONFIG_BTRFS_FS \
-	CONFIG_BTRFS_FS_POSIX_ACL=n
-  # for crc32c
-  DEPENDS:=+kmod-crypto-core +kmod-crypto-misc
-  FILES:=\
-	$(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/fs/btrfs/btrfs.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,crc32c libcrc32c btrfs,1)
-endef
-
-define KernelPackage/fs-btrfs/description
-  Kernel module for BTRFS support
-endef
-
-$(eval $(call KernelPackage,fs-btrfs))
-
-define KernelPackage/fs-autofs4
-  SUBMENU:=$(FS_MENU)
-  TITLE:=AUTOFS4 filesystem support
-  KCONFIG:=CONFIG_AUTOFS4_FS 
-  FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,autofs4)
-endef
-
-define KernelPackage/fs-autofs4/description
-  Kernel module for AutoFS4 support
-endef
-
-$(eval $(call KernelPackage,fs-autofs4))