From 395bd8bf6052925733069a2833b8a5c2a661ea7c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 10 Mar 2011 15:41:04 +0000 Subject: kernel: further fixes to kmod-gre packaging SVN-Revision: 26012 --- package/kernel/modules/netsupport.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 25e2ac4..0116283 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -370,12 +370,14 @@ $(eval $(call KernelPackage,ip6-tunnel)) define KernelPackage/gre SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=GRE support - KCONFIG:=CONFIG_NET_IPGRE \ - $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.37)),CONFIG_NET_IPGRE_DEMUX) - FILES=$(LINUX_DIR)/net/ipv4/ip_gre.ko \ - $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.37)),$(LINUX_DIR)/net/ipv4/gre.ko) - AUTOLOAD:=$(call AutoLoad,39, \ - $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.37)),gre) ip_gre) + KCONFIG:=CONFIG_NET_IPGRE CONFIG_NET_IPGRE_DEMUX + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.37)),1) + FILES:=$(LINUX_DIR)/net/ipv4/ip_gre.ko $(LINUX_DIR)/net/ipv4/gre.ko + AUTOLOAD:=$(call AutoLoad,39,gre ip_gre) + else + FILES:=$(LINUX_DIR)/net/ipv4/ip_gre.ko + AUTOLOAD:=$(call AutoLoad,39,ip_gre) + endif endef define KernelPackage/gre/description -- cgit v1.1