From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Tue, 9 Jun 2020 20:23:38 +0000 (+0300)
Subject: luci(-ssl)-nginx: depend on luci-app-opkg
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=219f0ce891a2e59d28a2dd8a1d14a29e35a81185;p=oweals%2Fluci.git

luci(-ssl)-nginx: depend on luci-app-opkg

Commit 391e82d6a3 in 2018 added luci-app-opkg dependency to
the 'luci' collection and its derivatives, but as nginx collections
do not depend on main 'luci', they did not get the intended change.

Fixes #4148

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
---

diff --git a/collections/luci-nginx/Makefile b/collections/luci-nginx/Makefile
index 7d14b1df7..8bd7c92bb 100644
--- a/collections/luci-nginx/Makefile
+++ b/collections/luci-nginx/Makefile
@@ -13,7 +13,7 @@ LUCI_TITLE:=LuCI interface with Nginx as Webserver
 LUCI_DESCRIPTION:=Standard OpenWrt set including full admin with ppp support and the default Bootstrap theme
 LUCI_DEPENDS:= \
 	+nginx +nginx-mod-luci +luci-mod-admin-full +luci-theme-bootstrap \
-	+luci-app-firewall +luci-proto-ppp +libiwinfo-lua +IPV6:luci-proto-ipv6 \
+	+luci-app-firewall +luci-app-opkg +luci-proto-ppp +libiwinfo-lua +IPV6:luci-proto-ipv6 \
 	+rpcd-mod-rrdns
 
 PKG_LICENSE:=Apache-2.0
diff --git a/collections/luci-ssl-nginx/Makefile b/collections/luci-ssl-nginx/Makefile
index facae6dba..63aaebba8 100644
--- a/collections/luci-ssl-nginx/Makefile
+++ b/collections/luci-ssl-nginx/Makefile
@@ -15,7 +15,7 @@ LUCI_DESCRIPTION:=LuCI with OpenSSL as the SSL backend (libustream-openssl). \
  
 LUCI_DEPENDS:= \
 	+nginx-ssl +nginx-mod-luci-ssl +luci-mod-admin-full +luci-theme-bootstrap \
-	+luci-app-firewall +luci-proto-ppp +libiwinfo-lua +IPV6:luci-proto-ipv6 \
+	+luci-app-firewall +luci-app-opkg +luci-proto-ppp +libiwinfo-lua +IPV6:luci-proto-ipv6 \
 	+rpcd-mod-rrdns +openssl-util
 
 PKG_LICENSE:=Apache-2.0