Do it the other way 2.4 has no nls-base dependency 2.6 has (#2222)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8452 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 39 insertions, 26 deletions

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 00dc1622da..aaaf62df4d 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -4,13 +4,14 @@ define KernelPackage/fs-cifs
   TITLE:=CIFS support
   DESCRIPTION:=Kernel module for CIFS support
   KCONFIG:=CONFIG_CIFS
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,cifs)
   FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
 endef
 
-define KernelPackage/fs-cifs/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/fs-cifs/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,fs-cifs))
 
@@ -90,13 +91,14 @@ define KernelPackage/fs-isofs
   TITLE:=ISO9660 filesystem support
   DESCRIPTION:=Kernel module for ISO9660 filesystem support
   KCONFIG:=CONFIG_ISO9660_FS
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,isofs)
   FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX)
 endef
 
-define Kernel/Package/fs-isofs/2.6
-  DEPENDS:=+kmod-nls-base
+define Kernel/Package/fs-isofs/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,fs-isofs))
 
@@ -104,13 +106,14 @@ define KernelPackage/fs-udf
   TITLE:=UDF filesystem support
   DESCRIPTION:=Kernel module for UDF filesystem support
   KCONFIG:=CONFIG_UDF_FS
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,udf)
   FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX)
 endef
 
-define KernelPackage/fs-udf/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/fs-udf/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,fs-udf))
 
@@ -151,14 +154,15 @@ define KernelPackage/fs-msdos
   TITLE:=MSDOS filesystem support
   DESCRIPTION:=Kernel module for MSDOS filesystem support
   KCONFIG:=CONFIG_MSDOS_FS
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,40,msdos)
   FILES:= \
 	$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
 endef
 
-define KernelPackage/fs-msdos/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/fs-msdos/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,fs-msdos))
 
@@ -166,6 +170,7 @@ define KernelPackage/fs-vfat
   TITLE:=VFAT filesystem support
   DESCRIPTION:=Kernel module for VFAT filesystem support
   KCONFIG:=CONFIG_VFAT_FS
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   AUTOLOAD:=$(call AutoLoad,30,fat vfat)
   FILES:= \
@@ -173,8 +178,8 @@ define KernelPackage/fs-vfat
 	$(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
 endef
 
-define KernelPackage/fs-vfat/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/fs-vfat/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,fs-vfat))
 
@@ -206,13 +211,14 @@ define KernelPackage/nls-cp437
   TITLE:=Codepage 437 (United States, Canada)
   DESCRIPTION:=Kernel module for NLS Codepage 437 (United States, Canada)
   KCONFIG:=CONFIG_NLS_CODEPAGE_437
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
 endef
 
-define KernelPackage/nfs-c437/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/nfs-c437/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,nls-cp437))
 
@@ -221,13 +227,14 @@ define KernelPackage/nls-cp850
   TITLE:=Codepage 850 (Europe)
   DESCRIPTION:=Kernel module for NLS Codepage 850 (Europe)
   KCONFIG:=CONFIG_NLS_CODEPAGE_850
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
 endef
 
-define KernelPackage/nls-cp850/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/nls-cp850/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,nls-cp850))
 
@@ -235,13 +242,14 @@ define KernelPackage/nls-cp1250
   TITLE:=Codepage 1250 (Eastern Europe)
   DESCRIPTION:=Kernel module for NLS Codepage 1250 (Eastern Europe)
   KCONFIG:=CONFIG_NLS_CODEPAGE_1250
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_cp1250)
 endef
 
-define KernelPackage/nls-cp1250/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/nls-cp1250/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,nls-cp1250))
 
@@ -249,13 +257,14 @@ define KernelPackage/nls-iso8859-1
   TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
   DESCRIPTION:=Kernel module for ISO 8859-1 (Latin 1)
   KCONFIG:=CONFIG_NLS_ISO8859_1
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
 endef
 
-define KernelPackage/nls-iso8859-1/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/nls-iso8859-1/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,nls-iso8859-1))
 
@@ -263,13 +272,14 @@ define KernelPackage/nls-iso8859-2
   TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
   DESCRIPTION:=Kernel module for ISO 8859-2 (Latin 2)
   KCONFIG:=CONFIG_NLS_ISO8859_2
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-2)
 endef
 
-define KernelPackage/nls-iso8859-2/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/nls-iso8859-2/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,nls-iso8859-2))
 
@@ -277,13 +287,14 @@ define KernelPackage/nls-iso8859-15
   TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
   DESCRIPTION:=Kernel module for ISO 8859-15 (Latin 9)
   KCONFIG:=CONFIG_NLS_ISO8859_15
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
 endef
 
-define KernelPackage/nls-iso8859-15/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/nls-iso8859-15/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,nls-iso8859-15))
 
@@ -291,13 +302,14 @@ define KernelPackage/nls-koi8r
   TITLE:=KOI8-R (Russian)
   DESCRIPTION:=Kernel module for KOI8-R (Russian)
   KCONFIG:=CONFIG_NLS_KOI8_R
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r)
 endef
 
-define KernelPackage/nls-koi8r/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/nls-koi8r/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,nls-koi8r))
 
@@ -305,13 +317,14 @@ define KernelPackage/nls-utf8
   TITLE:=UTF8
   DESCRIPTION:=Kernel module for NLS UTF8
   KCONFIG:=CONFIG_NLS_UTF8
+  DEPENDS:=+kmod-nls-base
   SUBMENU:=$(FSMENU)
   FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,nls_utf8)
 endef
 
-define KernelPackage/nls-utf8/2.6
-  DEPENDS:=+kmod-nls-base
+define KernelPackage/nls-utf8/2.4
+  DEPENDS:=
 endef
 $(eval $(call KernelPackage,nls-utf8))