Merge pull request #6211 from dhewg/luci-light

luci-light: rework and reenable
This commit is contained in:
Jo-Philipp Wich 2023-01-25 00:07:23 +01:00 committed by GitHub
commit 415dfe473f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 14 deletions

View file

@ -9,8 +9,19 @@ include $(TOPDIR)/rules.mk
LUCI_TYPE:=col LUCI_TYPE:=col
LUCI_BASENAME:=light LUCI_BASENAME:=light
LUCI_TITLE:=Minimum package set using only admin mini and the standard theme LUCI_TITLE:=LuCI interface with Uhttpd as Webserver (light)
LUCI_DEPENDS:=+uhttpd +luci-mod-admin-mini +luci-theme-openwrt @BROKEN LUCI_DESCRIPTION:=Light OpenWrt set including admin support and the default Bootstrap theme
LUCI_DEPENDS:= \
+IPV6:luci-proto-ipv6 \
+luci-app-firewall \
+luci-mod-admin-full \
+luci-proto-ppp \
+luci-theme-bootstrap \
+rpcd-mod-rrdns \
+uhttpd \
+uhttpd-mod-ubus
PKG_LICENSE:=Apache-2.0
include ../../luci.mk include ../../luci.mk

View file

@ -14,7 +14,7 @@ LUCI_DESCRIPTION:=LuCI with OpenSSL as the SSL backend (libustream-openssl). \
OpenSSL cmd tools (openssl-util) are used by uhttpd for SSL key generation \ OpenSSL cmd tools (openssl-util) are used by uhttpd for SSL key generation \
instead of the default px5g. (If px5g is installed, uhttpd will prefer that.) instead of the default px5g. (If px5g is installed, uhttpd will prefer that.)
LUCI_DEPENDS:=+luci +libustream-openssl +openssl-util LUCI_DEPENDS:=+luci-light +libustream-openssl +openssl-util
include ../../luci.mk include ../../luci.mk

View file

@ -10,7 +10,7 @@ LUCI_TYPE:=col
LUCI_BASENAME:=ssl LUCI_BASENAME:=ssl
LUCI_TITLE:=LuCI with HTTPS support (WolfSSL as SSL backend) LUCI_TITLE:=LuCI with HTTPS support (WolfSSL as SSL backend)
LUCI_DEPENDS:=+luci +libustream-wolfssl +px5g-wolfssl LUCI_DEPENDS:=+luci-light +libustream-wolfssl +px5g-wolfssl
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

View file

@ -10,18 +10,11 @@ LUCI_TYPE:=col
LUCI_BASENAME:=luci LUCI_BASENAME:=luci
LUCI_TITLE:=LuCI interface with Uhttpd as Webserver (default) LUCI_TITLE:=LuCI interface with Uhttpd as Webserver (default)
LUCI_DESCRIPTION:=Standard OpenWrt set including full admin with ppp support and the default Bootstrap theme LUCI_DESCRIPTION:=Standard OpenWrt set including package management and attended sysupgrades support
LUCI_DEPENDS:= \ LUCI_DEPENDS:= \
+IPV6:luci-proto-ipv6 \ +luci-light \
+luci-app-attendedsysupgrade \ +luci-app-attendedsysupgrade \
+luci-app-firewall \ +luci-app-opkg
+luci-app-opkg \
+luci-mod-admin-full \
+luci-proto-ppp \
+luci-theme-bootstrap \
+rpcd-mod-rrdns \
+uhttpd \
+uhttpd-mod-ubus
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0