aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-10-31 22:02:07 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-10-31 22:02:07 +0000
commit7996f0b3135b1469823a15489d1a86804915ee5c (patch)
tree179cd5f5da311835fe8ea0dc9d1322f32981f251
parent26e68b353f0137aa08d2bbc18c33e011dfa3a571 (diff)
downloadupstream-7996f0b3135b1469823a15489d1a86804915ee5c.tar.gz
upstream-7996f0b3135b1469823a15489d1a86804915ee5c.tar.bz2
upstream-7996f0b3135b1469823a15489d1a86804915ee5c.zip
packages: kernel: negate kernel version checks
Only list the kernel versions that do not match so that new kernel versions will automatically match. This improves support for kernel 3.18. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 43132
-rw-r--r--package/kernel/linux/modules/netdevices.mk2
-rw-r--r--package/kernel/linux/modules/other.mk4
-rw-r--r--package/kernel/linux/modules/usb.mk2
-rw-r--r--package/kernel/linux/modules/wireless.mk2
4 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 8dcdd19119..1eaf922f78 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -482,7 +482,7 @@ $(eval $(call KernelPackage,igb))
define KernelPackage/b44
TITLE:=Broadcom 44xx driver
KCONFIG:=CONFIG_B44
- DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +LINUX_3_14:kmod-libphy
+ DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +(!LINUX_3_3&&!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13):kmod-libphy
SUBMENU:=$(NETWORK_DEVICES_MENU)
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko
AUTOLOAD:=$(call AutoLoad,19,b44,1)
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index c514fd7366..2f9831b16c 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -13,7 +13,7 @@ WATCHDOG_DIR:=watchdog
define KernelPackage/6lowpan-iphc
USBMENU:=$(OTHER_MENU)
TITLE:=6lowpan shared code
- DEPENDS:=@LINUX_3_14
+ DEPENDS:=@!LINUX_3_3 @!LINUX_3_8 @!LINUX_3_10 @!LINUX_3_13
KCONFIG:=CONFIG_6LOWPAN_IPHC
HIDDEN:=1
FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko
@@ -29,7 +29,7 @@ $(eval $(call KernelPackage,6lowpan-iphc))
define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +LINUX_3_14:kmod-6lowpan-iphc
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +(!LINUX_3_3&&!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13):kmod-6lowpan-iphc
KCONFIG:= \
CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 4c7af6fd14..cc7092ec5a 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -1221,7 +1221,7 @@ define KernelPackage/usb-net-huawei-cdc-ncm
KCONFIG:=CONFIG_USB_NET_HUAWEI_CDC_NCM
FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/huawei_cdc_ncm.ko
AUTOLOAD:=$(call AutoProbe,huawei_cdc_ncm)
- $(call AddDepends/usb-net,+kmod-usb-wdm @(LINUX_3_13||LINUX_3_14))
+ $(call AddDepends/usb-net,+kmod-usb-wdm @!LINUX_3_3 @!LINUX_3_8 @!LINUX_3_10)
endef
define KernelPackage/usb-net-huawei-cdc-ncm/description
diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk
index 9019bdeb2f..245902b09b 100644
--- a/package/kernel/linux/modules/wireless.mk
+++ b/package/kernel/linux/modules/wireless.mk
@@ -110,7 +110,7 @@ $(eval $(call KernelPackage,net-prism54))
define KernelPackage/net-rtl8188eu
SUBMENU:=$(WIRELESS_MENU)
TITLE:=RTL8188EU support (staging)
- DEPENDS:=@LINUX_3_13||@LINUX_3_14 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core
+ DEPENDS:=@!LINUX_3_3 @!LINUX_3_8 @!LINUX_3_10 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core
KCONFIG:=\
CONFIG_STAGING=y \
CONFIG_R8188EU \