Changeset 20346


Ignore:
Timestamp:
2010-03-21T15:18:11+01:00 (8 years ago)
Author:
hauke
Message:

kernel: x86 remove dependency on ata-core and scsi-core

The x86 image includes the modules out of ata-core and scsi-core
directly in the kernel image. Do not depend on these packages, because
they are not build in a x86 image.
This fixes #6873

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

Legend:

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

    r20146 r20346  
    1111  SUBMENU:=$(BLOCK_MENU) 
    1212  TITLE:=Serial and Parallel ATA support 
    13   DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax) 
     13  DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86) 
    1414  KCONFIG:=CONFIG_ATA 
    1515  FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) 
     
    2222define KernelPackage/ata/Depends 
    2323  SUBMENU:=$(BLOCK_MENU) 
    24   DEPENDS:=kmod-ata-core $(1) 
     24  DEPENDS:=!TARGET_x86:kmod-ata-core $(1) 
    2525endef 
    2626 
     
    303303  SUBMENU:=$(BLOCK_MENU) 
    304304  TITLE:=SCSI device support 
     305  DEPENDS:=@!TARGET_x86 
    305306  KCONFIG:= \ 
    306307        CONFIG_SCSI \ 
     
    452453  SUBMENU:=$(BLOCK_MENU) 
    453454  TITLE:=SAS Domain Transport Attributes 
    454   DEPENDS:=+kmod-scsi-core @TARGET_x86 
     455  DEPENDS:=@TARGET_x86 
    455456  KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \ 
    456457        CONFIG_SCSI_SAS_ATTRS \ 
  • trunk/package/kernel/modules/usb.mk

    r20323 r20346  
    496496 
    497497define KernelPackage/usb-storage 
    498 $(call KernelPackage/usb/Depends,+kmod-scsi-core) 
     498$(call KernelPackage/usb/Depends,+!TARGET_x86:kmod-scsi-core) 
    499499  TITLE:=USB Storage support 
    500500  KCONFIG:=CONFIG_USB_STORAGE 
Note: See TracChangeset for help on using the changeset viewer.