Changeset 28668


Ignore:
Timestamp:
2011-10-29T17:03:56+02:00 (6 years ago)
Author:
nico
Message:

package/kernel: various NLS handling fixes

  • 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)
Location:
trunk/package/kernel/modules
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/001-depends.mk

    r28656 r28668  
    1919 
    2020 
     21define AddDepends/nls 
     22  DEPENDS+= +kmod-nls-base $(foreach cp,$(1),+kmod-nls-$(cp)) 
     23endef 
     24 
     25 
    2126define SetDepends/rfkill 
    2227  DEPENDS:= @(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86||TARGET_gemini) 
  • trunk/package/kernel/modules/fs.mk

    r28666 r28668  
    4848  FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko 
    4949  AUTOLOAD:=$(call AutoLoad,30,cifs) 
    50 $(call AddDepends/nls) 
     50  $(call AddDepends/nls) 
    5151  DEPENDS+= \ 
    5252    +!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_36):kmod-crypto-arc4 \ 
     
    148148  FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko 
    149149  AUTOLOAD:=$(call AutoLoad,30,hfs) 
    150 $(call AddDepends/nls) 
     150  $(call AddDepends/nls) 
    151151endef 
    152152 
     
    164164  FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.ko 
    165165  AUTOLOAD:=$(call AutoLoad,30,hfsplus) 
    166 $(call AddDepends/nls,utf8) 
     166  $(call AddDepends/nls,utf8) 
    167167endef 
    168168 
     
    180180  FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko 
    181181  AUTOLOAD:=$(call AutoLoad,30,isofs) 
    182 $(call AddDepends/nls) 
     182  $(call AddDepends/nls) 
    183183endef 
    184184 
     
    211211  FILES:=$(LINUX_DIR)/fs/fat/msdos.ko 
    212212  AUTOLOAD:=$(call AutoLoad,40,msdos) 
    213 $(call AddDepends/nls) 
     213  $(call AddDepends/nls) 
    214214endef 
    215215 
     
    295295  FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko 
    296296  AUTOLOAD:=$(call AutoLoad,30,ntfs) 
    297 $(call AddDepends/nls) 
     297  $(call AddDepends/nls) 
    298298endef 
    299299 
     
    327327  AUTOLOAD:=$(call AutoLoad,30,udf) 
    328328  DEPENDS:=+kmod-lib-crc-itu-t 
    329 $(call AddDepends/nls) 
     329  $(call AddDepends/nls) 
    330330endef 
    331331 
     
    347347        $(LINUX_DIR)/fs/fat/vfat.ko 
    348348  AUTOLOAD:=$(call AutoLoad,30,fat vfat) 
    349 $(call AddDepends/nls) 
     349  $(call AddDepends/nls) 
    350350endef 
    351351 
  • trunk/package/kernel/modules/nls.mk

    r22145 r28668  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    66# 
    77 
    8 define AddDepends/nls 
    9   DEPENDS+= +kmod-nls-base 
    10 endef 
    11  
    128define KernelPackage/nls-base 
    139  SUBMENU:=Native Language Support 
  • trunk/package/kernel/modules/usb.mk

    r28662 r28668  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1515  SUBMENU:=$(USB_MENU) 
    1616  TITLE:=Support for USB 
    17   DEPENDS:=@USB_SUPPORT +kmod-nls-base 
     17  DEPENDS:=@USB_SUPPORT 
    1818  KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n 
    1919  FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.ko 
    2020  AUTOLOAD:=$(call AutoLoad,20,usbcore,1) 
     21  $(call AddDepends/nls) 
    2122endef 
    2223 
Note: See TracChangeset for help on using the changeset viewer.