zabbix: fix zabbix symbols in config without zabbix#28710
Open
danielfdickinson wants to merge 2 commits intoopenwrt:masterfrom
Open
zabbix: fix zabbix symbols in config without zabbix#28710danielfdickinson wants to merge 2 commits intoopenwrt:masterfrom
danielfdickinson wants to merge 2 commits intoopenwrt:masterfrom
Conversation
As reported in openwrt#28709, CONFIG_ZABBIX_...=y symbols appear in .config even when no zabbix packages are selected. We fix this by creating an empty parent `zabbix` package that all other zabbix packages DEPENDS on, and we add `depends on PACKAGE_zabbix` to the menus and choices that generate CONFIG_ZABBIX_... symbols. Since this affects the built packages by introducing a new dependency, we bump PKG_RELEASE. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Use tabs instead of spaces, and include a final newline. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
Contributor
Author
|
@feckert Could you verify this works for you? |
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
1 participant
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.
📦 Package Details
Maintainer: @danielfdickinson
Description:
As reported in #28709, CONFIG_ZABBIX_...=y
symbols appear in .config even when no zabbix packages are selected. We fix
this by creating an empty parent
zabbixpackage that all other zabbix packagesDEPENDS on, and we add
depends on PACKAGE_zabbixto the menus and choices thatgenerate CONFIG_ZABBIX_... symbols.
Since this affects the built packages by introducing a new dependency, we bump PKG_RELEASE.
Also tweak whitespace in
Config.inCompile-tested and image created as not a runtime-affecting change.
Built SDK and ImageBuilder using today's OpenWrt main branch, and built new Zabbix packages using that SDK. Generated test images with my standard sets of test Zabbix packages using the built ImageBuilder.
Note: The SNAPSHOT SDK's from downloads.openwrt.org have the problematic ZABBIX symbols in
Config-build.in, so you cannot verify this fix using the pre-built SDKs.✅ Formalities