From d430455527344de964e359ff1143418e3e78a232 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Tue, 9 Aug 2011 12:19:27 +0000 Subject: [PATCH] package/kernel: invert dependencies for current kernel features Instead of depending on new kernel versions, depend on not having one of the older ones (or vice versa for modules removed in current kernels). SVN-Revision: 27934 --- package/kernel/modules/netsupport.mk | 6 +++--- package/kernel/modules/other.mk | 2 +- package/kernel/modules/usb.mk | 4 ++-- package/kernel/modules/virtual.mk | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 3e546a661c86..b845f071cd94 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -482,7 +482,7 @@ $(eval $(call KernelPackage,pppoa)) define KernelPackage/pptp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPtP support - DEPENDS:=kmod-ppp +kmod-gre @LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0 + DEPENDS:=kmod-ppp +kmod-gre @!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32&&!LINUX_2_6_36 KCONFIG:=CONFIG_PPTP FILES:=$(LINUX_DIR)/drivers/net/pptp.ko AUTOLOAD:=$(call AutoLoad,41,pptp) @@ -494,7 +494,7 @@ $(eval $(call KernelPackage,pptp)) define KernelPackage/pppol2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPPoL2TP support - DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0:kmod-l2tp + DEPENDS:=kmod-ppp +kmod-pppoe +!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32:kmod-l2tp KCONFIG:=CONFIG_PPPOL2TP ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko @@ -657,7 +657,7 @@ $(eval $(call KernelPackage,pktgen)) define KernelPackage/l2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) - DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0 + DEPENDS:=@!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32 TITLE:=Layer Two Tunneling Protocol (L2TP) KCONFIG:=CONFIG_L2TP \ CONFIG_L2TP_V3=y \ diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 97b88770024e..e67c41b72e8a 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -732,7 +732,7 @@ $(eval $(call KernelPackage,pwm-gpio)) define KernelPackage/rtc-core SUBMENU:=$(OTHER_MENU) - DEPENDS:=@(!LINUX_3_0||BROKEN) + DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||BROKEN TITLE:=Real Time Clock class support KCONFIG:=CONFIG_RTC_CLASS FILES:=$(LINUX_DIR)/drivers/rtc/rtc-core.ko diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index ee5c9f7b56e4..9e98a102fc16 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -546,7 +546,7 @@ $(eval $(call KernelPackage,usb-serial-keyspan)) define KernelPackage/usb-serial-wwan TITLE:=Support for GSM and CDMA modems - DEPENDS:= @LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0 + DEPENDS:= @!LINUX_2_6_30&&!LINUX_3_6_31&&!LINUX_2_6_32 KCONFIG:=CONFIG_USB_SERIAL_WWAN FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko AUTOLOAD:=$(call AutoLoad,61,usb_wwan) @@ -562,7 +562,7 @@ $(eval $(call KernelPackage,usb-serial-wwan)) define KernelPackage/usb-serial-option TITLE:=Support for Option HSDPA modems - DEPENDS:=+LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0:kmod-usb-serial-wwan + DEPENDS:=+!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32:kmod-usb-serial-wwan KCONFIG:=CONFIG_USB_SERIAL_OPTION FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko AUTOLOAD:=$(call AutoLoad,65,option) diff --git a/package/kernel/modules/virtual.mk b/package/kernel/modules/virtual.mk index da235ea7ebf9..05eb4965b6ba 100644 --- a/package/kernel/modules/virtual.mk +++ b/package/kernel/modules/virtual.mk @@ -166,7 +166,7 @@ $(eval $(call KernelPackage,xen-netdev)) define KernelPackage/xen-pcidev SUBMENU:=$(VIRTUAL_MENU) TITLE:=Xen PCI device frontend - DEPENDS:=@TARGET_x86_xen_domu @LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0 + DEPENDS:=@TARGET_x86_xen_domu @!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32&&!LINUX_2_6_36 KCONFIG:=CONFIG_XEN_PCIDEV_FRONTEND FILES:=$(LINUX_DIR)/drivers/xen/platform-pci.ko AUTOLOAD:=$(call AutoLoad,10,xen-pcifront) -- 2.30.2