aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-01-24 20:02:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-01-24 20:02:09 +0000
commit3120c9c9c24e3e80e646cdac2f75875e2e6a91fe (patch)
treee026e700f612c982bc2622df0d8c5dc6c78411d7
parent186db26d05034df31e0ced1b8b5d7d62ebe39b8f (diff)
downloadupstream-3120c9c9c24e3e80e646cdac2f75875e2e6a91fe.tar.gz
upstream-3120c9c9c24e3e80e646cdac2f75875e2e6a91fe.tar.bz2
upstream-3120c9c9c24e3e80e646cdac2f75875e2e6a91fe.zip
build: drop obsolete kernel version dependencies
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44110
-rw-r--r--package/kernel/gpio-button-hotplug/Makefile1
-rw-r--r--package/kernel/linux/modules/fs.mk7
-rw-r--r--package/kernel/linux/modules/hwmon.mk4
-rw-r--r--package/kernel/linux/modules/input.mk1
-rw-r--r--package/kernel/linux/modules/leds.mk1
-rw-r--r--package/kernel/linux/modules/netdevices.mk6
-rw-r--r--package/kernel/linux/modules/netsupport.mk4
-rw-r--r--package/kernel/linux/modules/other.mk9
-rw-r--r--package/kernel/linux/modules/usb.mk16
-rw-r--r--package/kernel/linux/modules/wireless.mk2
-rw-r--r--package/network/utils/ifenslave/Makefile2
-rw-r--r--package/network/utils/xtables-addons/Makefile1
-rw-r--r--target/linux/ep93xx/modules.mk2
13 files changed, 25 insertions, 31 deletions
diff --git a/package/kernel/gpio-button-hotplug/Makefile b/package/kernel/gpio-button-hotplug/Makefile
index 0a2c7c0666..c2fdaecf0f 100644
--- a/package/kernel/gpio-button-hotplug/Makefile
+++ b/package/kernel/gpio-button-hotplug/Makefile
@@ -15,7 +15,6 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/gpio-button-hotplug
SUBMENU:=Other modules
- DEPENDS:=@!LINUX_3_3
TITLE:=Simple GPIO Button Hotplug driver
FILES:=$(PKG_BUILD_DIR)/gpio-button-hotplug.ko
AUTOLOAD:=$(call AutoLoad,30,gpio-button-hotplug,1)
diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 3ae3c2d9b9..8d2731d199 100644
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -62,7 +62,7 @@ $(eval $(call KernelPackage,fs-autofs4))
define KernelPackage/fs-btrfs
SUBMENU:=$(FS_MENU)
TITLE:=BTRFS filesystem support
- DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8):kmod-lib-raid6 +(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8):kmod-lib-xor
+ DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +!LINUX_3_8:kmod-lib-raid6 +!LINUX_3_8:kmod-lib-xor
KCONFIG:=\
CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n \
@@ -96,7 +96,7 @@ define KernelPackage/fs-cifs
+kmod-crypto-md4 \
+kmod-crypto-des \
+kmod-crypto-ecb \
- +!LINUX_3_3&&!LINUX_3_6:kmod-crypto-sha256
+ +kmod-crypto-sha256
endef
define KernelPackage/fs-cifs/description
@@ -163,7 +163,7 @@ define KernelPackage/fs-ext4
$(LINUX_DIR)/fs/jbd2/jbd2.ko \
$(LINUX_DIR)/fs/mbcache.ko
AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1)
- $(call AddDepends/crc16, +!LINUX_3_3:kmod-crypto-hash)
+ $(call AddDepends/crc16, +kmod-crypto-hash)
endef
define KernelPackage/fs-ext4/description
@@ -176,7 +176,6 @@ $(eval $(call KernelPackage,fs-ext4))
define KernelPackage/fs-f2fs
SUBMENU:=$(FS_MENU)
TITLE:=F2FS filesystem support
- DEPENDS:=@!LINUX_3_3
KCONFIG:= \
CONFIG_F2FS_FS \
CONFIG_F2FS_STAT_FS=y \
diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index 5408b6d5a2..9d012dcfc4 100644
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -59,7 +59,7 @@ else
FILES:=$(LINUX_DIR)/drivers/hwmon/adt7410.ko
AUTOLOAD:=$(call AutoLoad,60,adt7410)
endif
- $(call AddDepends/hwmon,+kmod-i2c-core @!(LINUX_3_3||LINUX_3_6))
+ $(call AddDepends/hwmon,+kmod-i2c-core)
endef
define KernelPackage/hwmon-adt7410/description
@@ -296,7 +296,7 @@ define KernelPackage/hwmon-pwmfan
FILES:=$(LINUX_DIR)/drivers/hwmon/pwm-fan.ko
AUTOLOAD:=$(call AutoLoad,60,pwm-fan)
$(call AddDepends/hwmon,)
- DEPENDS+=@!LINUX_3_3 @!LINUX_3_8 @!LINUX_3_10 @!LINUX_3_14
+ DEPENDS+=@!LINUX_3_8 @!LINUX_3_10 @!LINUX_3_14
endef
define KernelPackage/hwmon-pwmfan/description
diff --git a/package/kernel/linux/modules/input.mk b/package/kernel/linux/modules/input.mk
index f42cbaec06..2320b051f9 100644
--- a/package/kernel/linux/modules/input.mk
+++ b/package/kernel/linux/modules/input.mk
@@ -163,7 +163,6 @@ define KernelPackage/input-matrixkmap
SUBMENU:=$(INPUT_MODULES_MENU)
TITLE:=Input matrix devices support
KCONFIG:=CONFIG_INPUT_MATRIXKMAP
- DEPENDS:=@!LINUX_3_3
FILES:=$(LINUX_DIR)/drivers/input/matrix-keymap.ko
AUTOLOAD:=$(call AutoProbe,matrix-keymap)
$(call AddDepends/input)
diff --git a/package/kernel/linux/modules/leds.mk b/package/kernel/linux/modules/leds.mk
index 217453cd93..2b2f81ce37 100644
--- a/package/kernel/linux/modules/leds.mk
+++ b/package/kernel/linux/modules/leds.mk
@@ -169,7 +169,6 @@ $(eval $(call KernelPackage,ledtrig-transient))
define KernelPackage/ledtrig-oneshot
SUBMENU:=$(LEDS_MENU)
TITLE:=LED One-Shot Trigger
- DEPENDS:=@!LINUX_3_3
KCONFIG:=CONFIG_LEDS_TRIGGER_ONESHOT
FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-oneshot.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-oneshot)
diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 84cb68c040..fed20f5a6f 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -452,7 +452,7 @@ $(eval $(call KernelPackage,e1000))
define KernelPackage/e1000e
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Intel(R) PRO/1000 PCIe cards kernel support
- DEPENDS:=@PCIE_SUPPORT +(!LINUX_3_3&&!LINUX_3_6):kmod-ptp
+ DEPENDS:=@PCIE_SUPPORT +kmod-ptp
KCONFIG:=CONFIG_E1000E
FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000e/e1000e.ko
AUTOLOAD:=$(call AutoProbe,e1000e)
@@ -486,7 +486,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_3&&!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13):kmod-libphy
+ DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +(!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)
@@ -540,7 +540,7 @@ $(eval $(call KernelPackage,pcnet32))
define KernelPackage/tg3
TITLE:=Broadcom Tigon3 Gigabit Ethernet
KCONFIG:=CONFIG_TIGON3
- DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +(!LINUX_3_3&&!LINUX_3_6):kmod-ptp
+ DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +kmod-hwmon-core +kmod-ptp
SUBMENU:=$(NETWORK_DEVICES_MENU)
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
AUTOLOAD:=$(call AutoLoad,19,tg3,1)
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 8671df1318..badd54231b 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -251,7 +251,7 @@ $(eval $(call KernelPackage,ipip))
IPSEC-m:= \
- $(if $(CONFIG_LINUX_3_3),,xfrm/xfrm_algo) \
+ xfrm/xfrm_algo \
xfrm/xfrm_ipcomp \
xfrm/xfrm_user \
key/af_key \
@@ -484,7 +484,7 @@ $(eval $(call KernelPackage,gre))
define KernelPackage/gre6
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=GRE support over IPV6
- DEPENDS:=+kmod-ipv6 +kmod-iptunnel +kmod-ip6-tunnel @!LINUX_3_3 @!LINUX_3_6
+ DEPENDS:=+kmod-ipv6 +kmod-iptunnel +kmod-ip6-tunnel
KCONFIG:=CONFIG_IPV6_GRE
FILES:=$(LINUX_DIR)/net/ipv6/ip6_gre.ko
AUTOLOAD:=$(call AutoLoad,39,ip6_gre)
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 70acf54727..decc1df675 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_3 @!LINUX_3_8 @!LINUX_3_10 @!LINUX_3_13
+ DEPENDS:=@!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_3&&!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13):kmod-6lowpan-iphc
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13):kmod-6lowpan-iphc
KCONFIG:= \
CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \
@@ -73,7 +73,7 @@ $(eval $(call KernelPackage,bluetooth))
define KernelPackage/bluetooth_6lowpan
SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth 6LoWPAN support
- DEPENDS:=+kmod-bluetooth @!(LINUX_3_3||LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14)
+ DEPENDS:=+kmod-bluetooth @!(LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14)
KCONFIG:= \
CONFIG_6LOWPAN=m \
CONFIG_BT_6LOWPAN=m
@@ -231,7 +231,6 @@ $(eval $(call KernelPackage,gpio-pcf857x))
define KernelPackage/iio-core
SUBMENU:=$(OTHER_MENU)
- DEPENDS:=@!LINUX_3_3 @!LINUX_3_6
TITLE:=Industrial IO core
KCONFIG:= \
CONFIG_IIO \
@@ -749,7 +748,7 @@ $(eval $(call KernelPackage,ikconfig))
define KernelPackage/zram
SUBMENU:=$(OTHER_MENU)
TITLE:=ZRAM
- DEPENDS:=@!LINUX_3_3 +kmod-lib-lzo
+ DEPENDS:=+kmod-lib-lzo
KCONFIG:= \
CONFIG_ZSMALLOC \
CONFIG_ZRAM \
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index c700570375..e147c49372 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -237,7 +237,7 @@ $(eval $(call KernelPackage,usb-gadget))
define KernelPackage/usb-lib-composite
TITLE:=USB lib composite
KCONFIG:=CONFIG_USB_LIBCOMPOSITE
- DEPENDS:=+kmod-usb-gadget +kmod-fs-configfs @!LINUX_3_3 @!LINUX_3_6
+ DEPENDS:=+kmod-usb-gadget +kmod-fs-configfs
FILES:=$(LINUX_DIR)/drivers/usb/gadget/libcomposite.ko
AUTOLOAD:=$(call AutoLoad,50,libcomposite)
$(call AddDepends/usb)
@@ -256,7 +256,7 @@ define KernelPackage/usb-eth-gadget
CONFIG_USB_ETH \
CONFIG_USB_ETH_RNDIS=y \
CONFIG_USB_ETH_EEM=n
- DEPENDS:=+kmod-usb-gadget +(!LINUX_3_3&&!LINUX_3_6):kmod-usb-lib-composite
+ DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko),)
FILES:= \
$(LINUX_DIR)/drivers/usb/gadget/u_ether.ko \
@@ -285,7 +285,7 @@ $(eval $(call KernelPackage,usb-eth-gadget))
define KernelPackage/usb-serial-gadget
TITLE:=USB Serial Gadget support
KCONFIG:=CONFIG_USB_G_SERIAL
- DEPENDS:=+kmod-usb-gadget +(!LINUX_3_3&&!LINUX_3_6):kmod-usb-lib-composite
+ DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko),)
FILES:= \
$(LINUX_DIR)/drivers/usb/gadget/u_serial.ko \
@@ -424,7 +424,7 @@ $(eval $(call KernelPackage,usb2))
define KernelPackage/usb2-pci
TITLE:=Support for PCI USB2 controllers
- DEPENDS:=@PCI_SUPPORT @(!LINUX_3_3&&!LINUX_3_6) +kmod-usb2
+ DEPENDS:=@PCI_SUPPORT +kmod-usb2
KCONFIG:=CONFIG_USB_EHCI_PCI
FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko
AUTOLOAD:=$(call AutoLoad,42,ehci-pci,1)
@@ -440,7 +440,7 @@ $(eval $(call KernelPackage,usb2-pci))
define KernelPackage/usb-dwc2
TITLE:=DWC2 USB controller driver
- DEPENDS:=@(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8&&!LINUX_3_9)
+ DEPENDS:=@!LINUX_3_8
KCONFIG:= \
CONFIG_USB_DWC2 \
CONFIG_USB_DWC2_DEBUG=n \
@@ -1025,7 +1025,7 @@ endef
define KernelPackage/usb-net-asix
TITLE:=Kernel module for USB-to-Ethernet Asix convertors
- DEPENDS:=+!LINUX_3_3:kmod-libphy
+ DEPENDS:=+kmod-libphy
KCONFIG:=CONFIG_USB_NET_AX8817X
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko
AUTOLOAD:=$(call AutoProbe,asix)
@@ -1106,7 +1106,7 @@ define KernelPackage/usb-net-smsc95xx
KCONFIG:=CONFIG_USB_NET_SMSC95XX
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko
AUTOLOAD:=$(call AutoProbe,smsc95xx)
- $(call AddDepends/usb-net, +(!LINUX_3_3&&!LINUX_3_6):kmod-lib-crc16)
+ $(call AddDepends/usb-net, +kmod-lib-crc16)
endef
define KernelPackage/usb-net-smsc95xx/description
@@ -1244,7 +1244,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_3 @!LINUX_3_8 @!LINUX_3_10)
+ $(call AddDepends/usb-net,+kmod-usb-wdm @!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 245902b09b..97b4366978 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_3 @!LINUX_3_8 @!LINUX_3_10 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core
+ DEPENDS:=@!LINUX_3_8 @!LINUX_3_10 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core
KCONFIG:=\
CONFIG_STAGING=y \
CONFIG_R8188EU \
diff --git a/package/network/utils/ifenslave/Makefile b/package/network/utils/ifenslave/Makefile
index 658fe9ea2d..03c8dee510 100644
--- a/package/network/utils/ifenslave/Makefile
+++ b/package/network/utils/ifenslave/Makefile
@@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/ifenslave
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+kmod-bonding @(LINUX_3_3||LINUX_3_6||LINUX_3_7||LINUX_3_8||LINUX_3_9||LINUX_3_10)
+ DEPENDS:=+kmod-bonding @(LINUX_3_8||LINUX_3_9||LINUX_3_10)
TITLE:=A utility to manipulate kernel ethernet bonding devices
VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
URL:=http://www.kernel.org
diff --git a/package/network/utils/xtables-addons/Makefile b/package/network/utils/xtables-addons/Makefile
index 59300f94a7..c3c8c1e7ae 100644
--- a/package/network/utils/xtables-addons/Makefile
+++ b/package/network/utils/xtables-addons/Makefile
@@ -31,7 +31,6 @@ define Package/xtables-addons
SECTION:=net
CATEGORY:=Network
SUBMENU:=Firewall
- DEPENDS:=@!LINUX_3_3
TITLE:=Extensions not distributed in the main Xtables
URL:=http://xtables-addons.sourceforge.net/
endef
diff --git a/target/linux/ep93xx/modules.mk b/target/linux/ep93xx/modules.mk
index 1c8137e98b..429546690f 100644
--- a/target/linux/ep93xx/modules.mk
+++ b/target/linux/ep93xx/modules.mk
@@ -24,7 +24,7 @@ $(eval $(call KernelPackage,fb-ep93xx))
define KernelPackage/input-keyboard-ep93xx
SUBMENU:=$(OTHER_MENU)
TITLE:=EP93xx Matrix Keypad support
- DEPENDS:=@TARGET_ep93xx +!LINUX_3_3:kmod-input-matrixkmap
+ DEPENDS:=@TARGET_ep93xx +kmod-input-matrixkmap
KCONFIG:= \
CONFIG_KEYBOARD_EP93XX \
CONFIG_INPUT_KEYBOARD=y