From 1c843699d2d2007d0fbb7f8fdadcb14770defd27 Mon Sep 17 00:00:00 2001 From: hauke Date: Mon, 10 Aug 2009 18:26:18 +0000 Subject: [PATCH] Correct bool expressions in dependencies. This fixes #5627 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17208 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/fs.mk | 2 +- package/mac80211/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index d14b99fdb..7795280c7 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -365,7 +365,7 @@ define KernelPackage/fs-btrfs CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_POSIX_ACL=n # for crc32c - DEPENDS:=+kmod-crypto-core @!LINUX_2_6_21||!LINUX_2_6_25||!LINUX_2_6_28 + DEPENDS:=+kmod-crypto-core @!LINUX_2_6_21&&!LINUX_2_6_25&&!LINUX_2_6_28 FILES:=\ $(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \ diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 51022dfa7..f382027e7 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -211,7 +211,7 @@ endef define KernelPackage/rt2800-pci $(call KernelPackage/rt2x00/Default) - DEPENDS+= +kmod-rt2x00-pci +kmod-crc-ccitt @!LINUX_2_6_21||!LINUX_2_6_25 + DEPENDS+= +kmod-rt2x00-pci +kmod-crc-ccitt @!LINUX_2_6_21&&!LINUX_2_6_25 TITLE+= (RT2860 PCI) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,rt2800pci) @@ -219,7 +219,7 @@ endef define KernelPackage/rt2800-usb $(call KernelPackage/rt2x00/Default) - DEPENDS+= +kmod-rt2x00-usb +kmod-crc-ccitt @!LINUX_2_6_21||!LINUX_2_6_25 + DEPENDS+= +kmod-rt2x00-usb +kmod-crc-ccitt @!LINUX_2_6_21&&!LINUX_2_6_25 TITLE+= (RT2870 USB) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,rt2800usb) @@ -229,7 +229,7 @@ define KernelPackage/rtl818x/Default $(call KernelPackage/mac80211/Default) TITLE:=Realtek Drivers for RTL818x devices URL:=http://wireless.kernel.org/en/users/Drivers/rtl8187 - DEPENDS+= +kmod-eeprom-93cx6 +kmod-mac80211 @!LINUX_2_6_21||!LINUX_2_6_25 + DEPENDS+= +kmod-eeprom-93cx6 +kmod-mac80211 @!LINUX_2_6_21&&!LINUX_2_6_25 endef define KernelPackage/rtl8180 @@ -296,7 +296,7 @@ define KernelPackage/ath9k $(call KernelPackage/mac80211/Default) TITLE:=Atheros 802.11n wireless cards support URL:=http://linuxwireless.org/en/users/Drivers/ath9k - DEPENDS+= +kmod-ath @!LINUX_2_6_21||!LINUX_2_6_25 + DEPENDS+= +kmod-ath @!LINUX_2_6_21&&!LINUX_2_6_25 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,ath9k) endef