From: Jo-Philipp Wich Date: Tue, 4 Nov 2014 10:23:43 +0000 (+0100) Subject: contrib: move luci-app-ocserv to luci-addons, fix recusrive deps X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=92bfcbbc3463cbb7f384d688cb5f1c7e4bed326c;p=project%2Fluci.git contrib: move luci-app-ocserv to luci-addons, fix recusrive deps Signed-off-by: Jo-Philipp Wich --- diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile index 35bc02caf1..859390cb2e 100644 --- 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 3d2581a830..4f4dd032ad 100644 --- 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))