protocols: merge pptp into ppp, adjust depends for kernel mode pptp

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 4420c7eadcf31fcb5c392a29c4ddf0fc989a5dd9..1b6945eb5731265ee1345930b360aa468759ee90 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -212,10 +212,9 @@ define protocol
 endef
 
 $(eval $(call protocol,core,Support for static/dhcp/none))
-$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA))
-$(eval $(call protocol,pptp,Support for PPtP,+pptp))
-$(eval $(call protocol,6x4,Support for 6in4/6to4,+6in4 +6to4))
-$(eval $(call protocol,3g,Support for 3G,+comgt))
+$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP))
+$(eval $(call protocol,6x4,Support for 6in4/6to4,+PACKAGE_luci-proto-6x4:6in4 +PACKAGE_luci-proto-6x4:6to4))
+$(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt))
 $(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd))
 
 

diff --git a/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
similarity index 100%
rename from protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
rename to protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua

diff --git a/protocols/ppp/luasrc/model/network/proto_ppp.lua b/protocols/ppp/luasrc/model/network/proto_ppp.lua
index b00c9f0a21a069d5b26416abeede3031232da9ee..2dded366d69a722f316d1745db302009dbb3d83f 100644 (file)
--- a/protocols/ppp/luasrc/model/network/proto_ppp.lua
+++ b/protocols/ppp/luasrc/model/network/proto_ppp.lua
@@ -43,10 +43,12 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g"}) do
        end
 
        function proto.opkg_package(self)
-               if p == "ppp" or p == "pptp" then
+               if p == "ppp" then
                        return p
                elseif p == "3g" then
                        return "comgt"
+               elseif p == "pptp" then
+                       return "ppp-mod-pptp"
                elseif p == "pppoe" then
                        return "ppp-mod-pppoe"
                elseif p == "pppoa" then
@@ -59,6 +61,8 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g"}) do
                        return (nixio.fs.glob("/usr/lib/pppd/*/pppoatm.so")() ~= nil)
                elseif p == "pppoe" then
                        return (nixio.fs.glob("/usr/lib/pppd/*/rp-pppoe.so")() ~= nil)
+               elseif p == "pptp" then
+                       return (nixio.fs.glob("/usr/lib/pppd/*/pptp.so")() ~= nil)
                elseif p == "3g" then
                        return nixio.fs.access("/lib/netifd/proto/3g.sh")
                else

diff --git a/protocols/pptp/Makefile b/protocols/pptp/Makefile
deleted file mode 100644 (file)
index f7fac77..0000000
--- a/protocols/pptp/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk