diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-09 21:16:52 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-09 21:16:52 +0000 |
| commit | 41b338706ba06652e7f77f50b8cdb22818c5aee0 (patch) | |
| tree | c53834093241bc4d12dc1d6874d58e3d3d875b12 /package/kernel/modules/netsupport.mk | |
| parent | ac091033e824124443daa6d12b6ea1bddadb4795 (diff) | |
package: kernel: add handling for 3.2 renames (and some missed ones for 3.1)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28897 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules/netsupport.mk')
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 4f04627b5..0a44a5dc7 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -415,10 +415,17 @@ define KernelPackage/ppp CONFIG_PPP \ CONFIG_PPP_ASYNC \ CONFIG_SLHC - FILES:= \ + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) + FILES:= \ + $(LINUX_DIR)/drivers/net/ppp/ppp_async.ko \ + $(LINUX_DIR)/drivers/net/ppp/ppp_generic.ko \ + $(LINUX_DIR)/drivers/net/slip/slhc.ko + else + FILES:= \ $(LINUX_DIR)/drivers/net/ppp_async.ko \ $(LINUX_DIR)/drivers/net/ppp_generic.ko \ $(LINUX_DIR)/drivers/net/slhc.ko + endif AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async) endef @@ -434,7 +441,11 @@ define KernelPackage/ppp-synctty TITLE:=PPP sync tty support DEPENDS:=kmod-ppp KCONFIG:=CONFIG_PPP_SYNC_TTY - FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.ko + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) + FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_synctty.ko + else + FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.ko + endif AUTOLOAD:=$(call AutoLoad,40,ppp_synctty) endef @@ -450,9 +461,15 @@ define KernelPackage/pppoe TITLE:=PPPoE support DEPENDS:=kmod-ppp KCONFIG:=CONFIG_PPPOE - FILES:= \ + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) + FILES:= \ + $(LINUX_DIR)/drivers/net/ppp/pppoe.ko \ + $(LINUX_DIR)/drivers/net/ppp/pppox.ko + else + FILES:= \ $(LINUX_DIR)/drivers/net/pppoe.ko \ $(LINUX_DIR)/drivers/net/pppox.ko + endif AUTOLOAD:=$(call AutoLoad,40,pppox pppoe) endef @@ -484,7 +501,11 @@ define KernelPackage/pptp TITLE:=PPtP support 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 + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) + FILES:=$(LINUX_DIR)/drivers/net/ppp/pptp.ko + else + FILES:=$(LINUX_DIR)/drivers/net/pptp.ko + endif AUTOLOAD:=$(call AutoLoad,41,pptp) endef @@ -535,7 +556,11 @@ define KernelPackage/mppe KCONFIG:= \ CONFIG_PPP_MPPE_MPPC \ CONFIG_PPP_MPPE - FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.ko + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) + FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_mppe.ko + else + FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.ko + endif AUTOLOAD:=$(call AutoLoad,31,ppp_mppe) endef |