Author: nbd Date: 2015-03-19 12:59:17 +0100 (Thu, 19 Mar 2015) New Revision: 44892
Modified: trunk/package/kernel/linux/modules/fs.mk trunk/package/kernel/linux/modules/hwmon.mk trunk/package/kernel/linux/modules/leds.mk trunk/package/kernel/linux/modules/lib.mk trunk/package/kernel/linux/modules/netdevices.mk trunk/package/kernel/linux/modules/netfilter.mk trunk/package/kernel/linux/modules/netsupport.mk trunk/package/kernel/linux/modules/other.mk trunk/package/kernel/linux/modules/usb.mk trunk/package/kernel/linux/modules/wireless.mk Log: kernel: remove obsolete kernel version dependencies Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/kernel/linux/modules/fs.mk =================================================================== --- trunk/package/kernel/linux/modules/fs.mk 2015-03-19 11:59:09 UTC (rev 44891) +++ trunk/package/kernel/linux/modules/fs.mk 2015-03-19 11:59:17 UTC (rev 44892) @@ -62,7 +62,7 @@ define KernelPackage/fs-btrfs SUBMENU:=$(FS_MENU) TITLE:=BTRFS filesystem support - DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +!LINUX_3_8:kmod-lib-raid6 +!LINUX_3_8:kmod-lib-xor + DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +kmod-lib-raid6 +kmod-lib-xor KCONFIG:=\ CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_POSIX_ACL=n \ Modified: trunk/package/kernel/linux/modules/hwmon.mk =================================================================== --- trunk/package/kernel/linux/modules/hwmon.mk 2015-03-19 11:59:09 UTC (rev 44891) +++ trunk/package/kernel/linux/modules/hwmon.mk 2015-03-19 11:59:17 UTC (rev 44892) @@ -46,7 +46,6 @@ define KernelPackage/hwmon-adt7410 TITLE:=ADT7410 monitoring support -ifeq ($(CONFIG_LINUX_3_8),) KCONFIG:= \ CONFIG_SENSORS_ADT7X10 \ CONFIG_SENSORS_ADT7410 @@ -54,11 +53,6 @@ $(LINUX_DIR)/drivers/hwmon/adt7x10.ko \ $(LINUX_DIR)/drivers/hwmon/adt7410.ko AUTOLOAD:=$(call AutoLoad,60,adt7x10 adt7410) -else - KCONFIG:=CONFIG_SENSORS_ADT7410 - FILES:=$(LINUX_DIR)/drivers/hwmon/adt7410.ko - AUTOLOAD:=$(call AutoLoad,60,adt7410) -endif $(call AddDepends/hwmon,+kmod-i2c-core) endef @@ -296,7 +290,7 @@ FILES:=$(LINUX_DIR)/drivers/hwmon/pwm-fan.ko AUTOLOAD:=$(call AutoLoad,60,pwm-fan) $(call AddDepends/hwmon,) - DEPENDS+=@!LINUX_3_8 @!LINUX_3_10 @!LINUX_3_14 + DEPENDS+=@!LINUX_3_10 @!LINUX_3_14 endef define KernelPackage/hwmon-pwmfan/description Modified: trunk/package/kernel/linux/modules/leds.mk =================================================================== --- trunk/package/kernel/linux/modules/leds.mk 2015-03-19 11:59:09 UTC (rev 44891) +++ trunk/package/kernel/linux/modules/leds.mk 2015-03-19 11:59:17 UTC (rev 44892) @@ -22,7 +22,7 @@ $(eval $(call KernelPackage,leds-gpio)) -LED_TRIGGER_DIR=$(LINUX_DIR)/drivers/leds$(if $(CONFIG_LINUX_3_8),,/trigger) +LED_TRIGGER_DIR=$(LINUX_DIR)/drivers/leds/trigger define KernelPackage/ledtrig-heartbeat SUBMENU:=$(LEDS_MENU) Modified: trunk/package/kernel/linux/modules/lib.mk =================================================================== --- trunk/package/kernel/linux/modules/lib.mk 2015-03-19 11:59:09 UTC (rev 44891) +++ trunk/package/kernel/linux/modules/lib.mk 2015-03-19 11:59:17 UTC (rev 44892) @@ -119,7 +119,7 @@ define KernelPackage/lib-lz4 SUBMENU:=$(LIB_MENU) - DEPENDS:=@!(LINUX_3_3||LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14) + DEPENDS:=@!LINUX_3_10 @!LINUX_3_14 TITLE:=LZ4 support KCONFIG:= \ CONFIG_LZ4_COMPRESS \ Modified: trunk/package/kernel/linux/modules/netdevices.mk =================================================================== --- trunk/package/kernel/linux/modules/netdevices.mk 2015-03-19 11:59:09 UTC (rev 44891) +++ trunk/package/kernel/linux/modules/netdevices.mk 2015-03-19 11:59:17 UTC (rev 44892) @@ -484,7 +484,7 @@ define KernelPackage/b44 TITLE:=Broadcom 44xx driver KCONFIG:=CONFIG_B44 - DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +(!LINUX_3_10&&!LINUX_3_13):kmod-libphy + DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +!LINUX_3_10:kmod-libphy SUBMENU:=$(NETWORK_DEVICES_MENU) FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko AUTOLOAD:=$(call AutoLoad,19,b44,1) Modified: trunk/package/kernel/linux/modules/netfilter.mk =================================================================== --- trunk/package/kernel/linux/modules/netfilter.mk 2015-03-19 11:59:09 UTC (rev 44891) +++ trunk/package/kernel/linux/modules/netfilter.mk 2015-03-19 11:59:17 UTC (rev 44892) @@ -373,7 +373,6 @@ define KernelPackage/ipt-queue TITLE:=Module for user-space packet queueing KCONFIG:=$(KCONFIG_IPT_QUEUE) - DEPENDS:=@!LINUX_3_6 FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_QUEUE-m))) $(call AddDepends/ipt) Modified: trunk/package/kernel/linux/modules/netsupport.mk =================================================================== --- trunk/package/kernel/linux/modules/netsupport.mk 2015-03-19 11:59:09 UTC (rev 44891) +++ trunk/package/kernel/linux/modules/netsupport.mk 2015-03-19 11:59:17 UTC (rev 44892) @@ -148,7 +148,7 @@ define KernelPackage/udptunnel4 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv4 UDP tunneling support - DEPENDS:=@(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14) + DEPENDS:=@!LINUX_3_10 @!LINUX_3_14 KCONFIG:=CONFIG_NET_UDP_TUNNEL FILES:=$(LINUX_DIR)/net/ipv4/udp_tunnel.ko AUTOLOAD:=$(call AutoLoad,32,udp_tunnel) @@ -160,7 +160,7 @@ define KernelPackage/udptunnel6 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv6 UDP tunneling support - DEPENDS:=@(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14) +kmod-ipv6 + DEPENDS:=@!LINUX_3_10 @!LINUX_3_14 KCONFIG:=CONFIG_NET_UDP_TUNNEL FILES:=$(LINUX_DIR)/net/ipv6/ip6_udp_tunnel.ko AUTOLOAD:=$(call AutoLoad,32,ip6_udp_tunnel) @@ -174,8 +174,8 @@ TITLE:=Native VXLAN Kernel support DEPENDS:= \ +kmod-iptunnel \ - +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14):kmod-udptunnel4 \ - +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14&&IPV6):kmod-udptunnel6 + +(!LINUX_3_10&&!LINUX_3_14):kmod-udptunnel4 \ + +(!LINUX_3_10&&!LINUX_3_14&&IPV6):kmod-udptunnel6 KCONFIG:=CONFIG_VXLAN FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko AUTOLOAD:=$(call AutoLoad,13,vxlan) @@ -890,8 +890,8 @@ TITLE:=Layer Two Tunneling Protocol (L2TP) DEPENDS:= \ +IPV6:kmod-ipv6 \ - +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14):kmod-udptunnel4 \ - +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14&&IPV6):kmod-udptunnel6 + +(!LINUX_3_10&&!LINUX_3_14):kmod-udptunnel4 \ + +(!LINUX_3_10&&!LINUX_3_14&&IPV6):kmod-udptunnel6 KCONFIG:=CONFIG_L2TP \ CONFIG_L2TP_V3=y \ CONFIG_L2TP_DEBUGFS=n Modified: trunk/package/kernel/linux/modules/other.mk =================================================================== --- trunk/package/kernel/linux/modules/other.mk 2015-03-19 11:59:09 UTC (rev 44891) +++ trunk/package/kernel/linux/modules/other.mk 2015-03-19 11:59:17 UTC (rev 44892) @@ -13,7 +13,7 @@ define KernelPackage/6lowpan-iphc USBMENU:=$(OTHER_MENU) TITLE:=6lowpan shared code - DEPENDS:=@!LINUX_3_8 @!LINUX_3_10 @!LINUX_3_13 + DEPENDS:=@!LINUX_3_10 KCONFIG:=CONFIG_6LOWPAN_IPHC HIDDEN:=1 FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko @@ -29,7 +29,7 @@ define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13):kmod-6lowpan-iphc + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +!LINUX_3_10:kmod-6lowpan-iphc KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -73,7 +73,7 @@ define KernelPackage/bluetooth_6lowpan SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth 6LoWPAN support - DEPENDS:=+kmod-bluetooth @!(LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14) + DEPENDS:=+kmod-bluetooth @!LINUX_3_10 @!LINUX_3_14 KCONFIG:= \ CONFIG_6LOWPAN=m \ CONFIG_BT_6LOWPAN=m @@ -696,7 +696,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y \ CONFIG_SERIAL_8250_DETECT_IRQ=n \ CONFIG_SERIAL_8250_RSA=n - FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250$(if $(CONFIG_LINUX_3_8),_core).ko + FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250.ko endef define KernelPackage/serial-8250/description @@ -746,7 +746,7 @@ define KernelPackage/zram SUBMENU:=$(OTHER_MENU) TITLE:=ZRAM - DEPENDS:=+kmod-lib-lzo @!TARGET_ep93xx +(!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13&&!LINUX_3_14):kmod-lib-lz4 + DEPENDS:=+kmod-lib-lzo @!TARGET_ep93xx +(!LINUX_3_10&&!LINUX_3_14):kmod-lib-lz4 KCONFIG:= \ CONFIG_ZSMALLOC \ CONFIG_ZRAM \ Modified: trunk/package/kernel/linux/modules/usb.mk =================================================================== --- trunk/package/kernel/linux/modules/usb.mk 2015-03-19 11:59:09 UTC (rev 44891) +++ trunk/package/kernel/linux/modules/usb.mk 2015-03-19 11:59:17 UTC (rev 44892) @@ -254,7 +254,7 @@ CONFIG_USB_ETH_RNDIS=y \ CONFIG_USB_ETH_EEM=n DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite -ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8)$(CONFIG_LINUX_3_10),) +ifeq ($(CONFIG_LINUX_3_10),) FILES:= \ $(LINUX_DIR)/drivers/usb/gadget/function/[email protected] \ $(LINUX_DIR)/drivers/usb/gadget/function/[email protected] \ @@ -286,7 +286,6 @@ TITLE:=USB Serial Gadget support KCONFIG:=CONFIG_USB_G_SERIAL DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite -ifeq ($(CONFIG_LINUX_3_3)$(CONFIG_LINUX_3_8),) FILES:= \ $(LINUX_DIR)/drivers/usb/gadget/function/[email protected] \ $(LINUX_DIR)/drivers/usb/gadget/function/[email protected] \ @@ -299,10 +298,6 @@ $(LINUX_DIR)/drivers/usb/gadget/[email protected] \ $(LINUX_DIR)/drivers/usb/gadget/[email protected] AUTOLOAD:=$(call AutoLoad,52,usb_f_acm g_serial) -else - FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko - AUTOLOAD:=$(call AutoLoad,52,g_serial) -endif $(call AddDepends/usb) endef @@ -343,7 +338,7 @@ CONFIG_USB_OHCI_HCD_OMAP3=y \ CONFIG_USB_OHCI_HCD_PLATFORM=y FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko -ifeq ($(CONFIG_LINUX_3_8)$(CONFIG_LINUX_3_10),) +ifeq ($(CONFIG_LINUX_3_10),) FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-platform.ko endif AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1) @@ -440,7 +435,7 @@ define KernelPackage/usb-dwc2 TITLE:=DWC2 USB controller driver - DEPENDS:=@!LINUX_3_8 @!LINUX_3_10 +(TARGET_brcm2708||TARGET_at91||TARGET_brcm63xx):kmod-usb-gadget + DEPENDS:=@!LINUX_3_10 +(TARGET_brcm2708||TARGET_at91||TARGET_brcm63xx):kmod-usb-gadget KCONFIG:= \ CONFIG_USB_DWC2 \ CONFIG_USB_DWC2_PCI \ @@ -1258,7 +1253,7 @@ 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-net-cdc-ncm +kmod-usb-wdm @!LINUX_3_8 @!LINUX_3_10) + $(call AddDepends/usb-net,+kmod-usb-net-cdc-ncm +kmod-usb-wdm @!LINUX_3_10) endef define KernelPackage/usb-net-huawei-cdc-ncm/description Modified: trunk/package/kernel/linux/modules/wireless.mk =================================================================== --- trunk/package/kernel/linux/modules/wireless.mk 2015-03-19 11:59:09 UTC (rev 44891) +++ trunk/package/kernel/linux/modules/wireless.mk 2015-03-19 11:59:17 UTC (rev 44892) @@ -110,7 +110,7 @@ define KernelPackage/net-rtl8188eu SUBMENU:=$(WIRELESS_MENU) TITLE:=RTL8188EU support (staging) - DEPENDS:=@!LINUX_3_8 @!LINUX_3_10 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core + DEPENDS:=@!LINUX_3_10 @USB_SUPPORT +@DRIVER_WEXT_SUPPORT +r8188eu-firmware +kmod-usb-core KCONFIG:=\ CONFIG_STAGING=y \ CONFIG_R8188EU \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
