summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-09-27 11:13:54 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-09-27 11:13:54 +0200
commitd5d51396380db5d011c7d32431a9d5a8d430561b (patch)
treeb596f4308057f02a990cb4ceb2d9bd989b33793e
parent1f4b752f9fa78037cf6ba12b4dce463ee98674c0 (diff)
update collectd to latest upstream
-rw-r--r--package/collectd/Makefile39
-rw-r--r--package/collectd/patches/patch-src_Makefile_in13
2 files changed, 30 insertions, 22 deletions
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 942e88942..af8ffaf3d 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -4,16 +4,21 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= collectd
-PKG_VERSION:= 5.0.1
+PKG_VERSION:= 5.4.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= a405d6cca021748fea43b60348b72b0c
+PKG_MD5SUM:= d4176b3066f3b85d85343d3648ea43f6
PKG_DESCR:= System statistics collection daemon
PKG_SECTION:= misc
-PKG_DEPENDS:= libpthread
+PKG_BUILDDEP:= libtool
+PKG_DEPENDS:= libpthread libltdl
PKG_URL:= http://collectd.org/
PKG_SITES:= http://collectd.org/files/
PKG_FLAVOURS_COLLECTD:= WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING
+PKG_FLAVOURS_COLLECTD+= WITH_RRD
+PKGFD_WITH_RRD:= enable RRD output
+PKGFB_WITH_RRD:= rrdtool
+PKGFS_WITH_RRD:= librrd
PKGFD_WITH_CPU:= collect CPU statistics
PKGFD_WITH_LOAD:= collect system load statistics
PKGFD_WITH_MEMORY:= collect memory usage statistics
@@ -36,11 +41,14 @@ ifneq (${ADK_PACKAGE_COLLECTD_WITH_PING},y)
DISABLE_PING:=--disable-ping
endif
-CONFIGURE_ARGS+= --disable-apache \
+CONFIGURE_ARGS+= --disable-aggregation \
+ --disable-apache \
--disable-apcups \
--disable-apple_sensors \
--disable-ascent \
--disable-battery \
+ --disable-cgroups \
+ --disable-conntrack \
${DISABLE_CPU} \
--disable-cpufreq \
--disable-contextswitch \
@@ -50,6 +58,7 @@ CONFIGURE_ARGS+= --disable-apache \
--disable-dns \
--disable-email \
--disable-entropy \
+ --disable-ethstat \
--disable-exec \
--disable-filecount \
--disable-fscache \
@@ -61,38 +70,47 @@ CONFIGURE_ARGS+= --disable-apache \
${DISABLE_LOAD} \
--disable-madwifi \
--disable-mbmon \
+ --disable-md \
--disable-memcached \
${DISABLE_MEMORY} \
--disable-multimeter \
--disable-mysql \
- --disable-openvpn \
- --disable-python \
- --disable-postgresql \
- --disable-powerdns \
--disable-network \
--disable-nginx \
--disable-nfs \
--disable-ntpd \
+ --disable-numa \
--disable-nut \
+ --disable-olsrd \
+ --disable-openvpn \
+ --disable-python \
+ --disable-postgresql \
+ --disable-powerdns \
--disable-perl \
${DISABLE_PING} \
--disable-processes \
+ --disable-protocols \
--disable-sensors \
--disable-serial \
--disable-logfile \
+ --disable-statsd \
--disable-swap \
- --disable-syslog \
+ --enable-syslog \
--disable-tape \
--disable-target_notification \
--disable-target_replace \
--disable-target_set \
+ --disable-tcpconns \
--disable-teamspeak2 \
--disable-ted \
--disable-thermal \
--disable-unixsock \
--disable-users \
+ --disable-uptime \
+ --disable-uuid \
--disable-vserver \
--disable-wireless \
+ --disable-write_graphite \
--disable-write_http \
--with-fp-layout=nothing \
--without-java \
@@ -106,6 +124,9 @@ XAKE_FLAGS+= LIBS='-lm -lltdl'
post-install:
${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \
${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/etc
+ ${INSTALL_DIR} ${IDIR_COLLECTD}/usr/share/collectd
+ ${CP} ${WRKINST}/usr/share/collectd/types.db \
+ ${IDIR_COLLECTD}/usr/share/collectd
${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin
${CP} ${WRKINST}/usr/lib/collectd/*.so \
${IDIR_COLLECTD}/usr/lib/collectd
diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in
deleted file mode 100644
index d1580516a..000000000
--- a/package/collectd/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- collectd-5.0.1.orig/src/Makefile.in 2011-10-14 22:54:14.000000000 +0200
-+++ collectd-5.0.1/src/Makefile.in 2011-10-22 18:57:51.000000000 +0200
-@@ -56,8 +56,8 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
- # too. -octo
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
--@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la
--@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la
-+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = liboconfig/liboconfig.la
-+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la
- @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
- @BUILD_AIX_TRUE@am__append_19 = -lm