qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-03-11 06:59:12 +02:00
Code

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)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28668 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2011-10-29 15:03:56 +00:00
parent 16bb615819
commit a0b9641a8f
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

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