From: Daniel F. Dickinson <redacted>
Date: Fri, 10 Jul 2026 03:30:55 +0000 (-0400)
Subject: zabbix: remove dependency on symbol ZABBIX_ENABLE_ZABBIX
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=d5eb49a42d8aea05c59862039a57e2d0de25710a;p=openwrt-packages.git

zabbix: remove dependency on symbol ZABBIX_ENABLE_ZABBIX

It results a failure to build due to
https://github.com/openwrt/gh-action-sdk/issues/70. This means there will be some
ZABBIX symbols in .config eveen when ZABBIX is not selected, but this is a
necessary tradeoff. See
https://github.com/openwrt/packages/pull/29803#issuecomment-4882201182.

Signed-off-by: Daniel F. Dickinson <redacted>
---

diff --git a/admin/zabbix/Config.in b/admin/zabbix/Config.in
index cad909c71..8f3e3faaf 100644
--- a/admin/zabbix/Config.in
+++ b/admin/zabbix/Config.in
@@ -1,14 +1,7 @@
-config ZABBIX_ENABLE_ZABBIX
-	bool "Enable Zabbix"
-	default y if ALL
-	default n
-
 menu "Modify features for non-core variants"
-	depends on ZABBIX_ENABLE_ZABBIX
 	config ZABBIX_CURL
 		bool "cURL support (default SSL)"
-		default y if ZABBIX_ENABLE_ZABBIX
-		default n
+		default y
 		depends on !ZABBIX_GNUTLS && !ZABBIX_NOSSL
 
 	config ZABBIX_CURL_GNUTLS
@@ -19,18 +12,15 @@ menu "Modify features for non-core variants"
 	config ZABBIX_LDAP
 		bool "LDAP support"
 		depends on ZABBIX_OPENSSL
-		default y if ZABBIX_ENABLE_ZABBIX
-		default n
+		default y
 
 	config ZABBIX_NETSNMP
 		bool "NetSNMP support (OpenSSL)"
 		depends on ZABBIX_OPENSSL
-		default y if ZABBIX_ENABLE_ZABBIX
-		default n
+		default y
 endmenu
 
 choice
-	depends on ZABBIX_ENABLE_ZABBIX
 	prompt "Select SSL Library"
 
 	default ZABBIX_OPENSSL
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index 6120bb0d0..ea49259a6 100644
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -27,7 +27,6 @@ PKG_BUILD_PARALLEL:=1
 PKG_CONFIG_DEPENDS:= \
   CONFIG_ZABBIX_CURL \
   CONFIG_ZABBIX_CURL_GNUTLS \
-  CONFIG_ZABBIX_ENABLE_ZABBIX \
   CONFIG_ZABBIX_GNUTLS \
   CONFIG_ZABBIX_LDAP \
   CONFIG_ZABBIX_MYSQL \
@@ -44,7 +43,6 @@ endef
 
 define Package/zabbix-proxy/config
 	choice
-		depends on ZABBIX_ENABLE_ZABBIX
 		prompt "Select Database Software for Zabbix"
 		default ZABBIX_POSTGRESQL
 
@@ -62,7 +60,7 @@ endef
 define Package/zabbix-get/config
 	config ZABBIX_BUILD_SUPPORT_BIN
 		bool
-		depends on PACKAGE_zabbix-agentd && ZABBIX_ENABLE_ZABBIX
+		depends on PACKAGE_zabbix-agentd
 		default y
 		help
 			This option exists to prevent trying to build get and/or sender when the
@@ -77,7 +75,6 @@ define Package/zabbix/Default
   SUBMENU:=Zabbix
   TITLE:=Zabbix
   URL:=https://www.zabbix.com/
-  DEPENDS:=@ZABBIX_ENABLE_ZABBIX
 endef
 
 define Package/zabbix/description/Default