package/kernel: Update version dependencies and kmods for linux 3.0

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+openwrt@gmail.com>

SVN-Revision: 27186
This commit is contained in:
Hauke Mehrtens 2011-06-15 21:12:49 +00:00
parent bf64ac730a
commit cd3bd6e13e
4 changed files with 12 additions and 7 deletions

View file

@ -89,9 +89,13 @@ define KernelPackage/capi
CONFIG_ISDN_CAPI_CAPIFS CONFIG_ISDN_CAPI_CAPIFS
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/isdn/capi/kernelcapi.ko \ $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.ko \
$(LINUX_DIR)/drivers/isdn/capi/capifs.ko \
$(LINUX_DIR)/drivers/isdn/capi/capi.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) AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi)
endif
endef endef
define KernelPackage/capi/description define KernelPackage/capi/description
@ -478,7 +482,7 @@ $(eval $(call KernelPackage,pppoa))
define KernelPackage/pptp define KernelPackage/pptp
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=PPtP support 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 KCONFIG:=CONFIG_PPTP
FILES:=$(LINUX_DIR)/drivers/net/pptp.ko FILES:=$(LINUX_DIR)/drivers/net/pptp.ko
AUTOLOAD:=$(call AutoLoad,41,pptp) AUTOLOAD:=$(call AutoLoad,41,pptp)
@ -490,7 +494,7 @@ $(eval $(call KernelPackage,pptp))
define KernelPackage/pppol2tp define KernelPackage/pppol2tp
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=PPPoL2TP support 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:kmod-l2tp
KCONFIG:=CONFIG_PPPOL2TP KCONFIG:=CONFIG_PPPOL2TP
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1)
FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko
@ -653,7 +657,7 @@ $(eval $(call KernelPackage,pktgen))
define KernelPackage/l2tp define KernelPackage/l2tp
SUBMENU:=$(NETWORK_SUPPORT_MENU) 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) TITLE:=Layer Two Tunneling Protocol (L2TP)
KCONFIG:=CONFIG_L2TP \ KCONFIG:=CONFIG_L2TP \
CONFIG_L2TP_V3=y \ CONFIG_L2TP_V3=y \

View file

@ -659,6 +659,7 @@ $(eval $(call KernelPackage,pwm-gpio))
define KernelPackage/rtc-core define KernelPackage/rtc-core
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
DEPENDS:=@(!LINUX_3_0||BROKEN)
TITLE:=Real Time Clock class support TITLE:=Real Time Clock class support
KCONFIG:=CONFIG_RTC_CLASS KCONFIG:=CONFIG_RTC_CLASS
FILES:=$(LINUX_DIR)/drivers/rtc/rtc-core.ko FILES:=$(LINUX_DIR)/drivers/rtc/rtc-core.ko

View file

@ -546,7 +546,7 @@ $(eval $(call KernelPackage,usb-serial-keyspan))
define KernelPackage/usb-serial-wwan define KernelPackage/usb-serial-wwan
TITLE:=Support for GSM and CDMA modems 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 KCONFIG:=CONFIG_USB_SERIAL_WWAN
FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko
AUTOLOAD:=$(call AutoLoad,61,usb_wwan) AUTOLOAD:=$(call AutoLoad,61,usb_wwan)
@ -562,7 +562,7 @@ $(eval $(call KernelPackage,usb-serial-wwan))
define KernelPackage/usb-serial-option define KernelPackage/usb-serial-option
TITLE:=Support for Option HSDPA modems 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 KCONFIG:=CONFIG_USB_SERIAL_OPTION
FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko
AUTOLOAD:=$(call AutoLoad,65,option) AUTOLOAD:=$(call AutoLoad,65,option)

View file

@ -166,7 +166,7 @@ $(eval $(call KernelPackage,xen-netdev))
define KernelPackage/xen-pcidev define KernelPackage/xen-pcidev
SUBMENU:=$(VIRTUAL_MENU) SUBMENU:=$(VIRTUAL_MENU)
TITLE:=Xen PCI device frontend 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 KCONFIG:=CONFIG_XEN_PCIDEV_FRONTEND
FILES:=$(LINUX_DIR)/drivers/xen/platform-pci.ko FILES:=$(LINUX_DIR)/drivers/xen/platform-pci.ko
AUTOLOAD:=$(call AutoLoad,10,xen-pcifront) AUTOLOAD:=$(call AutoLoad,10,xen-pcifront)