aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-06-18 23:26:36 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-06-18 23:26:36 +0000
commit3cf347124a4ffd9196d1c280764bb3f9553173e9 (patch)
tree68d0fc5645fa8f7a21decb3143a8ea3bfb6c724e
parentd65c8552032ba94daae2fa137c3dab0d40e7021b (diff)
downloadupstream-3cf347124a4ffd9196d1c280764bb3f9553173e9.tar.gz
upstream-3cf347124a4ffd9196d1c280764bb3f9553173e9.tar.bz2
upstream-3cf347124a4ffd9196d1c280764bb3f9553173e9.zip
kernel: split kmod-pppoe into kmod-pppox and kmod-pppoe, make kmod-pptp depend on kmod-pppox (#11677)
SVN-Revision: 32433
-rw-r--r--package/kernel/modules/netsupport.mk28
1 files changed, 21 insertions, 7 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 81c21245c2..4f7c053a26 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -497,19 +497,33 @@ endef
$(eval $(call KernelPackage,ppp-synctty))
+define KernelPackage/pppox
+ SUBMENU:=$(NETWORK_SUPPORT_MENU)
+ TITLE:=PPPoX helper
+ DEPENDS:=kmod-ppp
+ KCONFIG:=CONFIG_PPPOE
+ FILES:=$(LINUX_DIR)/drivers/net/ppp/pppox.ko
+ AUTOLOAD:=$(call AutoLoad,40,pppox)
+endef
+
+define KernelPackage/pppox/description
+ Kernel helper module for PPPoE and PPTP support
+endef
+
+$(eval $(call KernelPackage,pppox))
+
+
define KernelPackage/pppoe
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=PPPoE support
- DEPENDS:=kmod-ppp
+ DEPENDS:=kmod-ppp +kmod-pppox
KCONFIG:=CONFIG_PPPOE
- FILES:= \
- $(LINUX_DIR)/drivers/net/ppp/pppoe.ko \
- $(LINUX_DIR)/drivers/net/ppp/pppox.ko
- AUTOLOAD:=$(call AutoLoad,40,pppox pppoe)
+ FILES:=$(LINUX_DIR)/drivers/net/ppp/pppoe.ko
+ AUTOLOAD:=$(call AutoLoad,41,pppoe)
endef
define KernelPackage/pppoe/description
- Kernel modules for PPPoE (PPP over Ethernet) support
+ Kernel module for PPPoE (PPP over Ethernet) support
endef
$(eval $(call KernelPackage,pppoe))
@@ -534,7 +548,7 @@ $(eval $(call KernelPackage,pppoa))
define KernelPackage/pptp
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=PPtP support
- DEPENDS:=kmod-ppp +kmod-gre
+ DEPENDS:=kmod-ppp +kmod-gre +kmod-pppox
KCONFIG:=CONFIG_PPTP
FILES:=$(LINUX_DIR)/drivers/net/ppp/pptp.ko
AUTOLOAD:=$(call AutoLoad,41,pptp)