treewide: move server side CBI support to luci-compat

Signed-off-by: Jo-Philipp Wich <redacted>

diff --git a/applications/luci-app-aria2/Makefile b/applications/luci-app-aria2/Makefile
index 541672f4d2a7cf9f0ad66d866b679cd64832b56e..30089f8612e8a28e2acf80a31649e3584a82806a 100644 (file)
--- 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 d614327e3476006d3f835e5a0c5adaa48257c831..546aeb9159146565fbcfee51cf09cadc028ae9b5 100644 (file)
--- 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 f91e692af8e6997bde0c7a3a3e0d13f6997e10b8..93df9edc90717f37b7e6a9ded2fca587471fd959 100644 (file)
--- 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 f41d6e2d42eed7d8f56501a54abc09d1d5d0467b..8cd3cf51e8d96a94341577cd6a2865f9617560f5 100644 (file)
--- 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 61209917cdcd01cb1dd9559ac53b4ac8d934e268..4bcafdc8f891810784551eb8d8a0e203c59df483 100644 (file)
--- 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 40b0e9fb7fcefc261868143875980518feb901a9..c8a283bea4e17861e71cfbdae750c0998ae7ba0b 100644 (file)
--- 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 eb3a77aee76d44773e77948c333bf9f271bd5048..5084c88e4234b7cd5fbcc86a34d0dc566f397525 100644 (file)
--- 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 d34fec87d7c8192780d5d381a261904ecd1e9133..c67b83000f1aa5ea1c4d54d7405854fc996e3616 100644 (file)
--- 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 e6abd44b39076b0f111d39fbaa8f2482dac0048b..81cf9f0ed43cf6dafab7cab0a7e45a01ce4a4a0b 100644 (file)
--- 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 e405cc41f1ad363ed0e3a6c17ff02d25417f161f..a763dc6146baac6aab1e62efd8dddb8a530e39fb 100644 (file)
--- 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 c3ac0298855fb30ec91a034b21aea1098086c862..b21738bfdf5129ebab0fb074cacfa1e3b4abe1ba 100644 (file)
--- 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 ba7a8568e7caff0218746a74ed03b80d885b261b..73a9e6864ff1dc10574c16dc305268af96b6977c 100644 (file)
--- 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 07d5cadd99e6806fc2230324711a3ce3ac98b592..cba55796dd4015305e6d60c9502b599fcddcafad 100644 (file)
--- 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 09ee8a3a920cec7dd76af065367769634a99db9c..d08940e59f8cc9fa906ab11004b88c7e09f841fc 100644 (file)
--- 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 bf4a99928b757c75b5f0214d30afd4410c866dc5..c9692481263bed2e73dc46bd0be7ec3aa742f6b5 100644 (file)
--- 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 b46a83bdeed8d2d315c0e99d4e8631ff7e3c47d6..c096db749158ff70534ea63d7b219315d5cd23cc 100644 (file)
--- 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 faa024d1a760735a4471fe9ffb883d6bee1d8a77..876e99dd41cc72f9201692e48ef10b30881ff71e 100644 (file)
--- 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 1bfb7c3de7a95c60c4e4c32fb01329636ba26707..7713bcf8ecdb5465a8a4b2720c3340f15ec4cb40 100644 (file)
--- 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 01de8799375a4cd038d83a0aaef4222ddf580436..4f86217c432971ee1632825721f612c05f2eb689 100644 (file)
--- 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 4c2b9044a92b122cdc35719ce612f57c66820f6e..3a40938d9c1a436b6c7070f9e54b1275e4613a36 100644 (file)
--- 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 b30f967a1c60a38e304d4e63bc46e3e9c79e69ea..b144b7ba939ac55bf328677132c03c75aa073271 100644 (file)
--- 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 b5c5b0d4c303339f91c46f2cf5950df980a816eb..cce56e0c9f003ef94745eae12f4f548b2768dc8e 100644 (file)
--- 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 380ee73a6dcc22dbd123848ec6e00da7bffef7fa..4dfcc682ce64382e9905f04816a07f1cceacbe9a 100644 (file)
--- 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 d875009772d0526e5ebe94b34ad6d07b17e381c3..ea613234204b6c2fcae585d445451f54f49b241b 100644 (file)
--- 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 1fbafe7ed65a06ca31cf868723369588dc8ee88f..0bd18433220ed49c8878ed5a8738ad356c47381a 100644 (file)
--- 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 67281728363256e52844895069e4f81196c21350..f558603795cc38473b60708fe724c1cdf93268a3 100644 (file)
--- 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 fd1255745389a60085aeb000b9b57b1963849ea2..8361b6e2e6deb1a6fcc135917509bab2562c3e20 100644 (file)
--- 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 90ef0deba61d2a4819590a73d3f2443c04ef6055..b70683674e54711076be4fe9c6f5b7de6e8f9c04 100644 (file)
--- 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 83a2e7125edef93ccad3ee1aae8819bc88a86548..09551b06f630e7c0ea5a6c9733d4d2d7ff9cab21 100644 (file)
--- 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 93d9a3a6698ca782a4622b064bc81f4dc228632c..e048925b42b3bbf875fe83fbcad3efe6e3fd49e2 100644 (file)
--- 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 ba599b30c373898a98917c92cba8b906ac6a84cf..7c08c0f8137a03fade9a76635a3967da75515c0b 100644 (file)
--- 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 08403fb2fc618fa9ac7e24d3e0d2b7c6bca8112b..3366dd8a16aec9fa5a8916b7f15e8aa8eea52af0 100644 (file)
--- 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 dcc06117856aa9bb6d501628c8acc94f07c23c0c..59ca53d1b1fe138d362b2787679949bc10d0d99e 100644 (file)
--- 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 e8a8e555e4a39318584473f5df83a059f577ca75..a411f6aa3dc0a02a713b6a93a3dbccbc80a600b6 100644 (file)
--- 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 a46abb821e1a4956510ee9f0574abf1bd2beaa32..8a666d635a8526565d3c13e4414afdff79a02e54 100644 (file)
--- 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 4c67a1558a3dac1cf91083bec92eab18ff39711b..fc998ba282f1dc2e290b4527488325bc9f6c2df9 100644 (file)
--- 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 46537248710962768495fe91585823409740d3d0..db9117225fa685ed7310bf15a5da6ec17a6fd6f1 100644 (file)
--- 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 82802c0e5a86ab635aaea4aa4971e679b7575200..b16bd5d752e96a438033b762ccdb2b1bb6bc7806 100644 (file)
--- 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 02751b849d5f4bef331ad94bcd9a70a7f0bc0e4c..f4c7475b8bed3196b189d637e213b0414b598dcb 100644 (file)
--- 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 42b29e9a4c8521b992c15edd8cf4855f54052c4e..1a1166f2d54c3aecf911362554ed904d443bdb7b 100644 (file)
--- 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 cb8f1792322266842c969c4804ed47c367267690..c4286baaffe73bd6f1da8b619078523f5d8d874c 100644 (file)
--- 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 301477066528d343ba0442afc27f49017496ce48..a365353cc627fced7674c2e5d941c46be87f6e92 100644 (file)
--- 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 324e3e2aa42910e4dd96bb5b76a148923954c25b..bd3cdeb3f2e87616b024e6292f09adbe6599412e 100644 (file)
--- 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 1bf076f0a297b5bf166267ca8d6f4589c8d276ee..cddcf8536307d5cbf92748ebcf4cd5da0b1c0137 100644 (file)
--- 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 7ad86c84c02846c255109e523a42ab19ca1f3c67..58e12ecbf5aa2e787b9b245b889727287369bf7a 100644 (file)
--- 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 1708562a4e8852345a33ff5000c284f4451f1be7..891b41bf5a5068d68b9a25f7979e765da5f2d9c0 100644 (file)
--- 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 d935ee90303b30a049d58dd279be1a636e293a08..9ffc322d393ef1e24a4b8cb5d3c141f29d072a82 100644 (file)
--- 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 ce41e30ceec19ddef8bded5ec8772b6c5de862a2..0f9247536b86f7e6f69f70f7456b8e3b6f1977dd 100755 (executable)
--- 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
similarity index 100%
rename from modules/luci-base/luasrc/cbi.lua
rename to modules/luci-compat/luasrc/cbi.lua

diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-compat/luasrc/cbi/datatypes.lua
similarity index 100%
rename from modules/luci-base/luasrc/cbi/datatypes.lua
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/model/firewall.lua
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/browser.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/button.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/cell_valueheader.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/compound.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/delegator.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/dropdown.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/dvalue.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/dynlist.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/error.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/footer.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/full_valuefooter.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/full_valueheader.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/fvalue.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/header.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/ipaddr.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/lvalue.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/map.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/mvalue.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/nsection.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/nullsection.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/simpleform.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/tabcontainer.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/tblsection.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/tsection.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/tvalue.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/ucisection.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/upload.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/value.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/valuefooter.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/valueheader.htm
rename to 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
similarity index 100%
rename from modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
rename to 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 5da4cafc94f8680005a9c594889e009d9311d83e..de0048992606e553a047fbc4c4607d9a4de4f48a 100644 (file)
--- 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