diff options
| author | Daniel F. Dickinson | 2026-02-02 13:08:06 +0000 |
|---|---|---|
| committer | Michael Heimpold | 2026-02-04 19:38:34 +0000 |
| commit | 8bc0c6c7cf83289d44ac03273d8a044db8cd8f9c (patch) | |
| tree | d906aeb7928b29cbce66e59934cde39d3b968b42 | |
| parent | 9d8ac9df17a7b7047919cffb4a0742d547dfe91d (diff) | |
| download | packages-8bc0c6c7cf83289d44ac03273d8a044db8cd8f9c.tar.gz | |
zabbix: fix compile skipped due to line continuation
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>
| -rw-r--r-- | admin/zabbix/Makefile | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index e447599e78..4c4af46324 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -451,19 +451,9 @@ define Package/zabbix-server/install-extra $(INSTALL_BIN) ./files/zabbix_server.defaults $$(1)/etc/uci-defaults/90_zabbix_server endef -$(foreach zvariant,nossl openssl gnutls,\ - $(eval $(call Package/zabbix-daemon/files,agentd,\ - $(zvariant),\ - ,\ - $(call Package/zabbix-agentd/install-extra)))) -$(foreach zvariant,nossl openssl gnutls,\ - $(eval $(call Package/zabbix-daemon/files,server,\ - $(zvariant),\ - $(call Package/zabbix-server/conffiles-extra),\ - $(call Package/zabbix-server/install-extra)))) -$(foreach zvariant,nossl openssl gnutls,\ - $(eval $(call Package/zabbix-daemon/files,proxy,\ - $(zvariant)))) +$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-daemon/files,agentd,$(zvariant),,$(call Package/zabbix-agentd/install-extra)))) +$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-daemon/files,server,$(zvariant),$(call Package/zabbix-server/conffiles-extra),$(call Package/zabbix-server/install-extra)))) +$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-daemon/files,proxy,$(zvariant)))) # Due to nested defines, eval, and call, the extra spaces for the nested define # is essential. @@ -475,9 +465,7 @@ define Package/zabbix-server/postinst/Default endef endef -$(foreach zvariant,nossl openssl gnutls,\ - $(eval $(call Package/zabbix-server/postinst/Default,\ - $(zvariant)))) +$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-server/postinst/Default,$(zvariant)))) define Package/zabbix-program/files define Package/zabbix-$(1)-$(2)/install @@ -485,12 +473,8 @@ define Package/zabbix-program/files endef endef -$(foreach zvariant,nossl openssl gnutls,\ - $(eval $(call Package/zabbix-program/files,sender,\ - $(zvariant)))) -$(foreach zvariant,nossl openssl gnutls,\ - $(eval $(call Package/zabbix-program/files,get,\ - $(zvariant)))) +$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-program/files,sender,$(zvariant)))) +$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-program/files,get,$(zvariant)))) define Package/zabbix-extra-mac80211/install $(call Package/zabbix/install/zabbix.conf.d,$(1),mac80211) |