Also disable rtc-core for now since this changed to a bool, now directly
used in the kernel if enabled.
Signed-off-by: Jonas Gorski <jonas.gorski+open...@gmail.com>
---
package/kernel/modules/netsupport.mk | 13 +++++++++----
package/kernel/modules/other.mk | 1 +
package/kernel/modules/usb.mk | 4 ++--
package/kernel/modules/virtual.mk | 2 +-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/package/kernel/modules/netsupport.mk
b/package/kernel/modules/netsupport.mk
index 7387319..32df532 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -89,8 +89,13 @@ define KernelPackage/capi
CONFIG_ISDN_CAPI_CAPIFS
FILES:= \
$(LINUX_DIR)/drivers/isdn/capi/kernelcapi.ko \
- $(LINUX_DIR)/drivers/isdn/capi/capifs.ko \
$(LINUX_DIR)/drivers/isdn/capi/capi.ko
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.0)),1)
+ AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
+else
+ FILES+= $(LINUX_DIR)/drivers/isdn/capi/capifs.ko
+ AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi)
+endif
AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi)
endef
@@ -477,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
+ DEPENDS:=kmod-ppp +kmod-gre
@LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0
KCONFIG:=CONFIG_PPTP
FILES:=$(LINUX_DIR)/drivers/net/pptp.ko
AUTOLOAD:=$(call AutoLoad,41,pptp)
@@ -489,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:kmod-l2tp
+ 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||LINUX_3_0:kmod-l2tp
KCONFIG:=CONFIG_PPPOL2TP
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1)
FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko
@@ -652,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
+
DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0
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 b46e56e..8dce2c2 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -659,6 +659,7 @@ $(eval $(call KernelPackage,pwm-gpio))
define KernelPackage/rtc-core
SUBMENU:=$(OTHER_MENU)
+ DEPENDS:=@(!LINUX_3_0||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 587bb8d..ee5c9f7 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
+ DEPENDS:=
@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0
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:kmod-usb-serial-wwan
+
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
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 3e24358..da235ea 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
+ DEPENDS:=@TARGET_x86_xen_domu
@LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0
KCONFIG:=CONFIG_XEN_PCIDEV_FRONTEND
FILES:=$(LINUX_DIR)/drivers/xen/platform-pci.ko
AUTOLOAD:=$(call AutoLoad,10,xen-pcifront)
--
1.7.2.5
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
