From 9af6f98a938668f999a58d666e07e14a7327b967 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sun, 8 Apr 2012 10:30:10 +0000 Subject: [PATCH] backfire: package/kernel: fix target dependency logic !A||!B is always true and was probably not intended. SVN-Revision: 31217 --- package/kernel/modules/block.mk | 2 +- package/kernel/modules/usb.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 475bc4b25a..8cf83a5636 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_x86) + DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32&&!TARGET_x86) KCONFIG:=CONFIG_ATA FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,21,libata,1) diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 86a1858ec6..68335546f0 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -519,7 +519,7 @@ define KernelPackage/usb-storage-extras SUBMENU:=$(USB_MENU) TITLE:=Extra drivers for usb-storage DEPENDS:=@LINUX_2_6 \ - +!TARGET_ixp4xx_harddisk||!TARGET_orion_harddisk||!TARGET_x86_olpc:kmod-usb-storage + +!TARGET_ixp4xx_harddisk&&!TARGET_orion_harddisk&&!TARGET_x86_olpc:kmod-usb-storage KCONFIG:= \ CONFIG_USB_STORAGE_ALAUDA \ CONFIG_USB_STORAGE_CYPRESS_ATACB \ @@ -680,7 +680,7 @@ $(eval $(call KernelPackage,usb-net-asix)) define KernelPackage/usb-net-hso -$(call KernelPackage/usb-net/Depends,@LINUX_2_6 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_lantiq||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill) +$(call KernelPackage/usb-net/Depends,@LINUX_2_6 +!TARGET_rb532&&!TARGET_avr32&&!TARGET_brcm47xx&&!TARGET_lantiq&&!TARGET_atheros&&!TARGET_adm5120&&!TARGET_ar7&&!TARGET_ppc40x&&!TARGET_ixp4xx&&!TARGET_rdc:kmod-rfkill) TITLE:=Kernel module for Option USB High Speed Mobile Devices KCONFIG:=CONFIG_USB_HSO FILES:= \ -- 2.30.2