zabbix: cherry-pick changes to date to fix a build isssue and a packaging issue (and more)#28578
Merged
hnyman merged 7 commits intoopenwrt:openwrt-25.12from Feb 16, 2026
Conversation
In preparation for further changes, deduplicate package definitions, and reorganize them. At the same time make use of provides to ensure both existing names are preserved, and that it is possible to be specific about the variant of the package one wants. Also, condense the package conffiles, install, postinst, etc handling. This is more maintainable (less copy and paste and less to modify). Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca> (cherry picked from commit 75146ea)
Using line continuation (\\) in GNU Make \$(foreach ...) and \$(call ...) resulted in the install section for many of the packages not being defined. This resulted in 'skipping [package-name] no install section' messages and no new package being generated. We remove the line continuation from the parts foreach and call, in ordeer to restore compilation and creation of packages. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca> (cherry picked from commit 8bc0c6c)
Due to package renaming the selection of database for the server and proxy was missing from the Kconfig menu. This caused build failures for proxy and server. We now fix that. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca> (cherry picked from commit b032682)
The error in the openwrt#24828 patch series left Kconfig recursive depedency error on zabbix-frontend-server. We fix this by update the database depedencies on zabbix-frontend-server. Now, you must select the PHP8 database module you want _before_ zabbix-frontend-server will be visible in menuconfig. This is not a big problem, because zabbix-frontend-server already depends on having php8 slected before the frontend can be built. Closes: openwrt#28458 Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca> (cherry picked from commit ff7353d)
When selecting only a package of "no-configure" build variant, e.g. CONFIG_PACKAGE_zabbix-frontend-server=y but not any other zabbix package, then the build fails. The sources are not extracted and the install fails finally with: make[4]: Entering directory '/srv/openwrt/openwrt-2.git/build_dir/target-arm_arm926ej-s_musl_eabi/zabbix-no-configure/zabbix-7.0.22' make[4]: *** No rule to make target 'install'. Stop. make[4]: Leaving directory '/srv/openwrt.git/build_dir/target-arm_arm926ej-s_musl_eabi/zabbix-no-configure/zabbix-7.0.22' make[3]: *** [Makefile:522: /srv/openwrt.git/build_dir/target-arm_arm926ej-s_musl_eabi/zabbix-no-configure/zabbix-7.0.22/.built] Error 2 This PR fixes this by always running the standard Prepare stage, but skip the Install one when nothing needs to be compiled. Signed-off-by: Michael Heimpold <mhei@heimpold.de> (cherry picked from commit 849db73)
For non-compiled package that are architecture independant, set PKGARCH:=all. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca> (cherry picked from commit 4635838)
We aren't using packages with the same name as the provides, so don't use an virtual (@) provides for providing zabbix-get Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca> (cherry picked from commit 696e549)
systemcrash
approved these changes
Feb 16, 2026
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
4 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
Also mention: @mhei @hnyman @systemcrash
Description:
Cherry picks the following patches from master:
dcf8dbb zabbix: fix unnecessary virtual provides
b8eb319 zabbix: set PKGARCH all for non-binary packages
3c37f52 zabbix: fix no-configure build variant
558852e zabbix: fix recursive depedency warning on build
5d66c39 zabbix: fix package rename missed database config
0f63f79 zabbix: fix compile skipped due to line continuation
81c4290 zabbix: deduplicate and reorganize package defines
Of these, ' 3c37f52 zabbix: fix no-configure build variant' fixes a build issue and ' dcf8dbb zabbix: fix unnecessary virtual provides' are the most important fixes.
' 3c37f52 zabbix: fix no-configure build variant' was reported and fixed in PR #28495 and is present on openwrt-25.12. A test build with current 25.12-snapshot and openwrt-25.12 branch gives:
without that cherry-pick.
🧪 Run Testing Details
✅ Formalities