[25.12]: Activate luci-app-attendedsysupgrade on buildbot config#8311
Open
hauke wants to merge 3 commits intoopenwrt:openwrt-25.12from
Open
[25.12]: Activate luci-app-attendedsysupgrade on buildbot config#8311hauke wants to merge 3 commits intoopenwrt:openwrt-25.12from
hauke wants to merge 3 commits intoopenwrt:openwrt-25.12from
Conversation
This comment has been minimized.
This comment has been minimized.
4aaed08 to
9811d01
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
The default option allows to activate a package by default in Kconfig. The user is still able to deactivate the option when it is selected by default. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit d6740fd)
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> (cherry picked from commit a0bad5e)
Activate luci-app-attendedsysupgrade in buildbots builds only when LuCI is also selected. This will prevent it form being activated in master buildbot builds. Fixes: a0bad5e ("luci-app-attendedsysupgrade: activate in buildbot") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit a4117e8)
9811d01 to
16d1c51
Compare
Failed checksIssues marked with an ❌ are failing checks. Commit 16d1c51
For more details, see the full job log. Something broken? Consider providing feedback. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This will remove the dependency to luci-app-attendedsysupgrade from the luci collections to allow disabling it in custom builds. luci-app-attendedsysupgrade will be activated in buildbot builds.
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.
(cherry picked from commit a0bad5e) (Activate luci-app-attendedsysupgrade and luci based on buildbot config #8303)
luci.mk: add support for DEFAULT option
The default option allows to activate a package by default in Kconfig.
The user is still able to deactivate the option when it is selected by
default.
(cherry picked from commit d6740fd) (Activate luci-app-attendedsysupgrade and luci based on buildbot config #8303)
luci-app-attendedsysupgrade: Activate only with LuCI
Activate luci-app-attendedsysupgrade in buildbots builds only when LuCI
is also selected. This will prevent it form being activated in master
buildbot builds.
(cherry picked from commit b6228b1) (luci-app-attendedsysupgrade: Activate only with LuCI #8312)