openwrt/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-04-15 10:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

zabbix: fix compile skipped due to line continuation

Browse Source 
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>
This commit is contained in:
Daniel F. Dickinson
2026-02-02 08:08:06 -05:00
committed by Michael Heimpold
parent 9d8ac9df17
commit 8bc0c6c7cf
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
admin/zabbix/Makefile
View File

@@ -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)