From 9a6e9f8aabd6834ee7c7d085080aa9dd19dc937e Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 1 Jun 2007 14:05:35 +0000 Subject: [PATCH] Make nls-base dependency 2.6 specific, really closes #1647 SVN-Revision: 7432 --- package/kernel/modules/fs.mk | 65 ++++++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index 762a8984d3..f28c9ad68b 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -3,12 +3,15 @@ FSMENU:=Filesystems 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) FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX) endef + +define KernelPackage/fs-cifs/2.6 + DEPENDS:=+kmod-nls-base +endef $(eval $(call KernelPackage,fs-cifs)) define KernelPackage/fs-minix @@ -46,34 +49,43 @@ $(eval $(call KernelPackage,fs-ext3)) define KernelPackage/fs-hfsplus TITLE:=HFS+ filesystem support DESCRIPTION:=Kernel module for HFS+ filesystem support - DEPENDS:=+kmod-nls-base KCONFIG:=$(CONFIG_HFSPLUS_FS) SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,hfsplus) FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX) endef + +define KernelPackage/fs-hfsplus/2.6 + DEPENDS:=+kmod-nls-base +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 + +define Kernel/Package/fs-isofs/2.6 + DEPENDS:=+kmod-nls-base +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 + +define KernelPackage/fs-udf/2.6 + DEPENDS:=+kmod-nls-base +endef $(eval $(call KernelPackage,fs-udf)) define KernelPackage/fs-nfs @@ -103,19 +115,21 @@ $(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 + +define KernelPackage/fs-msdos/2.6 + DEPENDS:=+kmod-nls-base +endef $(eval $(call KernelPackage,fs-msdos)) define KernelPackage/fs-vfat TITLE:=VFAT filesystem support DESCRIPTION:=Kernel module for VFAT filesystem support - DEPENDS:=+kmod-nls-base KCONFIG:=$(CONFIG_VFAT_FS) SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,fat vfat) @@ -123,6 +137,10 @@ define KernelPackage/fs-vfat $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX) endef + +define KernelPackage/fs-vfat/2.6 + DEPENDS:=+kmod-nls-base +endef $(eval $(call KernelPackage,fs-vfat)) define KernelPackage/fs-xfs @@ -152,79 +170,100 @@ $(eval $(call KernelPackage,nls-base)) define KernelPackage/nls-cp437 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) 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 +endef $(eval $(call KernelPackage,nls-cp437)) define KernelPackage/nls-cp850 TITLE:=Codepage 850 (Europe) DESCRIPTION:=Kernel module for NLS Codepage 850 (Europe) - DEPENDS:=kmod-nls-base KCONFIG:=$(CONFIG_NLS_CODEPAGE_850) 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 +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 + +define KernelPackage/nls-cp1250/2.6 + DEPENDS:=+kmod-nls-base +endef $(eval $(call KernelPackage,nls-cp1250)) define KernelPackage/nls-iso8859-1 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) 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 +endef $(eval $(call KernelPackage,nls-iso8859-1)) define KernelPackage/nls-iso8859-15 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) 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 +endef $(eval $(call KernelPackage,nls-iso8859-15)) define KernelPackage/nls-koi8r TITLE:=KOI8-R (Russian) DESCRIPTION:=Kernel module for KOI8-R (Russian) - DEPENDS:=kmod-nls-base KCONFIG:=$(CONFIG_NLS_KOI8_R) 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 +endef $(eval $(call KernelPackage,nls-koi8r)) define KernelPackage/nls-utf8 TITLE:=UTF8 DESCRIPTION:=Kernel module for NLS UTF8 - DEPENDS:=kmod-nls-base KCONFIG:=$(CONFIG_NLS_UTF8) 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 +endef $(eval $(call KernelPackage,nls-utf8))