zabbix: move small config-xx.in back to Makefile

Based on https://github.com/openwrt/packages/issues/28709#issuecomment-4060013105
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 <redacted>

diff --git a/admin/zabbix/Config-build.in b/admin/zabbix/Config-build.in
deleted file mode 100644 (file)
index 39ec1c6..0000000
--- a/admin/zabbix/Config-build.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ZABBIX_BUILD_SUPPORT_BIN
-  bool
-  depends on (PACKAGE_zabbix-agentd || PACKAGE_zabbix-proxy || PACKAGE_zabbix-server)
-  default y
-  help
-    This option exists to prevent trying to build get and/or sender when none
-    of agentd, server, or proxy are being built. In that case get and sender are
-    not built by the Zabbix build system.

diff --git a/admin/zabbix/Config-db.in b/admin/zabbix/Config-db.in
deleted file mode 100644 (file)
index 6a6df60..0000000
--- a/admin/zabbix/Config-db.in
+++ /dev/null
@@ -1,13 +0,0 @@
-choice
-        prompt "Select Database Software for Zabbix"
-        default ZABBIX_POSTGRESQL
-
-        config ZABBIX_MYSQL
-                bool "MySQL/MariaDB"
-
-        config ZABBIX_POSTGRESQL
-                bool "PostgreSQL"
-
-        config ZABBIX_SQLITE
-                bool "SQLite3"
-endchoice

diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index d0660f39c8d7fb1487cbdc5c157c72d3a0fcdabe..fb5b026192b55f33c8eda7f5e96eb271faf058a1 100644 (file)
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -42,11 +42,29 @@ define Package/zabbix-agentd/config
 endef
 
 define Package/zabbix-proxy/config
-  source "$(SOURCE)/Config-db.in"
+       choice
+               prompt "Select Database Software for Zabbix"
+               default ZABBIX_POSTGRESQL
+
+               config ZABBIX_MYSQL
+                       bool "MySQL/MariaDB"
+
+               config ZABBIX_POSTGRESQL
+                       bool "PostgreSQL"
+
+               config ZABBIX_SQLITE
+                       bool "SQLite3"
+       endchoice
 endef
 
 define Package/zabbix-get/config
-  source "$(SOURCE)/Config-build.in"
+       config ZABBIX_BUILD_SUPPORT_BIN
+               bool
+               default y
+               help
+                       This option exists to prevent trying to build get and/or sender when none
+                       of agentd, server, or proxy are being built. In that case get and sender are
+                       not built by the Zabbix build system.
 endef
 
 define Package/zabbix/Default