treewide: move server side CBI support to luci-compat

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

84 files changed, 50 insertions, 49 deletions

diff --git a/applications/luci-app-aria2/Makefile b/applications/luci-app-aria2/Makefile
index 541672f4d2..30089f8612 100644
--- 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
index d614327e34..546aeb9159 100644
--- 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
index f91e692af8..93df9edc90 100644
--- 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
index f41d6e2d42..8cd3cf51e8 100644
--- 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
index 61209917cd..4bcafdc8f8 100644
--- 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
index 40b0e9fb7f..c8a283bea4 100644
--- 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
index eb3a77aee7..5084c88e42 100644
--- 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
index d34fec87d7..c67b83000f 100644
--- 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
index e6abd44b39..81cf9f0ed4 100644
--- 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
index e405cc41f1..a763dc6146 100644
--- 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
index c3ac029885..b21738bfdf 100644
--- 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
index ba7a8568e7..73a9e6864f 100644
--- 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
index 07d5cadd99..cba55796dd 100644
--- 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
index 09ee8a3a92..d08940e59f 100644
--- 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
index bf4a99928b..c969248126 100644
--- 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
index b46a83bdee..c096db7491 100644
--- 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
index faa024d1a7..876e99dd41 100644
--- 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
index 1bfb7c3de7..7713bcf8ec 100644
--- 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
index 01de879937..4f86217c43 100644
--- 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
index 4c2b9044a9..3a40938d9c 100644
--- 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
index b30f967a1c..b144b7ba93 100644
--- 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
index b5c5b0d4c3..cce56e0c9f 100644
--- 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
index 380ee73a6d..4dfcc682ce 100644
--- 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
index d875009772..ea61323420 100644
--- 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
index 1fbafe7ed6..0bd1843322 100644
--- 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
index 6728172836..f558603795 100644
--- 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
index fd12557453..8361b6e2e6 100644
--- 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
index 90ef0deba6..b70683674e 100644
--- 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
index 83a2e7125e..09551b06f6 100644
--- 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
index 93d9a3a669..e048925b42 100644
--- 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
index ba599b30c3..7c08c0f813 100644
--- 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
index 08403fb2fc..3366dd8a16 100644
--- 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
index dcc0611785..59ca53d1b1 100644
--- 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
index e8a8e555e4..a411f6aa3d 100644
--- 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
index a46abb821e..8a666d635a 100644
--- 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
index 4c67a1558a..fc998ba282 100644
--- 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
index 4653724871..db9117225f 100644
--- 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
index 82802c0e5a..b16bd5d752 100644
--- 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
index 02751b849d..f4c7475b8b 100644
--- 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
index 42b29e9a4c..1a1166f2d5 100644
--- 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
index cb8f179232..c4286baaff 100644
--- 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
index 3014770665..a365353cc6 100644
--- 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
index 324e3e2aa4..bd3cdeb3f2 100644
--- 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
index 1bf076f0a2..cddcf85363 100644
--- 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
 
diff --git a/applications/luci-app-watchcat/Makefile b/applications/luci-app-watchcat/Makefile
index 7ad86c84c0..58e12ecbf5 100644
--- a/applications/luci-app-watchcat/Makefile
+++ b/applications/luci-app-watchcat/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for Watchcat
-LUCI_DEPENDS:=+watchcat
+LUCI_DEPENDS:=+luci-compat +watchcat
 
 include ../../luci.mk
 
diff --git a/applications/luci-app-wifischedule/Makefile b/applications/luci-app-wifischedule/Makefile
index 1708562a4e..891b41bf5a 100644
--- a/applications/luci-app-wifischedule/Makefile
+++ b/applications/luci-app-wifischedule/Makefile
@@ -10,12 +10,12 @@
 # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
 # ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# Author: Nils Koenig <openwrt@newk.it> 
+# Author: Nils Koenig <openwrt@newk.it>
 
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Turns WiFi on and off according to a schedule
-LUCI_DEPENDS:=+wifischedule
+LUCI_DEPENDS:=+luci-compat +wifischedule
 
 include ../../luci.mk
 
diff --git a/applications/luci-app-wol/Makefile b/applications/luci-app-wol/Makefile
index d935ee9030..9ffc322d39 100644
--- a/applications/luci-app-wol/Makefile
+++ b/applications/luci-app-wol/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for Wake-on-LAN
-LUCI_DEPENDS:=+etherwake
+LUCI_DEPENDS:=+luci-compat +etherwake
 
 include ../../luci.mk
 
diff --git a/build/mkbasepot.sh b/build/mkbasepot.sh
index ce41e30cee..0f9247536b 100755
--- a/build/mkbasepot.sh
+++ b/build/mkbasepot.sh
@@ -8,7 +8,7 @@
 echo -n "Updating modules/luci-base/po/templates/base.pot ... "
 
 ./build/i18n-scan.pl \
-	modules/luci-base/ modules/luci-mod-admin-full/ \
+	modules/luci-base/ modules/luci-compat/ modules/luci-mod-admin-full/ \
 	modules/luci-mod-network modules/luci-mod-status modules/luci-mod-system/ \
 	protocols/ themes/ \
 > modules/luci-base/po/templates/base.pot
diff --git a/modules/luci-base/luasrc/cbi.lua b/modules/luci-compat/luasrc/cbi.lua
index 450e413916..450e413916 100644
--- a/modules/luci-base/luasrc/cbi.lua
+++ b/modules/luci-compat/luasrc/cbi.lua
diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-compat/luasrc/cbi/datatypes.lua
index c1cf01f9cd..c1cf01f9cd 100644
--- a/modules/luci-base/luasrc/cbi/datatypes.lua
+++ b/modules/luci-compat/luasrc/cbi/datatypes.lua
diff --git a/modules/luci-base/luasrc/model/firewall.lua b/modules/luci-compat/luasrc/model/firewall.lua
index feff0855c4..feff0855c4 100644
--- a/modules/luci-base/luasrc/model/firewall.lua
+++ b/modules/luci-compat/luasrc/model/firewall.lua
diff --git a/modules/luci-base/luasrc/view/cbi/browser.htm b/modules/luci-compat/luasrc/view/cbi/browser.htm
index eb47ffafe6..eb47ffafe6 100644
--- a/modules/luci-base/luasrc/view/cbi/browser.htm
+++ b/modules/luci-compat/luasrc/view/cbi/browser.htm
diff --git a/modules/luci-base/luasrc/view/cbi/button.htm b/modules/luci-compat/luasrc/view/cbi/button.htm
index 6ccba58f23..6ccba58f23 100644
--- a/modules/luci-base/luasrc/view/cbi/button.htm
+++ b/modules/luci-compat/luasrc/view/cbi/button.htm
diff --git a/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm b/modules/luci-compat/luasrc/view/cbi/cell_valuefooter.htm
index bdd6bc9687..bdd6bc9687 100644
--- a/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm
+++ b/modules/luci-compat/luasrc/view/cbi/cell_valuefooter.htm
diff --git a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm b/modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm
index 4b70957543..4b70957543 100644
--- a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm
+++ b/modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm
diff --git a/modules/luci-base/luasrc/view/cbi/compound.htm b/modules/luci-compat/luasrc/view/cbi/compound.htm
index 12d02bb1d8..12d02bb1d8 100644
--- a/modules/luci-base/luasrc/view/cbi/compound.htm
+++ b/modules/luci-compat/luasrc/view/cbi/compound.htm
diff --git a/modules/luci-base/luasrc/view/cbi/delegator.htm b/modules/luci-compat/luasrc/view/cbi/delegator.htm
index 4fd19265d8..4fd19265d8 100644
--- a/modules/luci-base/luasrc/view/cbi/delegator.htm
+++ b/modules/luci-compat/luasrc/view/cbi/delegator.htm
diff --git a/modules/luci-base/luasrc/view/cbi/dropdown.htm b/modules/luci-compat/luasrc/view/cbi/dropdown.htm
index 927ecf2396..927ecf2396 100644
--- a/modules/luci-base/luasrc/view/cbi/dropdown.htm
+++ b/modules/luci-compat/luasrc/view/cbi/dropdown.htm
diff --git a/modules/luci-base/luasrc/view/cbi/dvalue.htm b/modules/luci-compat/luasrc/view/cbi/dvalue.htm
index 78e6f323d7..78e6f323d7 100644
--- a/modules/luci-base/luasrc/view/cbi/dvalue.htm
+++ b/modules/luci-compat/luasrc/view/cbi/dvalue.htm
diff --git a/modules/luci-base/luasrc/view/cbi/dynlist.htm b/modules/luci-compat/luasrc/view/cbi/dynlist.htm
index 2a3da67ff9..2a3da67ff9 100644
--- a/modules/luci-base/luasrc/view/cbi/dynlist.htm
+++ b/modules/luci-compat/luasrc/view/cbi/dynlist.htm
diff --git a/modules/luci-base/luasrc/view/cbi/error.htm b/modules/luci-compat/luasrc/view/cbi/error.htm
index 75ec1082aa..75ec1082aa 100644
--- a/modules/luci-base/luasrc/view/cbi/error.htm
+++ b/modules/luci-compat/luasrc/view/cbi/error.htm
diff --git a/modules/luci-base/luasrc/view/cbi/footer.htm b/modules/luci-compat/luasrc/view/cbi/footer.htm
index ed632202ce..ed632202ce 100644
--- a/modules/luci-base/luasrc/view/cbi/footer.htm
+++ b/modules/luci-compat/luasrc/view/cbi/footer.htm
diff --git a/modules/luci-base/luasrc/view/cbi/full_valuefooter.htm b/modules/luci-compat/luasrc/view/cbi/full_valuefooter.htm
index d4ad093efa..d4ad093efa 100644
--- a/modules/luci-base/luasrc/view/cbi/full_valuefooter.htm
+++ b/modules/luci-compat/luasrc/view/cbi/full_valuefooter.htm
diff --git a/modules/luci-base/luasrc/view/cbi/full_valueheader.htm b/modules/luci-compat/luasrc/view/cbi/full_valueheader.htm
index 1d9ebeba94..1d9ebeba94 100644
--- a/modules/luci-base/luasrc/view/cbi/full_valueheader.htm
+++ b/modules/luci-compat/luasrc/view/cbi/full_valueheader.htm
diff --git a/modules/luci-base/luasrc/view/cbi/fvalue.htm b/modules/luci-compat/luasrc/view/cbi/fvalue.htm
index 7f975b95e1..7f975b95e1 100644
--- a/modules/luci-base/luasrc/view/cbi/fvalue.htm
+++ b/modules/luci-compat/luasrc/view/cbi/fvalue.htm
diff --git a/modules/luci-base/luasrc/view/cbi/header.htm b/modules/luci-compat/luasrc/view/cbi/header.htm
index 821fa3efae..821fa3efae 100644
--- a/modules/luci-base/luasrc/view/cbi/header.htm
+++ b/modules/luci-compat/luasrc/view/cbi/header.htm
diff --git a/modules/luci-base/luasrc/view/cbi/ipaddr.htm b/modules/luci-compat/luasrc/view/cbi/ipaddr.htm
index 1c924e1544..1c924e1544 100644
--- a/modules/luci-base/luasrc/view/cbi/ipaddr.htm
+++ b/modules/luci-compat/luasrc/view/cbi/ipaddr.htm
diff --git a/modules/luci-base/luasrc/view/cbi/lvalue.htm b/modules/luci-compat/luasrc/view/cbi/lvalue.htm
index 28141472f4..28141472f4 100644
--- a/modules/luci-base/luasrc/view/cbi/lvalue.htm
+++ b/modules/luci-compat/luasrc/view/cbi/lvalue.htm
diff --git a/modules/luci-base/luasrc/view/cbi/map.htm b/modules/luci-compat/luasrc/view/cbi/map.htm
index cda4d3530c..cda4d3530c 100644
--- a/modules/luci-base/luasrc/view/cbi/map.htm
+++ b/modules/luci-compat/luasrc/view/cbi/map.htm
diff --git a/modules/luci-base/luasrc/view/cbi/mvalue.htm b/modules/luci-compat/luasrc/view/cbi/mvalue.htm
index 1f4f4dbcc6..1f4f4dbcc6 100644
--- a/modules/luci-base/luasrc/view/cbi/mvalue.htm
+++ b/modules/luci-compat/luasrc/view/cbi/mvalue.htm
diff --git a/modules/luci-base/luasrc/view/cbi/nsection.htm b/modules/luci-compat/luasrc/view/cbi/nsection.htm
index 14232e3d94..14232e3d94 100644
--- a/modules/luci-base/luasrc/view/cbi/nsection.htm
+++ b/modules/luci-compat/luasrc/view/cbi/nsection.htm
diff --git a/modules/luci-base/luasrc/view/cbi/nullsection.htm b/modules/luci-compat/luasrc/view/cbi/nullsection.htm
index 7230719d19..7230719d19 100644
--- a/modules/luci-base/luasrc/view/cbi/nullsection.htm
+++ b/modules/luci-compat/luasrc/view/cbi/nullsection.htm
diff --git a/modules/luci-base/luasrc/view/cbi/simpleform.htm b/modules/luci-compat/luasrc/view/cbi/simpleform.htm
index 3e10724ec5..3e10724ec5 100644
--- a/modules/luci-base/luasrc/view/cbi/simpleform.htm
+++ b/modules/luci-compat/luasrc/view/cbi/simpleform.htm
diff --git a/modules/luci-base/luasrc/view/cbi/tabcontainer.htm b/modules/luci-compat/luasrc/view/cbi/tabcontainer.htm
index 7fcb835783..7fcb835783 100644
--- a/modules/luci-base/luasrc/view/cbi/tabcontainer.htm
+++ b/modules/luci-compat/luasrc/view/cbi/tabcontainer.htm
diff --git a/modules/luci-base/luasrc/view/cbi/tblsection.htm b/modules/luci-compat/luasrc/view/cbi/tblsection.htm
index 11c2206d8c..11c2206d8c 100644
--- a/modules/luci-base/luasrc/view/cbi/tblsection.htm
+++ b/modules/luci-compat/luasrc/view/cbi/tblsection.htm
diff --git a/modules/luci-base/luasrc/view/cbi/tsection.htm b/modules/luci-compat/luasrc/view/cbi/tsection.htm
index 8f3b7f0ffb..8f3b7f0ffb 100644
--- a/modules/luci-base/luasrc/view/cbi/tsection.htm
+++ b/modules/luci-compat/luasrc/view/cbi/tsection.htm
diff --git a/modules/luci-base/luasrc/view/cbi/tvalue.htm b/modules/luci-compat/luasrc/view/cbi/tvalue.htm
index f3b12bd094..f3b12bd094 100644
--- a/modules/luci-base/luasrc/view/cbi/tvalue.htm
+++ b/modules/luci-compat/luasrc/view/cbi/tvalue.htm
diff --git a/modules/luci-base/luasrc/view/cbi/ucisection.htm b/modules/luci-compat/luasrc/view/cbi/ucisection.htm
index 8fa11d68f8..8fa11d68f8 100644
--- a/modules/luci-base/luasrc/view/cbi/ucisection.htm
+++ b/modules/luci-compat/luasrc/view/cbi/ucisection.htm
diff --git a/modules/luci-base/luasrc/view/cbi/upload.htm b/modules/luci-compat/luasrc/view/cbi/upload.htm
index e610495380..e610495380 100644
--- a/modules/luci-base/luasrc/view/cbi/upload.htm
+++ b/modules/luci-compat/luasrc/view/cbi/upload.htm
diff --git a/modules/luci-base/luasrc/view/cbi/value.htm b/modules/luci-compat/luasrc/view/cbi/value.htm
index 6060310b19..6060310b19 100644
--- a/modules/luci-base/luasrc/view/cbi/value.htm
+++ b/modules/luci-compat/luasrc/view/cbi/value.htm
diff --git a/modules/luci-base/luasrc/view/cbi/valuefooter.htm b/modules/luci-compat/luasrc/view/cbi/valuefooter.htm
index 805312e451..805312e451 100644
--- a/modules/luci-base/luasrc/view/cbi/valuefooter.htm
+++ b/modules/luci-compat/luasrc/view/cbi/valuefooter.htm
diff --git a/modules/luci-base/luasrc/view/cbi/valueheader.htm b/modules/luci-compat/luasrc/view/cbi/valueheader.htm
index 761a54aed0..761a54aed0 100644
--- a/modules/luci-base/luasrc/view/cbi/valueheader.htm
+++ b/modules/luci-compat/luasrc/view/cbi/valueheader.htm
diff --git a/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm b/modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm
index eeb1d5c5cb..eeb1d5c5cb 100644
--- a/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
+++ b/modules/luci-compat/luasrc/view/cbi/wireless_modefreq.htm
diff --git a/modules/luci-mod-admin-mini/Makefile b/modules/luci-mod-admin-mini/Makefile
index 5da4cafc94..de00489926 100644
--- a/modules/luci-mod-admin-mini/Makefile
+++ b/modules/luci-mod-admin-mini/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Essentials - stripped down and user-friendly
-LUCI_DEPENDS:=+luci-base @BROKEN
+LUCI_DEPENDS:=+luci-base +luci-compat @BROKEN
 
 include ../../luci.mk