Changeset 20590


Ignore:
Timestamp:
2010-03-29T23:02:14+02:00 (8 years ago)
Author:
hauke
Message:

kernel: fix dependencies for x86 target

kmod-hid and kmod-input-core are directly build into the kernel for the
x86 target. No package on x86 should depend on it.

This fixes #6963

Location:
trunk/package/kernel/modules
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/other.mk

    r20436 r20590  
    262262  SUBMENU:=$(OTHER_MENU) 
    263263  TITLE:=Bluetooth support 
    264   DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-hid 
     264  DEPENDS:=@USB_SUPPORT +kmod-usb-core +!TARGET_x86:kmod-hid 
    265265  KCONFIG:= \ 
    266266        CONFIG_BLUEZ \ 
     
    652652  SUBMENU:=$(OTHER_MENU) 
    653653  TITLE:=Input device core 
    654   DEPENDS:=@LINUX_2_6 
     654  DEPENDS:=@LINUX_2_6 @!TARGET_x86 
    655655  KCONFIG:=CONFIG_INPUT 
    656656  FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX) 
     
    668668  SUBMENU:=$(OTHER_MENU) 
    669669  TITLE:=Input event device 
    670   DEPENDS:=+kmod-input-core 
     670  DEPENDS:=+!TARGET_x86:kmod-input-core 
    671671  KCONFIG:=CONFIG_INPUT_EVDEV 
    672672  FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX) 
     
    684684  SUBMENU:=$(OTHER_MENU) 
    685685  TITLE:=HID Devices 
    686   DEPENDS:=+kmod-input-core +kmod-input-evdev 
     686  DEPENDS:=+kmod-input-core +kmod-input-evdev @!TARGET_x86 
    687687  KCONFIG:=CONFIG_HID 
    688688  FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX) 
     
    700700  SUBMENU:=$(OTHER_MENU) 
    701701  TITLE:=Polled Input device support 
    702   DEPENDS:=+kmod-input-core @LINUX_2_6 
     702  DEPENDS:=+!TARGET_x86:kmod-input-core @LINUX_2_6 
    703703  KCONFIG:=CONFIG_INPUT_POLLDEV 
    704704  FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX) 
     
    716716  SUBMENU:=$(OTHER_MENU) 
    717717  TITLE:=GPIO key support 
    718   DEPENDS:= @GPIO_SUPPORT +kmod-input-core 
     718  DEPENDS:= @GPIO_SUPPORT +!TARGET_x86:kmod-input-core 
    719719  KCONFIG:=CONFIG_KEYBOARD_GPIO 
    720720  FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.$(LINUX_KMOD_SUFFIX) 
     
    750750  SUBMENU:=$(OTHER_MENU) 
    751751  TITLE:=Joystick device support 
    752   DEPENDS:=+kmod-input-core 
     752  DEPENDS:=+!TARGET_x86:kmod-input-core 
    753753  KCONFIG:=CONFIG_INPUT_JOYDEV 
    754754  FILES:=$(LINUX_DIR)/drivers/input/joydev.$(LINUX_KMOD_SUFFIX) 
  • trunk/package/kernel/modules/usb.mk

    r20347 r20590  
    778778 
    779779define KernelPackage/usb-hid 
    780 $(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev +kmod-hid) 
     780$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev +!TARGET_x86:kmod-hid) 
    781781  TITLE:=Support for USB Human Input Devices 
    782782  KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID 
     
    794794 
    795795define KernelPackage/usb-yealink 
    796 $(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev) 
     796$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev) 
    797797  TITLE:=USB Yealink VOIP phone 
    798798  KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y 
     
    809809 
    810810define KernelPackage/usb-cm109 
    811 $(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev) 
     811$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev) 
    812812  TITLE:=Support for CM109 device 
    813813  KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y 
Note: See TracChangeset for help on using the changeset viewer.