contrib: move luci-app-ocserv to luci-addons, fix recusrive deps

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile
index 35bc02caf18c4255502c0d646197289210605c44..859390cb2eb717b8df42a88c1a06ea6e5e4af29c 100644 (file)
--- a/contrib/package/luci-addons/Makefile
+++ b/contrib/package/luci-addons/Makefile
@@ -183,6 +183,7 @@ $(eval $(call application,ushare,uShare - UPnP A/V & DLNA Media Server,ushare))
 $(eval $(call application,hd-idle,Hard Disk Idle Spin-Down module,hd-idle))
 $(eval $(call application,tinyproxy,Tinyproxy - HTTP(S)-Proxy configuration,tinyproxy))
 $(eval $(call application,polipo,LuCI Support for the Polipo Proxy,polipo))
+$(eval $(call application,ocserv,LuCI Support for OpenConnect VPN,ocserv certtool))
 $(eval $(call application,openvpn,LuCI Support for OpenVPN,openvpn))
 $(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,luci-app-firewall freifunk-p2pblock))
 $(eval $(call application,multiwan,LuCI Support for the OpenWrt MultiWAN agent,luci-app-firewall multiwan))

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 3d2581a830788b9190521a72d576738cb15b4b84..4f4dd032adfa9ff7a5668b06f63cd89978e3d28b 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -257,9 +257,6 @@ $(eval $(call application,firewall,Firewall and Portforwarding application,\
 $(eval $(call application,qos,Quality of Service configuration module,\
        +PACKAGE_luci-app-qos:qos-scripts))
 
-$(eval $(call application,ocserv,LuCI Support for OpenConnect VPN,\
-       +PACKAGE_luci-app-ocserv:ocserv certtool))
-
 $(eval $(call application,commands,LuCI Shell Command Module))