zabbix: fix zabbix symbols in config without zabbix#28710
Open
danielfdickinson wants to merge 3 commits intoopenwrt:masterfrom
Open
zabbix: fix zabbix symbols in config without zabbix#28710danielfdickinson wants to merge 3 commits intoopenwrt:masterfrom
danielfdickinson wants to merge 3 commits intoopenwrt:masterfrom
Conversation
Contributor
Author
|
@feckert Could you verify this works for you? |
Contributor
|
Zabbix causes only 16 lines to .config when no selected. So i would drop this PR. |
Based on openwrt#28709 (comment) it has been noted that the number config.in files was high compared to actual config selections. Therefore move smaller selection back into the Makefile. They are still kept with the most appropriate package which they configure. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
This seems to be more standard for Config.in. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
As noted in openwrt#28709 OpenWrt contains CONFIG_ symbols for Zabbix even when no Zabbix package is selected. This fixes and Closes openwrt#28709. We add a 'guard' symbol for the menus and choices so the only generate CONFIG symbols when 'Enable Zabbix' (CONFIG_ZABBIX_ENABLE_ZABBIX) is selected. We also make all the Zabbix packages depend on this symbol, for consistency. This operates much as the pseudo-package solution, but without a pseudo-package required. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
danielfdickinson
force-pushed
the
pr-fix-zabbix-symbols-in-config-without-zabbix
branch
from
83e1904 to
7126412
Compare
Member
|
LGTM |
Member
|
@hnyman What do you think? |
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
3 participants
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 a new symbol ZABBIX_ENABLE_ZABBIX that all other zabbix packages
DEPENDS on, and we add `depends ZABBIX_ENABLE_ZABBIX to the menus and choices that
generate CONFIG_ZABBIX_... symbols.
As this should not affect runtime packages, I have not bumped 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