hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
lede-17.01
Hauke Mehrtens 2010-03-21 14:18:11 +00:00
parent c91903ad41
commit 68a2efe2d1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/kernel/modules/block.mk
View File

@ -10,7 +10,7 @@ BLOCK_MENU:=Block Devices
define KernelPackage/ata-core define KernelPackage/ata-core
SUBMENU:=$(BLOCK_MENU) SUBMENU:=$(BLOCK_MENU)
TITLE:=Serial and Parallel ATA support 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 KCONFIG:=CONFIG_ATA
FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,21,libata,1) AUTOLOAD:=$(call AutoLoad,21,libata,1)
@ -21,7 +21,7 @@ $(eval $(call KernelPackage,ata-core))
define KernelPackage/ata/Depends define KernelPackage/ata/Depends
SUBMENU:=$(BLOCK_MENU) SUBMENU:=$(BLOCK_MENU)
DEPENDS:=kmod-ata-core $(1) DEPENDS:=!TARGET_x86:kmod-ata-core $(1)
endef endef
@ -302,6 +302,7 @@ $(eval $(call KernelPackage,ide-it821x))
define KernelPackage/scsi-core define KernelPackage/scsi-core
SUBMENU:=$(BLOCK_MENU) SUBMENU:=$(BLOCK_MENU)
TITLE:=SCSI device support TITLE:=SCSI device support
DEPENDS:=@!TARGET_x86
KCONFIG:= \ KCONFIG:= \
CONFIG_SCSI \ CONFIG_SCSI \
CONFIG_BLK_DEV_SD CONFIG_BLK_DEV_SD
@ -451,7 +452,7 @@ $(eval $(call KernelPackage,axonram))
define KernelPackage/libsas define KernelPackage/libsas
SUBMENU:=$(BLOCK_MENU) SUBMENU:=$(BLOCK_MENU)
TITLE:=SAS Domain Transport Attributes TITLE:=SAS Domain Transport Attributes
DEPENDS:=+kmod-scsi-core @TARGET_x86 DEPENDS:=@TARGET_x86
KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \ KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \
CONFIG_SCSI_SAS_ATTRS \ CONFIG_SCSI_SAS_ATTRS \
CONFIG_SCSI_SAS_ATA=y \ CONFIG_SCSI_SAS_ATA=y \

2
package/kernel/modules/usb.mk
View File

@ -495,7 +495,7 @@ $(eval $(call KernelPackage,usb-serial-option))
define KernelPackage/usb-storage define KernelPackage/usb-storage
$(call KernelPackage/usb/Depends,+kmod-scsi-core) $(call KernelPackage/usb/Depends,+!TARGET_x86:kmod-scsi-core)
TITLE:=USB Storage support TITLE:=USB Storage support
KCONFIG:=CONFIG_USB_STORAGE KCONFIG:=CONFIG_USB_STORAGE
FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX) FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)