diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-03-21 14:18:11 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-03-21 14:18:11 +0000 |
| commit | 68a2efe2d17d9f137f74d9d2f1bc1a09a0baeb19 (patch) | |
| tree | 41874fe8e0ee6a1d3c1ed16de77f9583d02fd97a /package/kernel | |
| parent | c91903ad41e49f4ec9870fb1f97d452dcadaa7e2 (diff) | |
| download | upstream-68a2efe2d17d9f137f74d9d2f1bc1a09a0baeb19.tar.gz upstream-68a2efe2d17d9f137f74d9d2f1bc1a09a0baeb19.tar.bz2 upstream-68a2efe2d17d9f137f74d9d2f1bc1a09a0baeb19.zip | |
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
SVN-Revision: 20346
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/modules/block.mk | 7 | ||||
| -rw-r--r-- | package/kernel/modules/usb.mk | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 92b9e63901..009a8e1682 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -10,7 +10,7 @@ BLOCK_MENU:=Block Devices define KernelPackage/ata-core SUBMENU:=$(BLOCK_MENU) TITLE:=Serial and Parallel ATA support - DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax) + DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86) KCONFIG:=CONFIG_ATA FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,21,libata,1) @@ -21,7 +21,7 @@ $(eval $(call KernelPackage,ata-core)) define KernelPackage/ata/Depends SUBMENU:=$(BLOCK_MENU) - DEPENDS:=kmod-ata-core $(1) + DEPENDS:=!TARGET_x86:kmod-ata-core $(1) endef @@ -302,6 +302,7 @@ $(eval $(call KernelPackage,ide-it821x)) define KernelPackage/scsi-core SUBMENU:=$(BLOCK_MENU) TITLE:=SCSI device support + DEPENDS:=@!TARGET_x86 KCONFIG:= \ CONFIG_SCSI \ CONFIG_BLK_DEV_SD @@ -451,7 +452,7 @@ $(eval $(call KernelPackage,axonram)) define KernelPackage/libsas SUBMENU:=$(BLOCK_MENU) TITLE:=SAS Domain Transport Attributes - DEPENDS:=+kmod-scsi-core @TARGET_x86 + DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \ CONFIG_SCSI_SAS_ATTRS \ CONFIG_SCSI_SAS_ATA=y \ diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 816e7f1aaa..251d66654f 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -495,7 +495,7 @@ $(eval $(call KernelPackage,usb-serial-option)) define KernelPackage/usb-storage -$(call KernelPackage/usb/Depends,+kmod-scsi-core) +$(call KernelPackage/usb/Depends,+!TARGET_x86:kmod-scsi-core) TITLE:=USB Storage support KCONFIG:=CONFIG_USB_STORAGE FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX) |