treewide: move server side CBI support to luci-compat

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
openwrt · Nov 3, 2019 · d5dff8f · d5dff8f
1 parent 9e57fbb
commit d5dff8f
Show file tree

Hide file tree

Showing 84 changed files with 50 additions and 49 deletions.
diff --git a/applications/luci-app-aria2/Makefile b/applications/luci-app-aria2/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for Aria2
-LUCI_DEPENDS:=+aria2 +luci-lib-ipkg
+LUCI_DEPENDS:=+luci-compat +aria2 +luci-lib-ipkg
 LUCI_PKGARCH:=all
 
 PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>

diff --git a/applications/luci-app-bmx7/Makefile b/applications/luci-app-bmx7/Makefile
@@ -4,7 +4,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for BMX7
-LUCI_DEPENDS:=+luci-lib-json +luci-mod-admin-full +bmx7 +bmx7-json
+LUCI_DEPENDS:=+luci-compat +luci-lib-json +luci-mod-admin-full +bmx7 +bmx7-json
 PKG_MAINTAINER:= Roger Pueyo <roger.pueyo@guifi.net> \
 	Pau Escrich <p4u@dabax.net>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/applications/luci-app-clamav/Makefile b/applications/luci-app-clamav/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=ClamAV LuCI interface
-LUCI_DEPENDS:=+luci-mod-admin-full +clamav
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +clamav
 
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 PKG_LICENSE:=Apache-2.0

diff --git a/applications/luci-app-commands/Makefile b/applications/luci-app-commands/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Shell Command Module
-LUCI_DEPENDS:=
+LUCI_DEPENDS:=+luci-compat
 
 PKG_LICENSE:=Apache-2.0
 

diff --git a/applications/luci-app-coovachilli/Makefile b/applications/luci-app-coovachilli/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for Coova Chilli
-LUCI_DEPENDS:=@BROKEN
+LUCI_DEPENDS:=+luci-compat @BROKEN
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-cshark/Makefile b/applications/luci-app-cshark/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Cloudshark capture tool Web UI
-LUCI_DEPENDS:=+cshark
+LUCI_DEPENDS:=+luci-compat +cshark
 LUCI_PKGARCH:=all
 
 PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>

diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile
@@ -23,7 +23,7 @@ PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com>
 
 # LuCI specific settings
 LUCI_TITLE:=LuCI Support for Dynamic DNS Client (ddns-scripts)
-LUCI_DEPENDS:=+luci-lib-ipkg +luci-mod-admin-full +ddns-scripts
+LUCI_DEPENDS:=+luci-compat +luci-lib-ipkg +luci-mod-admin-full +ddns-scripts
 # LUCI_PKGARCH:=all
 
 define Package/$(PKG_NAME)/config

diff --git a/applications/luci-app-dnscrypt-proxy/Makefile b/applications/luci-app-dnscrypt-proxy/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for DNSCrypt-Proxy
-LUCI_DEPENDS:=+uclient-fetch +dnscrypt-proxy +luci-lib-httpprotoutils
+LUCI_DEPENDS:=+luci-compat +uclient-fetch +dnscrypt-proxy +luci-lib-httpprotoutils
 LUCI_PKGARCH:=all
 
 include ../../luci.mk

diff --git a/applications/luci-app-dump1090/Makefile b/applications/luci-app-dump1090/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for dump1090
-LUCI_DEPENDS:=+dump1090
+LUCI_DEPENDS:=+luci-compat +dump1090
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-dynapoint/Makefile b/applications/luci-app-dynapoint/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for DynaPoint
-LUCI_DEPENDS:=+luci-lib-ipkg +dynapoint
+LUCI_DEPENDS:=+luci-compat +luci-lib-ipkg +dynapoint
 
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Tobias Ilte <tobias.ilte@campus.tu-berlin.de>

diff --git a/applications/luci-app-e2guardian/Makefile b/applications/luci-app-e2guardian/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=E2Guardian LuCI Interface
-LUCI_DEPENDS:=+luci-mod-admin-full +e2guardian
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +e2guardian
 
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 PKG_LICENSE:=Apache-2.0

diff --git a/applications/luci-app-fwknopd/Makefile b/applications/luci-app-fwknopd/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Fwknopd config - web config for the firewall knock daemon
-LUCI_DEPENDS:=+fwknopd +qrencode
+LUCI_DEPENDS:=+luci-compat +fwknopd +qrencode
 PKG_LICENSE:=GPLv2
 PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
 include ../../luci.mk

diff --git a/applications/luci-app-hd-idle/Makefile b/applications/luci-app-hd-idle/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Hard Disk Idle Spin-Down module
-LUCI_DEPENDS:=+hd-idle
+LUCI_DEPENDS:=+luci-compat +hd-idle
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-https_dns_proxy/Makefile b/applications/luci-app-https_dns_proxy/Makefile
@@ -8,7 +8,7 @@ PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
 
 LUCI_TITLE:=HTTPS DNS Proxy Web UI
 LUCI_DESCRIPTION:=Provides Web UI for HTTPS DNS Proxy
-LUCI_DEPENDS:=+luci-mod-admin-full +https_dns_proxy
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https_dns_proxy
 LUCI_PKGARCH:=all
 PKG_RELEASE:=5
 

diff --git a/applications/luci-app-ltqtapi/Makefile b/applications/luci-app-ltqtapi/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for Lantiq Devices
-LUCI_DEPENDS:=@BROKEN
+LUCI_DEPENDS:=+luci-compat @BROKEN
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-lxc/Makefile b/applications/luci-app-lxc/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LXC management Web UI
-LUCI_DEPENDS:=+luci-mod-admin-full +lxc +lxc-attach +lxc-console +lxc-create +liblxc +rpcd-mod-lxc +getopt +!LXC_BUSYBOX_OPTIONS:tar
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +lxc +lxc-attach +lxc-console +lxc-create +liblxc +rpcd-mod-lxc +getopt +!LXC_BUSYBOX_OPTIONS:tar
 LUCI_PKGARCH:=all
 
 define Package/luci-app-lxc/conffiles

diff --git a/applications/luci-app-mjpg-streamer/Makefile b/applications/luci-app-mjpg-streamer/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=MJPG-Streamer service configuration module
-LUCI_DEPENDS:=+mjpg-streamer
+LUCI_DEPENDS:=+luci-compat +mjpg-streamer
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-mosquitto/Makefile b/applications/luci-app-mosquitto/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Mosquitto LuCI interface
-LUCI_DEPENDS:=+luci-mod-admin-full mosquitto
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full mosquitto
 LUCI_PKGARCH:=all
 LUCI_DESCRIPTION:=Provides a webadmin for most basic mosquitto parameters.
 

diff --git a/applications/luci-app-nft-qos/Makefile b/applications/luci-app-nft-qos/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Qos over Nftables
-LUCI_DEPENDS:=+nft-qos
+LUCI_DEPENDS:=+luci-compat +nft-qos
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-noddos/Makefile b/applications/luci-app-noddos/Makefile
@@ -9,7 +9,7 @@ PKG_MAINTAINER:=Steven Hessing <steven.hessing@gmail.com>
 
 LUCI_TITLE:=Noddos Service Web UI
 LUCI_DESCRIPTION:=Provides Web UI for Noddos service.
-LUCI_DEPENDS:=+luci +noddos
+LUCI_DEPENDS:=+luci +luci-compat +noddos
 LUCI_PKGARCH:=all
 PKG_RELEASE:=1
 

diff --git a/applications/luci-app-ntpc/Makefile b/applications/luci-app-ntpc/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=NTP time synchronisation configuration module
-LUCI_DEPENDS:=+ntpclient
+LUCI_DEPENDS:=+luci-compat +ntpclient
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-nut/Makefile b/applications/luci-app-nut/Makefile
@@ -8,6 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Network UPS Tools Configuration
+LUCI_DEPENDS:=+luci-compat
 LUCI_PKGARCH:=all
 PKG_RELEASE:=1
 

diff --git a/applications/luci-app-openvpn/Makefile b/applications/luci-app-openvpn/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for OpenVPN
-LUCI_DEPENDS:=
+LUCI_DEPENDS:=+luci-compat
 
 PKG_LICENSE:=Apache-2.0
 

diff --git a/applications/luci-app-pagekitec/Makefile b/applications/luci-app-pagekitec/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for PageKite
-LUCI_DEPENDS:=+pagekitec
+LUCI_DEPENDS:=+luci-compat +pagekitec
 
 PKG_MAINTAINER:=Karl Palsson <karlp@tweak.net.au>
 

diff --git a/applications/luci-app-polipo/Makefile b/applications/luci-app-polipo/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for the Polipo Proxy
-LUCI_DEPENDS:=+polipo
+LUCI_DEPENDS:=+luci-compat +polipo
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-privoxy/Makefile b/applications/luci-app-privoxy/Makefile
@@ -21,7 +21,7 @@ PKG_MAINTAINER:=
 
 # LuCI specific settings
 LUCI_TITLE:=LuCI Support for Privoxy WEB proxy
-LUCI_DEPENDS:=+luci-lib-ipkg +luci-mod-admin-full +privoxy
+LUCI_DEPENDS:=+luci-compat +luci-lib-ipkg +luci-mod-admin-full +privoxy
 LUCI_PKGARCH:=all
 
 define Package/$(PKG_NAME)/config

diff --git a/applications/luci-app-qos/Makefile b/applications/luci-app-qos/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Quality of Service configuration module
-LUCI_DEPENDS:=+qos-scripts
+LUCI_DEPENDS:=+luci-compat +qos-scripts
 
 PKG_LICENSE:=Apache-2.0
 

diff --git a/applications/luci-app-radicale/Makefile b/applications/luci-app-radicale/Makefile
@@ -21,7 +21,7 @@ PKG_MAINTAINER:=
 
 # LuCI specific settings
 LUCI_TITLE:=LuCI Support for Radicale CardDAV/CalDAV
-LUCI_DEPENDS:=+luci-lib-ipkg +luci-mod-admin-full
+LUCI_DEPENDS:=+luci-compat +luci-lib-ipkg +luci-mod-admin-full
 LUCI_PKGARCH:=all
 
 define Package/$(PKG_NAME)/config

diff --git a/applications/luci-app-radicale2/Makefile b/applications/luci-app-radicale2/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Radicale v2.x CalDAV/CardDAV Server
-LUCI_DEPENDS:=+radicale2 +rpcd-mod-rad2-enc
+LUCI_DEPENDS:=+luci-compat +radicale2 +rpcd-mod-rad2-enc
 LUCI_PKGARCH:=all
 
 PKG_LICENSE:=Apache-2.0

diff --git a/applications/luci-app-rosy-file-server/Makefile b/applications/luci-app-rosy-file-server/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for Rosy File Server
-LUCI_DEPENDS:=+luci-base +rosy-file-server
+LUCI_DEPENDS:=+luci-compat +luci-base +rosy-file-server
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-samba/Makefile b/applications/luci-app-samba/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Network Shares - Samba SMB/CIFS module
-LUCI_DEPENDS:=+samba36-server
+LUCI_DEPENDS:=+luci-compat +samba36-server
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-samba4/Makefile b/applications/luci-app-samba4/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Network Shares - Samba 4 SMB/CIFS module
-LUCI_DEPENDS:=+samba4-server
+LUCI_DEPENDS:=+luci-compat +samba4-server
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-shairplay/Makefile b/applications/luci-app-shairplay/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for Shairplay
-LUCI_DEPENDS:=+shairplay
+LUCI_DEPENDS:=+luci-compat +shairplay
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-siitwizard/Makefile b/applications/luci-app-siitwizard/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=SIIT IPv4-over-IPv6 configuration wizard
-LUCI_DEPENDS:=+kmod-siit
+LUCI_DEPENDS:=+luci-compat +kmod-siit
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile
@@ -8,7 +8,7 @@ PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
 
 LUCI_TITLE:=Simple Adblock Web UI
 LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
-LUCI_DEPENDS:=+luci-mod-admin-full +simple-adblock
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +simple-adblock
 LUCI_PKGARCH:=all
 PKG_RELEASE:=38
 

diff --git a/applications/luci-app-snmpd/Makefile b/applications/luci-app-snmpd/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:= Net-SNMP LuCI interface
-LUCI_DEPENDS:= +luci-base
+LUCI_DEPENDS:=+luci-compat +luci-base
 LUCI_PKGARCH:=all
 LUCI_DESCRIPTION:=Some common net-snmp config items. In no way is this comprehensive.
 

diff --git a/applications/luci-app-splash/Makefile b/applications/luci-app-splash/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Freifunk DHCP-Splash application
-LUCI_DEPENDS:=+luci-lib-nixio +luci-lib-iptparser +tc +kmod-sched +iptables-mod-nat-extra +iptables-mod-ipopt
+LUCI_DEPENDS:=+luci-compat +luci-lib-nixio +luci-lib-iptparser +tc +kmod-sched +iptables-mod-nat-extra +iptables-mod-ipopt
 
 define Package/luci-app-splash/conffiles
 /etc/config/luci_splash

diff --git a/applications/luci-app-squid/Makefile b/applications/luci-app-squid/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Squid LuCI Interface
-LUCI_DEPENDS:=+luci-mod-admin-full +squid
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +squid
 
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 PKG_LICENSE:=Apache-2.0

diff --git a/applications/luci-app-tinyproxy/Makefile b/applications/luci-app-tinyproxy/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Tinyproxy - HTTP(S)-Proxy configuration
-LUCI_DEPENDS:=+tinyproxy
+LUCI_DEPENDS:=+luci-compat +tinyproxy
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-transmission/Makefile b/applications/luci-app-transmission/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for Transmission
-LUCI_DEPENDS:=+luci-lib-ipkg
+LUCI_DEPENDS:=+luci-compat +luci-lib-ipkg
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-udpxy/Makefile b/applications/luci-app-udpxy/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for udpxy
-LUCI_DEPENDS:=+udpxy
+LUCI_DEPENDS:=+luci-compat +udpxy
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-uhttpd/Makefile b/applications/luci-app-uhttpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=uHTTPd Webserver Configuration
-LUCI_DEPENDS:=+uhttpd
+LUCI_DEPENDS:=+luci-compat +uhttpd
 LUCI_PKGARCH:=all
 
 PKG_LICENSE:=Apache-2.0

diff --git a/applications/luci-app-upnp/Makefile b/applications/luci-app-upnp/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Universal Plug & Play configuration module
-LUCI_DEPENDS:=+miniupnpd
+LUCI_DEPENDS:=+luci-compat +miniupnpd
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile
@@ -8,7 +8,7 @@ PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
 
 LUCI_TITLE:=VPN Bypass Web UI
 LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
-LUCI_DEPENDS:=+luci-mod-admin-full +vpnbypass
+LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpnbypass
 LUCI_PKGARCH:=all
 PKG_RELEASE:=13