Browse Source

zabbix: add mysql support

Allows to choose database management software and adds mysql support.
Proxy gets the same database management software as server, because it
must be the same type.

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
[Keep postgresl as default / depend on libpq]
Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
lilik-openwrt-22.03
Krystian Kozak 6 years ago
committed by Etienne Champetier
parent
commit
cee4353f15
1 changed files with 24 additions and 5 deletions
  1. +24
    -5
      admin/zabbix/Makefile

+ 24
- 5
admin/zabbix/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix PKG_NAME:=zabbix
PKG_VERSION:=3.4.14 PKG_VERSION:=3.4.14
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=7443873cc970672d3c884230d3aeb082f2d8afcc2b757506c2d684ffdd12d77e PKG_HASH:=7443873cc970672d3c884230d3aeb082f2d8afcc2b757506c2d684ffdd12d77e
@ -25,7 +25,9 @@ PKG_FIXUP:=autoreconf
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_ZABBIX_GNUTLS \ CONFIG_ZABBIX_GNUTLS \
CONFIG_ZABBIX_OPENSSL
CONFIG_ZABBIX_OPENSSL \
CONFIG_ZABBIX_MYSQL \
CONFIG_ZABBIX_POSTGRESQL
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
@ -49,6 +51,22 @@ choice
endchoice endchoice
endef endef
define Package/zabbix-server/config
comment "Database Software"
choice
prompt "Selected Database Software"
default ZABBIX_POSTGRESQL
config ZABBIX_MYSQL
bool "MySQL/MariaDB"
config ZABBIX_POSTGRESQL
bool "PostgreSQL"
endchoice
endef
define Package/zabbix/Default define Package/zabbix/Default
SECTION:=admin SECTION:=admin
CATEGORY:=Administration CATEGORY:=Administration
@ -96,13 +114,13 @@ endef
define Package/zabbix-server define Package/zabbix-server
$(call Package/zabbix/Default) $(call Package/zabbix/Default)
TITLE+= server TITLE+= server
DEPENDS += +pgsql-cli +libevent2
DEPENDS += +ZABBIX_POSTGRESQL:libpq +ZABBIX_MYSQL:libmariadbclient +libevent2
endef endef
define Package/zabbix-proxy define Package/zabbix-proxy
$(call Package/zabbix/Default) $(call Package/zabbix/Default)
TITLE+= proxy TITLE+= proxy
DEPENDS += +pgsql-cli
DEPENDS += +ZABBIX_POSTGRESQL:libpq +ZABBIX_MYSQL:libmariadbclient
endef endef
define Package/zabbix-extra-mac80211/description define Package/zabbix-extra-mac80211/description
@ -129,7 +147,8 @@ CONFIGURE_ARGS+= \
--enable-proxy \ --enable-proxy \
$(call autoconf_bool,CONFIG_IPV6,ipv6) \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \
--disable-java \ --disable-java \
--with-postgresql \
$(if $(CONFIG_ZABBIX_MYSQL),--with-mysql) \
$(if $(CONFIG_ZABBIX_POSTGRESQL),--with-postgresql) \
--with-libevent=$(STAGING_DIR)/usr/include/libevent \ --with-libevent=$(STAGING_DIR)/usr/include/libevent \
--with-libpcre=$(STAGING_DIR)/usr/include \ --with-libpcre=$(STAGING_DIR)/usr/include \
$(if $(CONFIG_ZABBIX_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr") \ $(if $(CONFIG_ZABBIX_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr") \


Loading…
Cancel
Save