cleanup

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

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index dd29fc7..762a898 100644 (file)
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -3,10 +3,11 @@ FSMENU:=Filesystems
 define KernelPackage/fs-cifs
   TITLE:=CIFS support
   DESCRIPTION:=Kernel module for CIFS support
 define KernelPackage/fs-cifs
   TITLE:=CIFS support
   DESCRIPTION:=Kernel module for CIFS support

+  DEPENDS:=+kmod-nls-base

   KCONFIG:=$(CONFIG_CIFS)
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,cifs)
   KCONFIG:=$(CONFIG_CIFS)
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,cifs)

-  FILES:=$(MODULES_DIR)/kernel/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)

 endef
 $(eval $(call KernelPackage,fs-cifs))
 
 endef
 $(eval $(call KernelPackage,fs-cifs))
 


@@ -16,7 +17,7 @@ define KernelPackage/fs-minix
   KCONFIG:=$(CONFIG_MINIX_FS)
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,minix)
   KCONFIG:=$(CONFIG_MINIX_FS)
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,minix)

-  FILES:=$(MODULES_DIR)/kernel/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX)

 endef
 $(eval $(call KernelPackage,fs-minix))
 
 endef
 $(eval $(call KernelPackage,fs-minix))
 


@@ -26,7 +27,7 @@ define KernelPackage/fs-ext2
   KCONFIG:=$(CONFIG_EXT2_FS)
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,ext2)
   KCONFIG:=$(CONFIG_EXT2_FS)
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,ext2)

-  FILES:=$(MODULES_DIR)/kernel/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)

 endef
 $(eval $(call KernelPackage,fs-ext2))
 
 endef
 $(eval $(call KernelPackage,fs-ext2))
 


@@ -37,8 +38,8 @@ define KernelPackage/fs-ext3
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,jbd ext3)
   FILES:= \
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,jbd ext3)
   FILES:= \

-       $(MODULES_DIR)/kernel/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX)

 endef
 $(eval $(call KernelPackage,fs-ext3))
 
 endef
 $(eval $(call KernelPackage,fs-ext3))
 


@@ -49,10 +50,32 @@ define KernelPackage/fs-hfsplus
   KCONFIG:=$(CONFIG_HFSPLUS_FS)
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,hfsplus)
   KCONFIG:=$(CONFIG_HFSPLUS_FS)
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,hfsplus)

-  FILES:=$(MODULES_DIR)/kernel/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX)

 endef
 $(eval $(call KernelPackage,fs-hfsplus))
 
 endef
 $(eval $(call KernelPackage,fs-hfsplus))
 

+define KernelPackage/fs-isofs
+  TITLE:=ISO9660 filesystem support
+  DESCRIPTION:=Kernel module for ISO9660 filesystem support
+  DEPENDS:=+kmod-nls-base
+  KCONFIG:=$(CONFIG_ISO9660_FS)
+  SUBMENU:=$(FSMENU)
+  AUTOLOAD:=$(call AutoLoad,30,isofs)
+  FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,fs-isofs))
+
+define KernelPackage/fs-udf
+  TITLE:=UDF filesystem support
+  DESCRIPTION:=Kernel module for UDF filesystem support
+  DEPENDS:=+kmod-nls-base
+  KCONFIG:=$(CONFIG_UDF_FS)
+  SUBMENU:=$(FSMENU)
+  AUTOLOAD:=$(call AutoLoad,30,udf)
+  FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,fs-udf))
+

 define KernelPackage/fs-nfs
   TITLE:=NFS filesystem support
   DESCRIPTION:=Kernel module for NFS support
 define KernelPackage/fs-nfs
   TITLE:=NFS filesystem support
   DESCRIPTION:=Kernel module for NFS support


@@ -60,12 +83,35 @@ define KernelPackage/fs-nfs
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
   FILES:= \
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
   FILES:= \

-       $(MODULES_DIR)/kernel/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX)

 endef
 $(eval $(call KernelPackage,fs-nfs))
 
 endef
 $(eval $(call KernelPackage,fs-nfs))
 

+define KernelPackage/fs-nfsd
+  TITLE:=NFS kernel server support
+  DESCRIPTION:=Kernel module for NFS kernel server support
+  KCONFIG:=$(CONFIG_NFSD)
+  SUBMENU:=$(FSMENU)
+  AUTOLOAD:=$(call AutoLoad,30,nfsd)
+  FILES:= \
+       $(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,fs-nfsd))
+
+define KernelPackage/fs-msdos
+  TITLE:=MSDOS filesystem support
+  DESCRIPTION:=Kernel module for MSDOS filesystem support
+  DEPENDS:=+kmod-nls-base
+  KCONFIG:=$(CONFIG_MSDOS_FS)
+  SUBMENU:=$(FSMENU)
+  AUTOLOAD:=$(call AutoLoad,40,msdos)
+  FILES:= \
+       $(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,fs-msdos))
+

 define KernelPackage/fs-vfat
   TITLE:=VFAT filesystem support
   DESCRIPTION:=Kernel module for VFAT filesystem support
 define KernelPackage/fs-vfat
   TITLE:=VFAT filesystem support
   DESCRIPTION:=Kernel module for VFAT filesystem support


@@ -74,8 +120,8 @@ define KernelPackage/fs-vfat
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,fat vfat)
   FILES:= \
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,fat vfat)
   FILES:= \

-       $(MODULES_DIR)/kernel/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)

 endef
 $(eval $(call KernelPackage,fs-vfat))
 
 endef
 $(eval $(call KernelPackage,fs-vfat))
 


@@ -86,7 +132,7 @@ define KernelPackage/fs-xfs
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd xfs)
   FILES:= \
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd xfs)
   FILES:= \

-       $(MODULES_DIR)/kernel/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)

 endef
 $(eval $(call KernelPackage,fs-xfs))
 
 endef
 $(eval $(call KernelPackage,fs-xfs))
 


@@ -97,7 +143,7 @@ define KernelPackage/nls-base
   KCONFIG:=$(CONFIG_NLS)
   SUBMENU:=$(FSMENU)
   MENU:=1
   KCONFIG:=$(CONFIG_NLS)
   SUBMENU:=$(FSMENU)
   MENU:=1

-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,20,nls_base)
 endef
 $(eval $(call KernelPackage,nls-base))
   AUTOLOAD:=$(call AutoLoad,20,nls_base)
 endef
 $(eval $(call KernelPackage,nls-base))


@@ -109,7 +155,7 @@ define KernelPackage/nls-cp437
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_CODEPAGE_437)
   SUBMENU:=$(FSMENU)
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_CODEPAGE_437)
   SUBMENU:=$(FSMENU)

-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
 endef
 $(eval $(call KernelPackage,nls-cp437))
   AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
 endef
 $(eval $(call KernelPackage,nls-cp437))


@@ -121,11 +167,21 @@ define KernelPackage/nls-cp850
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_CODEPAGE_850)
   SUBMENU:=$(FSMENU)
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_CODEPAGE_850)
   SUBMENU:=$(FSMENU)

-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
 endef
 $(eval $(call KernelPackage,nls-cp850))
 
   AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
 endef
 $(eval $(call KernelPackage,nls-cp850))
 

+define KernelPackage/nls-cp1250
+  TITLE:=Codepage 1250 (Eastern Europe)
+  DESCRIPTION:=Kernel module for NLS Codepage 1250 (Eastern Europe)
+  DEPENDS:=kmod-nls-base
+  KCONFIG:=$(CONFIG_NLS_CODEPAGE_1250)
+  SUBMENU:=$(FSMENU)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,25,nls_cp1250)
+endef
+$(eval $(call KernelPackage,nls-cp1250))

 
 define KernelPackage/nls-iso8859-1
   TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
 
 define KernelPackage/nls-iso8859-1
   TITLE:=ISO 8859-1 (Latin 1; Western European Languages)


@@ -133,7 +189,7 @@ define KernelPackage/nls-iso8859-1
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_ISO8859_1)
   SUBMENU:=$(FSMENU)
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_ISO8859_1)
   SUBMENU:=$(FSMENU)

-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
 endef
 $(eval $(call KernelPackage,nls-iso8859-1))
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
 endef
 $(eval $(call KernelPackage,nls-iso8859-1))


@@ -144,7 +200,7 @@ define KernelPackage/nls-iso8859-15
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_ISO8859_15)
   SUBMENU:=$(FSMENU)
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_ISO8859_15)
   SUBMENU:=$(FSMENU)

-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
 endef
 $(eval $(call KernelPackage,nls-iso8859-15))
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
 endef
 $(eval $(call KernelPackage,nls-iso8859-15))


@@ -155,7 +211,7 @@ define KernelPackage/nls-koi8r
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_KOI8_R)
   SUBMENU:=$(FSMENU)
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_KOI8_R)
   SUBMENU:=$(FSMENU)

-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r)
 endef
 $(eval $(call KernelPackage,nls-koi8r))
   AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r)
 endef
 $(eval $(call KernelPackage,nls-koi8r))


@@ -166,7 +222,7 @@ define KernelPackage/nls-utf8
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_UTF8)
   SUBMENU:=$(FSMENU)
   DEPENDS:=kmod-nls-base
   KCONFIG:=$(CONFIG_NLS_UTF8)
   SUBMENU:=$(FSMENU)

-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,25,nls_utf8)
 endef
 $(eval $(call KernelPackage,nls-utf8))
   AUTOLOAD:=$(call AutoLoad,25,nls_utf8)
 endef
 $(eval $(call KernelPackage,nls-utf8))