ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-22 15:02:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

package/kernel: various NLS handling fixes

Browse Source 
* move AddDepends/nls to 001-depends.mk for proper use by other packages (closes: #7639)
 * make kmod-usb-core use it
 * fix deps generated from its arguments (as used in kmod-fs-hfsplus)

SVN-Revision: 28668
This commit is contained in:
Nicolas Thill 2011-10-29 15:03:56 +00:00
parent 0c95fe5de1
commit 0a84f6a74e
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/kernel/modules/001-depends.mk
View File

@ -18,6 +18,11 @@ define AddDepends/input
endef endef
define AddDepends/nls
DEPENDS+= +kmod-nls-base $(foreach cp,$(1),+kmod-nls-$(cp))
endef
define SetDepends/rfkill define SetDepends/rfkill
DEPENDS:= @(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86||TARGET_gemini) DEPENDS:= @(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86||TARGET_gemini)
endef endef

16
package/kernel/modules/fs.mk
View File

@ -47,7 +47,7 @@ define KernelPackage/fs-cifs
KCONFIG:=CONFIG_CIFS KCONFIG:=CONFIG_CIFS
FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko
AUTOLOAD:=$(call AutoLoad,30,cifs) AUTOLOAD:=$(call AutoLoad,30,cifs)
$(call AddDepends/nls) $(call AddDepends/nls)
DEPENDS+= \ DEPENDS+= \
+!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_36):kmod-crypto-arc4 \ +!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_36):kmod-crypto-arc4 \
+!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_36):kmod-crypto-hmac \ +!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_36):kmod-crypto-hmac \
@ -147,7 +147,7 @@ define KernelPackage/fs-hfs
KCONFIG:=CONFIG_HFS_FS KCONFIG:=CONFIG_HFS_FS
FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko
AUTOLOAD:=$(call AutoLoad,30,hfs) AUTOLOAD:=$(call AutoLoad,30,hfs)
$(call AddDepends/nls) $(call AddDepends/nls)
endef endef
define KernelPackage/fs-hfs/description define KernelPackage/fs-hfs/description
@ -163,7 +163,7 @@ define KernelPackage/fs-hfsplus
KCONFIG:=CONFIG_HFSPLUS_FS KCONFIG:=CONFIG_HFSPLUS_FS
FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.ko FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.ko
AUTOLOAD:=$(call AutoLoad,30,hfsplus) AUTOLOAD:=$(call AutoLoad,30,hfsplus)
$(call AddDepends/nls,utf8) $(call AddDepends/nls,utf8)
endef endef
define KernelPackage/fs-hfsplus/description define KernelPackage/fs-hfsplus/description
@ -179,7 +179,7 @@ define KernelPackage/fs-isofs
KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko
AUTOLOAD:=$(call AutoLoad,30,isofs) AUTOLOAD:=$(call AutoLoad,30,isofs)
$(call AddDepends/nls) $(call AddDepends/nls)
endef endef
define KernelPackage/fs-isofs/description define KernelPackage/fs-isofs/description
@ -210,7 +210,7 @@ define KernelPackage/fs-msdos
KCONFIG:=CONFIG_MSDOS_FS KCONFIG:=CONFIG_MSDOS_FS
FILES:=$(LINUX_DIR)/fs/fat/msdos.ko FILES:=$(LINUX_DIR)/fs/fat/msdos.ko
AUTOLOAD:=$(call AutoLoad,40,msdos) AUTOLOAD:=$(call AutoLoad,40,msdos)
$(call AddDepends/nls) $(call AddDepends/nls)
endef endef
define KernelPackage/fs-msdos/description define KernelPackage/fs-msdos/description
@ -294,7 +294,7 @@ define KernelPackage/fs-ntfs
KCONFIG:=CONFIG_NTFS_FS KCONFIG:=CONFIG_NTFS_FS
FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko
AUTOLOAD:=$(call AutoLoad,30,ntfs) AUTOLOAD:=$(call AutoLoad,30,ntfs)
$(call AddDepends/nls) $(call AddDepends/nls)
endef endef
define KernelPackage/fs-ntfs/description define KernelPackage/fs-ntfs/description
@ -326,7 +326,7 @@ define KernelPackage/fs-udf
FILES:=$(LINUX_DIR)/fs/udf/udf.ko FILES:=$(LINUX_DIR)/fs/udf/udf.ko
AUTOLOAD:=$(call AutoLoad,30,udf) AUTOLOAD:=$(call AutoLoad,30,udf)
DEPENDS:=+kmod-lib-crc-itu-t DEPENDS:=+kmod-lib-crc-itu-t
$(call AddDepends/nls) $(call AddDepends/nls)
endef endef
define KernelPackage/fs-udf/description define KernelPackage/fs-udf/description
@ -346,7 +346,7 @@ define KernelPackage/fs-vfat
$(LINUX_DIR)/fs/fat/fat.ko \ $(LINUX_DIR)/fs/fat/fat.ko \
$(LINUX_DIR)/fs/fat/vfat.ko $(LINUX_DIR)/fs/fat/vfat.ko
AUTOLOAD:=$(call AutoLoad,30,fat vfat) AUTOLOAD:=$(call AutoLoad,30,fat vfat)
$(call AddDepends/nls) $(call AddDepends/nls)
endef endef
define KernelPackage/fs-vfat/description define KernelPackage/fs-vfat/description

6
package/kernel/modules/nls.mk
View File

@ -1,14 +1,10 @@
# #
# Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2006-2011 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
define AddDepends/nls
DEPENDS+= +kmod-nls-base
endef
define KernelPackage/nls-base define KernelPackage/nls-base
SUBMENU:=Native Language Support SUBMENU:=Native Language Support
TITLE:=Native Language Support TITLE:=Native Language Support

5
package/kernel/modules/usb.mk
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2006-2011 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -14,10 +14,11 @@ USBINPUT_DIR?=input/misc
define KernelPackage/usb-core define KernelPackage/usb-core
SUBMENU:=$(USB_MENU) SUBMENU:=$(USB_MENU)
TITLE:=Support for USB TITLE:=Support for USB
DEPENDS:=@USB_SUPPORT +kmod-nls-base DEPENDS:=@USB_SUPPORT
KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n
FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.ko FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.ko
AUTOLOAD:=$(call AutoLoad,20,usbcore,1) AUTOLOAD:=$(call AutoLoad,20,usbcore,1)
$(call AddDepends/nls)
endef endef
define KernelPackage/usb-core/description define KernelPackage/usb-core/description