From 9ef8a292f288425a11070e444c145e7694ff4b32 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 20 Oct 2019 21:11:02 +0200 Subject: [PATCH] Use luci from luci feeds --- luci-app-dsvpn/Makefile | 3 ++- luci-app-glorytun/Makefile | 3 ++- luci-app-iperf/Makefile | 3 ++- luci-app-mail/Makefile | 3 ++- luci-app-mlvpn/Makefile | 3 ++- luci-app-mptcp/Makefile | 4 ++-- luci-app-nginx-ha/Makefile | 3 ++- luci-app-omr-bypass/Makefile | 3 ++- luci-app-omr-dscp/Makefile | 3 ++- luci-app-omr-quota/Makefile | 3 ++- luci-app-omr-tracker/Makefile | 3 ++- luci-app-openmptcprouter/Makefile | 3 ++- luci-app-shadowsocks-libev/Makefile | 3 ++- luci-app-snmpd/Makefile | 4 ++-- luci-app-vnstat/Makefile | 3 ++- luci-theme-openmptcprouter/Makefile | 3 ++- 16 files changed, 32 insertions(+), 18 deletions(-) diff --git a/luci-app-dsvpn/Makefile b/luci-app-dsvpn/Makefile index 2e7237c71..d78150d98 100644 --- a/luci-app-dsvpn/Makefile +++ b/luci-app-dsvpn/Makefile @@ -10,6 +10,7 @@ LUCI_DEPENDS:=+dsvpn PKG_LICENSE:=GPLv3 -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-glorytun/Makefile b/luci-app-glorytun/Makefile index 07fc5f1d3..b582773b2 100644 --- a/luci-app-glorytun/Makefile +++ b/luci-app-glorytun/Makefile @@ -15,6 +15,7 @@ PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Ycarus (Yannick Chabanois) -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-iperf/Makefile b/luci-app-iperf/Makefile index 72c467a81..28de819ae 100644 --- a/luci-app-iperf/Makefile +++ b/luci-app-iperf/Makefile @@ -10,6 +10,7 @@ LUCI_DEPENDS:=+iperf3-ssl PKG_LICENSE:=GPLv3 -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-mail/Makefile b/luci-app-mail/Makefile index 50a85b4fe..a6a9edad5 100644 --- a/luci-app-mail/Makefile +++ b/luci-app-mail/Makefile @@ -10,6 +10,7 @@ LUCI_DEPENDS:=+msmtp-mta PKG_LICENSE:=GPLv3 -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-mlvpn/Makefile b/luci-app-mlvpn/Makefile index 8e5327d38..33548c8e9 100644 --- a/luci-app-mlvpn/Makefile +++ b/luci-app-mlvpn/Makefile @@ -10,6 +10,7 @@ LUCI_DEPENDS:=+mlvpn PKG_LICENSE:=GPLv3 -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-mptcp/Makefile b/luci-app-mptcp/Makefile index b098b8a2a..68b644021 100644 --- a/luci-app-mptcp/Makefile +++ b/luci-app-mptcp/Makefile @@ -8,6 +8,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for MPTCP PKG_LICENSE:=GPLv3 -include ../luci/luci.mk - +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-nginx-ha/Makefile b/luci-app-nginx-ha/Makefile index ec53fe564..2c41ee755 100644 --- a/luci-app-nginx-ha/Makefile +++ b/luci-app-nginx-ha/Makefile @@ -13,6 +13,7 @@ KCONFIG:=CONFIG_NGINX_STREAM_CORE_MODULE PKG_LICENSE:=MIT -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-omr-bypass/Makefile b/luci-app-omr-bypass/Makefile index 2b16b8527..cbce20358 100644 --- a/luci-app-omr-bypass/Makefile +++ b/luci-app-omr-bypass/Makefile @@ -10,6 +10,7 @@ LUCI_DEPENDS:=+dnsmasq-full +shadowsocks-libev-ss-rules +iptables-mod-ndpi +ipta PKG_LICENSE:=GPLv3 -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-omr-dscp/Makefile b/luci-app-omr-dscp/Makefile index 8c6c6ea74..152e91cf0 100644 --- a/luci-app-omr-dscp/Makefile +++ b/luci-app-omr-dscp/Makefile @@ -9,6 +9,7 @@ LUCI_TITLE:=LuCI Interface to DSCP PKG_LICENSE:=GPLv3 -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-omr-quota/Makefile b/luci-app-omr-quota/Makefile index a3af82c4e..a4b20e8b0 100644 --- a/luci-app-omr-quota/Makefile +++ b/luci-app-omr-quota/Makefile @@ -9,6 +9,7 @@ LUCI_DEPENDS:=+omr-quota PKG_LICENSE:=GPLv3 -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-omr-tracker/Makefile b/luci-app-omr-tracker/Makefile index 6e439a44b..410d1994a 100644 --- a/luci-app-omr-tracker/Makefile +++ b/luci-app-omr-tracker/Makefile @@ -10,6 +10,7 @@ LUCI_DEPENDS:=+omr-tracker PKG_LICENSE:=GPLv3 -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-openmptcprouter/Makefile b/luci-app-openmptcprouter/Makefile index f32fa7092..ae4cb6eea 100644 --- a/luci-app-openmptcprouter/Makefile +++ b/luci-app-openmptcprouter/Makefile @@ -9,7 +9,8 @@ LUCI_TITLE:=LuCI Support for OpenMPTCProuter LUCI_DEPENDS:=+luci-lib-json +rdisc6 +curl +bind-dig +tracebox PKG_LICENSE:=GPLv3 -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk define Package/luci-app-openmptcprouter/conffiles /etc/sysctl.d/zzz_openmptcprouter.conf diff --git a/luci-app-shadowsocks-libev/Makefile b/luci-app-shadowsocks-libev/Makefile index 50af3c222..2fdd03658 100644 --- a/luci-app-shadowsocks-libev/Makefile +++ b/luci-app-shadowsocks-libev/Makefile @@ -11,6 +11,7 @@ LUCI_DEPENDS:= PKG_LICENSE:=Apache-2.0 -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-snmpd/Makefile b/luci-app-snmpd/Makefile index 01335792b..d9c583019 100644 --- a/luci-app-snmpd/Makefile +++ b/luci-app-snmpd/Makefile @@ -10,6 +10,6 @@ LUCI_DEPENDS:=+snmpd PKG_LICENSE:=GPLv3 -include ../luci/luci.mk - +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-vnstat/Makefile b/luci-app-vnstat/Makefile index 98c4d11b8..6fb2e83bc 100644 --- a/luci-app-vnstat/Makefile +++ b/luci-app-vnstat/Makefile @@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for VnStat LUCI_DEPENDS:=+vnstat +vnstati -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-theme-openmptcprouter/Makefile b/luci-theme-openmptcprouter/Makefile index d9fd23dcf..b3dfab810 100644 --- a/luci-theme-openmptcprouter/Makefile +++ b/luci-theme-openmptcprouter/Makefile @@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=OpenMPTCProuter Theme (default) LUCI_DEPENDS:= -include ../luci/luci.mk +#include ../luci/luci.mk +include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature