domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: drop obsolete linux 3.10 related dependencies/checks

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45361
This commit is contained in:
Felix Fietkau
2015-04-10 11:52:54 +00:00
parent e1f0a91dfe
commit 42e950ec75
7 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/linux/modules/hwmon.mk
View File

@@ -290,7 +290,7 @@ define KernelPackage/hwmon-pwmfan
FILES:=$(LINUX_DIR)/drivers/hwmon/pwm-fan.ko FILES:=$(LINUX_DIR)/drivers/hwmon/pwm-fan.ko
AUTOLOAD:=$(call AutoLoad,60,pwm-fan) AUTOLOAD:=$(call AutoLoad,60,pwm-fan)
$(call AddDepends/hwmon,) $(call AddDepends/hwmon,)
DEPENDS+=@!LINUX_3_10 @!LINUX_3_14 DEPENDS+=@!LINUX_3_14
endef endef
define KernelPackage/hwmon-pwmfan/description define KernelPackage/hwmon-pwmfan/description

2
package/kernel/linux/modules/lib.mk
View File

@@ -119,7 +119,7 @@ $(eval $(call KernelPackage,lib-lzo))
define KernelPackage/lib-lz4 define KernelPackage/lib-lz4
SUBMENU:=$(LIB_MENU) SUBMENU:=$(LIB_MENU)
DEPENDS:=@!LINUX_3_10 @!LINUX_3_14 DEPENDS:=@!LINUX_3_14
TITLE:=LZ4 support TITLE:=LZ4 support
KCONFIG:= \ KCONFIG:= \
CONFIG_LZ4_COMPRESS \ CONFIG_LZ4_COMPRESS \

2
package/kernel/linux/modules/netdevices.mk
View File

@@ -484,7 +484,7 @@ $(eval $(call KernelPackage,igb))
define KernelPackage/b44 define KernelPackage/b44
TITLE:=Broadcom 44xx driver TITLE:=Broadcom 44xx driver
KCONFIG:=CONFIG_B44 KCONFIG:=CONFIG_B44
DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +!LINUX_3_10:kmod-libphy DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +kmod-libphy
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko
AUTOLOAD:=$(call AutoLoad,19,b44,1) AUTOLOAD:=$(call AutoLoad,19,b44,1)

12
package/kernel/linux/modules/netsupport.mk
View File

@@ -148,7 +148,7 @@ $(eval $(call KernelPackage,8021q))
define KernelPackage/udptunnel4 define KernelPackage/udptunnel4
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=IPv4 UDP tunneling support TITLE:=IPv4 UDP tunneling support
DEPENDS:=@!LINUX_3_10 @!LINUX_3_14 DEPENDS:=@!LINUX_3_14
KCONFIG:=CONFIG_NET_UDP_TUNNEL KCONFIG:=CONFIG_NET_UDP_TUNNEL
FILES:=$(LINUX_DIR)/net/ipv4/udp_tunnel.ko FILES:=$(LINUX_DIR)/net/ipv4/udp_tunnel.ko
AUTOLOAD:=$(call AutoLoad,32,udp_tunnel) AUTOLOAD:=$(call AutoLoad,32,udp_tunnel)
@@ -160,7 +160,7 @@ $(eval $(call KernelPackage,udptunnel4))
define KernelPackage/udptunnel6 define KernelPackage/udptunnel6
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=IPv6 UDP tunneling support TITLE:=IPv6 UDP tunneling support
DEPENDS:=@!LINUX_3_10 @!LINUX_3_14 DEPENDS:=@!LINUX_3_14
KCONFIG:=CONFIG_NET_UDP_TUNNEL KCONFIG:=CONFIG_NET_UDP_TUNNEL
FILES:=$(LINUX_DIR)/net/ipv6/ip6_udp_tunnel.ko FILES:=$(LINUX_DIR)/net/ipv6/ip6_udp_tunnel.ko
AUTOLOAD:=$(call AutoLoad,32,ip6_udp_tunnel) AUTOLOAD:=$(call AutoLoad,32,ip6_udp_tunnel)
@@ -174,8 +174,8 @@ define KernelPackage/vxlan
TITLE:=Native VXLAN Kernel support TITLE:=Native VXLAN Kernel support
DEPENDS:= \ DEPENDS:= \
+kmod-iptunnel \ +kmod-iptunnel \
+(!LINUX_3_10&&!LINUX_3_14):kmod-udptunnel4 \ +!LINUX_3_14:kmod-udptunnel4 \
+(!LINUX_3_10&&!LINUX_3_14&&IPV6):kmod-udptunnel6 +(!LINUX_3_14&&IPV6):kmod-udptunnel6
KCONFIG:=CONFIG_VXLAN KCONFIG:=CONFIG_VXLAN
FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko
AUTOLOAD:=$(call AutoLoad,13,vxlan) AUTOLOAD:=$(call AutoLoad,13,vxlan)
@@ -863,8 +863,8 @@ define KernelPackage/l2tp
TITLE:=Layer Two Tunneling Protocol (L2TP) TITLE:=Layer Two Tunneling Protocol (L2TP)
DEPENDS:= \ DEPENDS:= \
+IPV6:kmod-ipv6 \ +IPV6:kmod-ipv6 \
+(!LINUX_3_10&&!LINUX_3_14):kmod-udptunnel4 \ +!LINUX_3_14:kmod-udptunnel4 \
+(!LINUX_3_10&&!LINUX_3_14&&IPV6):kmod-udptunnel6 +(!LINUX_3_14&&IPV6):kmod-udptunnel6
KCONFIG:=CONFIG_L2TP \ KCONFIG:=CONFIG_L2TP \
CONFIG_L2TP_V3=y \ CONFIG_L2TP_V3=y \
CONFIG_L2TP_DEBUGFS=n CONFIG_L2TP_DEBUGFS=n

13
package/kernel/linux/modules/other.mk
View File

@@ -13,7 +13,6 @@ WATCHDOG_DIR:=watchdog
define KernelPackage/6lowpan-iphc define KernelPackage/6lowpan-iphc
USBMENU:=$(OTHER_MENU) USBMENU:=$(OTHER_MENU)
TITLE:=6lowpan shared code TITLE:=6lowpan shared code
DEPENDS:=@!LINUX_3_10
KCONFIG:=CONFIG_6LOWPAN_IPHC KCONFIG:=CONFIG_6LOWPAN_IPHC
HIDDEN:=1 HIDDEN:=1
FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko
@@ -29,7 +28,7 @@ $(eval $(call KernelPackage,6lowpan-iphc))
define KernelPackage/bluetooth define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support TITLE:=Bluetooth support
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +!LINUX_3_10:kmod-6lowpan-iphc +kmod-lib-crc16 +kmod-hid DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-6lowpan-iphc +kmod-lib-crc16 +kmod-hid
KCONFIG:= \ KCONFIG:= \
CONFIG_BLUEZ \ CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \ CONFIG_BLUEZ_L2CAP \
@@ -71,7 +70,7 @@ $(eval $(call KernelPackage,bluetooth))
define KernelPackage/bluetooth_6lowpan define KernelPackage/bluetooth_6lowpan
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth 6LoWPAN support TITLE:=Bluetooth 6LoWPAN support
DEPENDS:=+kmod-bluetooth @!LINUX_3_10 @!LINUX_3_14 DEPENDS:=+kmod-bluetooth @!LINUX_3_14
KCONFIG:= \ KCONFIG:= \
CONFIG_6LOWPAN=m \ CONFIG_6LOWPAN=m \
CONFIG_BT_6LOWPAN=m CONFIG_BT_6LOWPAN=m
@@ -740,7 +739,7 @@ $(eval $(call KernelPackage,ikconfig))
define KernelPackage/zram define KernelPackage/zram
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=ZRAM TITLE:=ZRAM
DEPENDS:=+kmod-lib-lzo +(!LINUX_3_10&&!LINUX_3_14):kmod-lib-lz4 DEPENDS:=+kmod-lib-lzo +!LINUX_3_14:kmod-lib-lz4
KCONFIG:= \ KCONFIG:= \
CONFIG_ZSMALLOC \ CONFIG_ZSMALLOC \
CONFIG_ZRAM \ CONFIG_ZRAM \
@@ -749,10 +748,8 @@ define KernelPackage/zram
CONFIG_ZSMALLOC_STAT=n \ CONFIG_ZSMALLOC_STAT=n \
CONFIG_ZRAM_LZ4_COMPRESS=y CONFIG_ZRAM_LZ4_COMPRESS=y
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko@lt3.14 \ $(LINUX_DIR)/mm/zsmalloc.ko \
$(LINUX_DIR)/drivers/staging/zram/zram.ko@lt3.14 \ $(LINUX_DIR)/drivers/block/zram/zram.ko
$(LINUX_DIR)/mm/zsmalloc.ko@ge3.14 \
$(LINUX_DIR)/drivers/block/zram/zram.ko@ge3.14
AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram) AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram)
endef endef

17
package/kernel/linux/modules/usb.mk
View File

@@ -254,7 +254,6 @@ define KernelPackage/usb-eth-gadget
CONFIG_USB_ETH_RNDIS=y \ CONFIG_USB_ETH_RNDIS=y \
CONFIG_USB_ETH_EEM=n CONFIG_USB_ETH_EEM=n
DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite
ifeq ($(CONFIG_LINUX_3_10),)
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko@ge3.18 \ $(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko@ge3.18 \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko@ge3.18 \
@@ -262,16 +261,11 @@ ifeq ($(CONFIG_LINUX_3_10),)
$(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko@ge3.18 \ $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko@ge3.18 \ $(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko@ge3.18 \
$(LINUX_DIR)/drivers/usb/gadget/u_ether.ko@lt3.18 \ $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko@lt3.14 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko@lt3.18 \ $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko@lt3.18 \ $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko@lt3.18 \ $(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko@lt3.18 \
$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko@lt3.18 $(LINUX_DIR)/drivers/usb/gadget/g_ether.ko@lt3.18
AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether) AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether)
else
FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko
AUTOLOAD:=$(call AutoLoad,52,g_ether)
endif
$(call AddDepends/usb) $(call AddDepends/usb)
endef endef
@@ -337,10 +331,9 @@ define KernelPackage/usb-ohci
CONFIG_USB_OCTEON_OHCI=y \ CONFIG_USB_OCTEON_OHCI=y \
CONFIG_USB_OHCI_HCD_OMAP3=y \ CONFIG_USB_OHCI_HCD_OMAP3=y \
CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_HCD_PLATFORM=y
FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko FILES:= \
ifeq ($(CONFIG_LINUX_3_10),) $(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko \
FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-platform.ko $(LINUX_DIR)/drivers/usb/host/ohci-platform.ko
endif
AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1) AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1)
$(call AddDepends/usb) $(call AddDepends/usb)
endef endef
@@ -453,7 +446,7 @@ $(eval $(call KernelPackage,usb2-pci))
define KernelPackage/usb-dwc2 define KernelPackage/usb-dwc2
TITLE:=DWC2 USB controller driver TITLE:=DWC2 USB controller driver
DEPENDS:=@!LINUX_3_10 +(TARGET_brcm2708||TARGET_at91||TARGET_brcm63xx||TARGET_mxs):kmod-usb-gadget DEPENDS:=+(TARGET_brcm2708||TARGET_at91||TARGET_brcm63xx||TARGET_mxs):kmod-usb-gadget
KCONFIG:= \ KCONFIG:= \
CONFIG_USB_DWC2 \ CONFIG_USB_DWC2 \
CONFIG_USB_DWC2_PCI \ CONFIG_USB_DWC2_PCI \
@@ -1336,7 +1329,7 @@ define KernelPackage/usb-net-huawei-cdc-ncm
KCONFIG:=CONFIG_USB_NET_HUAWEI_CDC_NCM KCONFIG:=CONFIG_USB_NET_HUAWEI_CDC_NCM
FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/huawei_cdc_ncm.ko FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/huawei_cdc_ncm.ko
AUTOLOAD:=$(call AutoProbe,huawei_cdc_ncm) AUTOLOAD:=$(call AutoProbe,huawei_cdc_ncm)
$(call AddDepends/usb-net,+kmod-usb-net-cdc-ncm +kmod-usb-wdm @!LINUX_3_10) $(call AddDepends/usb-net,+kmod-usb-net-cdc-ncm +kmod-usb-wdm)
endef endef
define KernelPackage/usb-net-huawei-cdc-ncm/description define KernelPackage/usb-net-huawei-cdc-ncm/description

4
package/kernel/linux/modules/wireless.mk
View File

@@ -56,7 +56,7 @@ $(eval $(call KernelPackage,net-prism54))
define KernelPackage/net-rtl8188eu define KernelPackage/net-rtl8188eu
SUBMENU:=$(WIRELESS_MENU) SUBMENU:=$(WIRELESS_MENU)
TITLE:=RTL8188EU support (staging) TITLE:=RTL8188EU support (staging)
DEPENDS:=@!LINUX_3_10 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core
KCONFIG:=\ KCONFIG:=\
CONFIG_STAGING=y \ CONFIG_STAGING=y \
CONFIG_R8188EU \ CONFIG_R8188EU \
@@ -76,7 +76,7 @@ $(eval $(call KernelPackage,net-rtl8188eu))
define KernelPackage/net-rtl8723au define KernelPackage/net-rtl8723au
SUBMENU:=$(WIRELESS_MENU) SUBMENU:=$(WIRELESS_MENU)
TITLE:=RTL8723AU support (staging) TITLE:=RTL8723AU support (staging)
DEPENDS:=@!LINUX_3_10 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core
KCONFIG:=\ KCONFIG:=\
CONFIG_STAGING=y \ CONFIG_STAGING=y \
CONFIG_R8723AU \ CONFIG_R8723AU \