diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-11-04 11:23:43 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-11-04 11:23:43 +0100 |
| commit | 92bfcbbc3463cbb7f384d688cb5f1c7e4bed326c (patch) | |
| tree | 0b898f556e29ec2d221271b39bab739a57f7f87f | |
| parent | 212d7be5331f9dc8c7965214cab61a59bfb8c6f6 (diff) | |
contrib: move luci-app-ocserv to luci-addons, fix recusrive deps
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
| -rw-r--r-- | contrib/package/luci-addons/Makefile | 1 | ||||
| -rw-r--r-- | contrib/package/luci/Makefile | 3 |
2 files changed, 1 insertions, 3 deletions
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)) |