diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-08-13 19:27:57 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-08-13 21:41:33 -0700 |
| commit | 889676ecc741d71966ac538fcd7e7c46ff433bc7 (patch) | |
| tree | 8eb5d2f4e061355b839ba7cb08c7c4972ba892b8 /admin | |
| parent | d8d06cfca262d97c7d3a3481c6a0f2cd3803c250 (diff) | |
zabbix: do not build with uClibc-ng
It's missing functionality necessary for zabbix.
Remove now pointless patch.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/zabbix/Makefile | 4 | ||||
| -rw-r--r-- | admin/zabbix/patches/002-uclibc_loadavg.patch | 48 |
2 files changed, 2 insertions, 50 deletions
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index ca189c140..b8543aa57 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zabbix PKG_VERSION:=5.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://cdn.zabbix.com/zabbix/sources/stable/5.0/ @@ -74,7 +74,7 @@ define Package/zabbix/Default TITLE:=Zabbix URL:=https://www.zabbix.com/ USERID:=zabbix=53:zabbix=53 - DEPENDS += $(ICONV_DEPENDS) +libpcre +zlib +ZABBIX_GNUTLS:libgnutls +ZABBIX_OPENSSL:libopenssl + DEPENDS += $(ICONV_DEPENDS) +libpcre +zlib +ZABBIX_GNUTLS:libgnutls +ZABBIX_OPENSSL:libopenssl @!USE_UCLIBC endef define Package/zabbix-agentd diff --git a/admin/zabbix/patches/002-uclibc_loadavg.patch b/admin/zabbix/patches/002-uclibc_loadavg.patch deleted file mode 100644 index ce62d06c3..000000000 --- a/admin/zabbix/patches/002-uclibc_loadavg.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/src/libs/zbxsysinfo/linux/cpu.c -+++ b/src/libs/zbxsysinfo/linux/cpu.c -@@ -22,6 +22,45 @@ - #include "stats.h" - #include "log.h" - -+ -+/* uclibc and dietlibc do not have this junk -ReneR */ -+#if defined (__UCLIBC__) || defined (__dietlibc__) -+static int getloadavg (double loadavg[], int nelem) -+{ -+ int fd; -+ -+ fd = open ("/proc/loadavg", O_RDONLY); -+ if (fd < 0) -+ return -1; -+ else -+ { -+ char buf[65], *p; -+ ssize_t nread; -+ int i; -+ -+ nread = read (fd, buf, sizeof buf - 1); -+ close (fd); -+ if (nread <= 0) -+ return -1; -+ buf[nread - 1] = '\0'; -+ -+ if (nelem > 3) -+ nelem = 3; -+ p = buf; -+ for (i = 0; i < nelem; ++i) -+ { -+ char *endp; -+ loadavg[i] = strtod (p, &endp); -+ if (endp == p) -+ return -1; -+ p = endp; -+ } -+ -+ return i; -+ } -+} -+#endif -+ - int SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result) - { - char *type; |