luci-app-attendedsysupgrade: activate in buildbot

Instead of making the main LuCI packages depend on
luci-app-attendedsysupgrade, only activate it by default when BUILDBOT
is seletced.

This way it is not selected by default in custom builds, but it will be
automatically selected in builds with CONFIG_BUILDBOT set. Even when
CONFIG_BUILDBOT is set it is possible to deactivate it.

This still depends on LuCI, it will only be activated in OpenWrt release
builds which are build with LuCI and not in OpenWrt main branch builds.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/applications/luci-app-attendedsysupgrade/Makefile b/applications/luci-app-attendedsysupgrade/Makefile
index 0d526824fd5080bea3e3d369db914ab859545ac2..6998864cf36c2f18fd219fa5fd02044fc2e45340 100644 (file)
--- a/applications/luci-app-attendedsysupgrade/Makefile
+++ b/applications/luci-app-attendedsysupgrade/Makefile
@@ -9,6 +9,8 @@ LUCI_DEPENDS:=+luci-base +attendedsysupgrade-common +cgi-io
 PKG_MAINTAINER:=Eric Fahlgren <ericfahlgren@gmail.com>, Paul Spooren <paul@spooren.de>
 PKG_LICENSE:=GPL-2.0
 
+LUCI_DEFAULT:=y if BUILDBOT
+
 include ../../luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature

diff --git a/collections/luci-nginx/Makefile b/collections/luci-nginx/Makefile
index c22a172422c7e4a2666d93cfac2cd5b090a68206..7f268d002bad99e4728c3b6967c3c8803f9e2021 100644 (file)
--- a/collections/luci-nginx/Makefile
+++ b/collections/luci-nginx/Makefile
@@ -15,7 +15,6 @@ LUCI_DEPENDS:= \
        +IPV6:luci-proto-ipv6 \
        +luci-app-firewall \
        +luci-app-package-manager \
-       +luci-app-attendedsysupgrade \
        +luci-mod-admin-full \
        +luci-proto-ppp \
        +luci-theme-bootstrap \

diff --git a/collections/luci-ssl-openssl/Makefile b/collections/luci-ssl-openssl/Makefile
index 0baae5aad8221e1e7dbe773b40e98cd29dc85ceb..df019b2ebb5a3a8da29c575962ab22fa7de989b3 100644 (file)
--- a/collections/luci-ssl-openssl/Makefile
+++ b/collections/luci-ssl-openssl/Makefile
@@ -17,8 +17,7 @@ LUCI_DESCRIPTION:=LuCI with OpenSSL as the SSL backend (libustream-openssl). \
 LUCI_DEPENDS:=+luci-light \
        +libustream-openssl \
        +openssl-util \
-       +luci-app-package-manager \
-       +luci-app-attendedsysupgrade
+       +luci-app-package-manager
 
 PKG_LICENSE:=Apache-2.0
 

diff --git a/collections/luci-ssl/Makefile b/collections/luci-ssl/Makefile
index 2f6d75b0c05b911598b449dee6a78e6650313abd..6c89b6abad39f8bce20719b41463fca130044296 100644 (file)
--- a/collections/luci-ssl/Makefile
+++ b/collections/luci-ssl/Makefile
@@ -13,8 +13,7 @@ LUCI_TITLE:=LuCI with HTTPS support (mbedtls as SSL backend)
 LUCI_DEPENDS:=+luci-light \
        +libustream-mbedtls \
        +px5g-mbedtls \
-       +luci-app-package-manager \
-       +luci-app-attendedsysupgrade
+       +luci-app-package-manager
 
 PKG_LICENSE:=Apache-2.0
 

diff --git a/collections/luci/Makefile b/collections/luci/Makefile
index 399f0a14407673cd7b2f77e3eda594fceedfd988..40414347c839b3c35c55e09e671df2dbd279ee6a 100644 (file)
--- a/collections/luci/Makefile
+++ b/collections/luci/Makefile
@@ -13,8 +13,7 @@ LUCI_TITLE:=LuCI interface with Uhttpd as Webserver (default)
 LUCI_DESCRIPTION:=Standard OpenWrt set including package management and attended sysupgrades support
 LUCI_DEPENDS:= \
        +luci-light \
-       +luci-app-package-manager \
-       +luci-app-attendedsysupgrade
+       +luci-app-package-manager
 
 PKG_LICENSE:=Apache-2.0