[ptxdist] [PATCH 01/10] rrdtool: version bump 1.4.7 -> 1.4.9

[ptxdist] [PATCH 01/10] rrdtool: version bump 1.4.7 -> 1.4.9

[Robert Schwebel]

No relevant configure.ac changes.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/rrdtool.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/rrdtool.make b/rules/rrdtool.make
index 020450e..7e458ed 100644
--- a/rules/rrdtool.make
+++ b/rules/rrdtool.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_RRDTOOL) += rrdtool
 #
 # Paths and names
 #
-RRDTOOL_VERSION	:= 1.4.7
-RRDTOOL_MD5	:= ffe369d8921b4dfdeaaf43812100c38f
+RRDTOOL_VERSION	:= 1.4.9
+RRDTOOL_MD5	:= 1cea5a9efd6a48ac4035b0f9c7e336cf
 RRDTOOL		:= rrdtool-$(RRDTOOL_VERSION)
 RRDTOOL_SUFFIX	:= tar.gz
 RRDTOOL_URL	:= http://oss.oetiker.ch/rrdtool/pub/$(RRDTOOL).$(RRDTOOL_SUFFIX)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 02/10] rrdtool: audit configure options

[Robert Schwebel]

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/rrdtool.make | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rules/rrdtool.make b/rules/rrdtool.make
index 7e458ed..a741bfd 100644
--- a/rules/rrdtool.make
+++ b/rules/rrdtool.make
@@ -40,13 +40,12 @@ RRDTOOL_CONF_ENV	:= \
 RRDTOOL_CONF_TOOL	:= autoconf
 RRDTOOL_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--enable-silent-rules \
 	--$(call ptx/endis, PTXCONF_RRDTOOL_RRDCGI)-rrdcgi \
+	--disable-rrd_graph \
 	--enable-mmap \
 	--enable-pthread \
 	--disable-static-programs \
-	--enable-shared \
-	--disable-static \
-	--enable-fast-install \
 	--disable-nls \
 	--disable-rpath \
 	--disable-libdbi \
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 03/10] rrdtool: fix libxml2 handling

[Robert Schwebel]

The configure script searches for the libxml2 headers in /usr/include,
so we remove the hardcoded path here.

The check is searching for xmlParseFile, which is part of the SAX2 API.
This means we need to enable the feature in libxml2.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 ...c-don-t-specify-hardcoded-include-search-.patch | 27 ++++++++++++++++++++++
 patches/rrdtool-1.4.9/autogen.sh                   |  1 +
 patches/rrdtool-1.4.9/series                       |  4 ++++
 rules/rrdtool.in                                   |  1 +
 4 files changed, 33 insertions(+)
 create mode 100644 patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
 create mode 120000 patches/rrdtool-1.4.9/autogen.sh
 create mode 100644 patches/rrdtool-1.4.9/series

diff --git a/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch b/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
new file mode 100644
index 0000000..476309e
--- /dev/null
+++ b/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
@@ -0,0 +1,27 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 24 Jan 2015 20:57:27 +0100
+Subject: [PATCH] configure.ac: don't specify hardcoded include search path
+
+If we crosscompile rrdtool or packetize for a distribution, libxml2
+headers may be installed in a SYSROOT/DESTDIR directory, not in
+/usr/include. For the cross compile usecase, this leaks a host header
+file in.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9e934595b102..793e02874d4b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -540,7 +540,7 @@ EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,
+ EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.10.2,  http://cairographics.org/releases/, "")
+ EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
+ fi
+-EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, /usr/include/libxml2)
++EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, "")
+ 
+ if test "$EX_CHECK_ALL_ERR" = "YES"; then
+   AC_MSG_ERROR([Please fix the library issues listed above and try again.])
diff --git a/patches/rrdtool-1.4.9/autogen.sh b/patches/rrdtool-1.4.9/autogen.sh
new file mode 120000
index 0000000..9f8a4cb
--- /dev/null
+++ b/patches/rrdtool-1.4.9/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/rrdtool-1.4.9/series b/patches/rrdtool-1.4.9/series
new file mode 100644
index 0000000..8f63465
--- /dev/null
+++ b/patches/rrdtool-1.4.9/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
+# 4f69babc0b922fa5b09478ce957d196a  - git-ptx-patches magic
diff --git a/rules/rrdtool.in b/rules/rrdtool.in
index 0e83e66..3ae66d7 100644
--- a/rules/rrdtool.in
+++ b/rules/rrdtool.in
@@ -9,6 +9,7 @@ menuconfig RRDTOOL
 	select CAIRO_PS
 	select PANGO
 	select LIBXML2
+	select LIBXML2_SAX1
 # for autotools only
 	select HOST_GETTEXT
 	prompt "rrdtool                       "
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 04/10] rrdtool: make graph functionality optional

[Robert Schwebel]

If we need only the rrd functionality of rrdtool and do graphing
somewhere else, we don't need these dependencies.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/rrdtool.in   | 16 +++++++++++-----
 rules/rrdtool.make |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/rules/rrdtool.in b/rules/rrdtool.in
index 3ae66d7..1249f27 100644
--- a/rules/rrdtool.in
+++ b/rules/rrdtool.in
@@ -3,11 +3,11 @@
 menuconfig RRDTOOL
 	tristate
 	select GLIB
-	select CAIRO
-	select CAIRO_SVG
-	select CAIRO_PDF
-	select CAIRO_PS
-	select PANGO
+	select CAIRO if RRDTOOL_RRD_GRAPH
+	select CAIRO_SVG if RRDTOOL_RRD_GRAPH
+	select CAIRO_PDF if RRDTOOL_RRD_GRAPH
+	select CAIRO_PS if RRDTOOL_RRD_GRAPH
+	select PANGO if RRDTOOL_RRD_GRAPH
 	select LIBXML2
 	select LIBXML2_SAX1
 # for autotools only
@@ -40,6 +40,12 @@ config RRDTOOL_RRDCGI
 	  purpose is to run as a cgi-program and parse a web page
 	  template containing special <RRD:: tags.
 
+config RRDTOOL_RRD_GRAPH
+	bool
+	prompt "install rrd_graph"
+	help
+	  Enable all rrd_graph functions.
+
 config RRDTOOL_RRDTOOL
 	bool
 	prompt "install rrdtool"
diff --git a/rules/rrdtool.make b/rules/rrdtool.make
index a741bfd..5e2714e 100644
--- a/rules/rrdtool.make
+++ b/rules/rrdtool.make
@@ -42,7 +42,7 @@ RRDTOOL_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--enable-silent-rules \
 	--$(call ptx/endis, PTXCONF_RRDTOOL_RRDCGI)-rrdcgi \
-	--disable-rrd_graph \
+	--$(call ptx/endis, PTXCONF_RRDTOOL_RRD_GRAPH)-rrd_graph \
 	--enable-mmap \
 	--enable-pthread \
 	--disable-static-programs \
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 05/10] rrdtool: install multithreaded library

[Robert Schwebel]

This was previously only installed for rrdcached, but this is wrong.
rrdcached needs the lib, but other tools that use librrd_th might also
need it (i.e. collectd).

The library is small, so we install it unconditionally.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/rrdtool.make | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rules/rrdtool.make b/rules/rrdtool.make
index 5e2714e..51f794e 100644
--- a/rules/rrdtool.make
+++ b/rules/rrdtool.make
@@ -89,9 +89,7 @@ ifdef PTXCONF_RRDTOOL_RRDUPDATE
 endif
 
 	@$(call install_lib, rrdtool, 0, 0, 0644, librrd)
-ifdef PTXCONF_RRDTOOL_RRDCACHED
 	@$(call install_lib, rrdtool, 0, 0, 0644, librrd_th)
-endif
 
 	@$(call install_finish, rrdtool)
 
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 06/10] collectd: add base functionality

[Robert Schwebel]

This adds collectd, without any further plugin support so far.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 generic/etc/collectd.conf                   |  46 +++++++
 generic/lib/systemd/system/collectd.service |  15 +++
 rules/collectd.in                           |  10 ++
 rules/collectd.make                         | 202 ++++++++++++++++++++++++++++
 4 files changed, 273 insertions(+)
 create mode 100644 generic/etc/collectd.conf
 create mode 100644 generic/lib/systemd/system/collectd.service
 create mode 100644 rules/collectd.in
 create mode 100644 rules/collectd.make

diff --git a/generic/etc/collectd.conf b/generic/etc/collectd.conf
new file mode 100644
index 0000000..400ff6d
--- /dev/null
+++ b/generic/etc/collectd.conf
@@ -0,0 +1,46 @@
+#
+# Config file for collectd(1).
+# Please read collectd.conf(5) for a list of options.
+# http://collectd.org/
+#
+
+##############################################################################
+# Global                                                                     #
+#----------------------------------------------------------------------------#
+# Global settings for the daemon.                                            #
+##############################################################################
+
+Hostname    "localhost"
+FQDNLookup  true
+BaseDir     "/var/lib/collectd"
+PIDFile     "/var/run/collectd.pid"
+PluginDir   "/usr/lib/collectd"
+TypesDB     "/usr/share/collectd/types.db"
+
+#----------------------------------------------------------------------------#
+# When enabled, plugins are loaded automatically with the default options    #
+# when an appropriate <Plugin ...> block is encountered.                     #
+# Disabled by default.                                                       #
+#----------------------------------------------------------------------------#
+AutoLoadPlugin false
+
+#----------------------------------------------------------------------------#
+# Interval at which to query values. This may be overwritten on a per-plugin #
+# base by using the 'Interval' option of the LoadPlugin block:               #
+#   <LoadPlugin foo>                                                         #
+#       Interval 60                                                          #
+#   </LoadPlugin>                                                            #
+#----------------------------------------------------------------------------#
+Interval     10
+
+Timeout      2
+ReadThreads  2
+WriteThreads 2
+
+# Limit the size of the write queue. Default is no limit. Setting up a limit is
+# recommended for servers handling a high volume of traffic.
+#WriteQueueLimitHigh 1000000
+#WriteQueueLimitLow   800000
+
+Include "/etc/collectd.d/*.conf"
+
diff --git a/generic/lib/systemd/system/collectd.service b/generic/lib/systemd/system/collectd.service
new file mode 100644
index 0000000..53eb5db
--- /dev/null
+++ b/generic/lib/systemd/system/collectd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=statistics collection daemon
+Documentation=man:collectd(1)
+After=local-fs.target network.target
+Requires=local-fs.target network.target
+
+[Service]
+ExecStart=/usr/sbin/collectd -C /etc/collectd.conf -f
+Restart=always
+RestartSec=10
+StandardOutput=syslog
+StandardError=syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/rules/collectd.in b/rules/collectd.in
new file mode 100644
index 0000000..c5a29d0
--- /dev/null
+++ b/rules/collectd.in
@@ -0,0 +1,10 @@
+## SECTION=shell_and_console
+
+menuconfig COLLECTD
+	tristate
+	prompt "collectd                      "
+	help
+	  collectd is a daemon which collects system performance statistics
+	  periodically and provides mechanisms to store the values in a
+	  variety of ways, for example in RRD files.
+
diff --git a/rules/collectd.make b/rules/collectd.make
new file mode 100644
index 0000000..e2268ae
--- /dev/null
+++ b/rules/collectd.make
@@ -0,0 +1,202 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Markus Pargmann <mpa@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_COLLECTD) += collectd
+
+#
+# Paths and names
+#
+COLLECTD_VERSION	:= 5.4.1
+COLLECTD		:= collectd-$(COLLECTD_VERSION)
+COLLECTD_SUFFIX		:= tar.bz2
+COLLECTD_URL		:= http://collectd.org/files/${COLLECTD}.${COLLECTD_SUFFIX}
+COLLECTD_MD5		:= 6f56c71c96573a7f4f7fb3bfab185974
+COLLECTD_DIR		:= $(BUILDDIR)/$(COLLECTD)
+COLLECTD_SOURCE		:= $(SRCDIR)/$(COLLECTD).$(COLLECTD_SUFFIX)
+COLLECTD_LICENSE	:= GPL2
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+COLLECTD_CONF_TOOL	:= autoconf
+COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
+	--enable-largefile \
+	--disable-standards \
+	--disable-glibtest \
+	--disable-debug \
+	--enable-daemon \
+	--disable-getifaddrs \
+	--disable-all-plugins \
+	--with-included-ltdl \
+	--with-nan-emulation \
+	--with-fp-layout=nothing \
+	\
+	--disable-aggregation \
+	--disable-amqp \
+	--disable-apache \
+	--disable-apcups \
+	--disable-apple_sensors \
+	--disable-aquaero \
+	--disable-ascent \
+	--disable-battery \
+	--disable-bind \
+	--disable-conntrack \
+	--disable-contextswitch \
+	--disable-cpufreq \
+	--disable-cpu \
+	--disable-csv \
+	--disable-curl \
+	--disable-curl_json \
+	--disable-curl_xml \
+	--disable-cgroups \
+	--disable-dbi \
+	--disable-df \
+	--disable-disk \
+	--disable-dns \
+	--disable-email \
+	--disable-entropy \
+	--disable-ethstat \
+	--disable-exec \
+	--disable-filecount \
+	--disable-fscache \
+	--disable-gmond \
+	--disable-hddtemp \
+	--disable-interface \
+	--disable-ipmi \
+	--disable-iptables \
+	--disable-ipvs \
+	--disable-irq \
+	--disable-java \
+	--disable-libvirt \
+	--disable-load \
+	--disable-logfile \
+	--disable-lpar \
+	--disable-lvm \
+	--disable-madwifi \
+	--disable-match_empty_counter \
+	--disable-match_hashed \
+	--disable-match_regex \
+	--disable-match_timediff \
+	--disable-match_value \
+	--disable-mbmon \
+	--disable-md \
+	--disable-memcachec \
+	--disable-memcached \
+	--disable-memory \
+	--disable-mic \
+	--disable-modbus \
+	--disable-multimeter \
+	--disable-mysql \
+	--disable-netapp \
+	--disable-netlink \
+	--disable-network \
+	--disable-nfs \
+	--disable-nginx \
+	--disable-notify_desktop \
+	--disable-notify_email \
+	--disable-ntpd \
+	--disable-numa \
+	--disable-nut \
+	--disable-olsrd \
+	--disable-onewire \
+	--disable-openvpn \
+	--disable-oracle \
+	--disable-perl \
+	--disable-pf \
+	--disable-pinba \
+	--disable-ping \
+	--disable-postgresql \
+	--disable-powerdns \
+	--disable-processes \
+	--disable-protocols \
+	--disable-python \
+	--disable-redis \
+	--disable-routeros \
+	--disable-rrdcached \
+	--disable-rrdtool \
+	--disable-sensors \
+	--disable-serial \
+	--disable-sigrok \
+	--disable-snmp \
+	--disable-statsd \
+	--disable-swap \
+	--disable-syslog \
+	--disable-table \
+	--disable-tail \
+	--disable-tail_csv \
+	--disable-tape \
+	--disable-target_notification \
+	--disable-target_replace \
+	--disable-target_scale \
+	--disable-target_set \
+	--disable-target_v5upgrade \
+	--disable-tcpconns \
+	--disable-teamspeak2 \
+	--disable-ted \
+	--disable-thermal \
+	--disable-threshold \
+	--disable-tokyotyrant \
+	--disable-unixsock \
+	--disable-uptime \
+	--disable-users \
+	--disable-uuid \
+	--disable-varnish \
+	--disable-vmem \
+	--disable-vserver \
+	--disable-wireless \
+	--disable-write_graphite \
+	--disable-write_http \
+	--disable-write_mongodb \
+	--disable-write_redis \
+	--disable-write_riemann \
+	--disable-xmms \
+	--disable-zfs_arc
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/collectd.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, collectd)
+	@$(call install_fixup, collectd, PRIORITY, optional)
+	@$(call install_fixup, collectd, SECTION, base)
+	@$(call install_fixup, collectd, AUTHOR, "Markus Pargmann <mpa@pengutronix.de>")
+	@$(call install_fixup, collectd, DESCRIPTION, missing)
+
+#	# base files + directories
+	@$(call install_lib, collectd, 0, 0, 0644, libcollectdclient)
+	@$(call install_copy, collectd, 0, 0, 0755, -, /usr/sbin/collectd)
+	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.conf)
+	@$(call install_copy, collectd, 0, 0, 0644, /etc/collectd)
+	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/share/collectd/types.db)
+	@$(call install_copy, collectd, 0, 0, 0755, /usr/lib/collectd)
+
+
+ifdef PTXCONF_INITMETHOD_SYSTEMD
+	@$(call install_alternative, collectd, 0, 0, 0644, /lib/systemd/system/collectd.service)
+	@$(call install_link, collectd, \
+		/lib/systemd/system/collectd.service, \
+		/etc/systemd/system/multi-user.target.wants/collectd.service \
+	)
+endif
+	@$(call install_finish, collectd)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 07/10] collectd: add support for rrdtool plugin

[Robert Schwebel]

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 generic/etc/collectd.d/rrdtool.conf | 10 ++++++++++
 rules/collectd.in                   | 13 +++++++++++++
 rules/collectd.make                 | 10 +++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 generic/etc/collectd.d/rrdtool.conf

diff --git a/generic/etc/collectd.d/rrdtool.conf b/generic/etc/collectd.d/rrdtool.conf
new file mode 100644
index 0000000..1f1190e
--- /dev/null
+++ b/generic/etc/collectd.d/rrdtool.conf
@@ -0,0 +1,10 @@
+LoadPlugin rrdtool
+
+<Plugin rrdtool>
+  DataDir "/var/lib/collectd/rrd"
+  CreateFilesAsync false
+  CacheTimeout 120
+  CacheFlush 900
+  WritesPerSecond 50
+</Plugin>
+
diff --git a/rules/collectd.in b/rules/collectd.in
index c5a29d0..7d2d090 100644
--- a/rules/collectd.in
+++ b/rules/collectd.in
@@ -2,9 +2,22 @@
 
 menuconfig COLLECTD
 	tristate
+	select RRDTOOL if COLLECTD_RRDTOOL
 	prompt "collectd                      "
 	help
 	  collectd is a daemon which collects system performance statistics
 	  periodically and provides mechanisms to store the values in a
 	  variety of ways, for example in RRD files.
 
+if COLLECTD
+
+comment "Write Plugins"
+
+config COLLECTD_RRDTOOL
+	bool
+	prompt "rrdtool"
+	help
+	  With the RRDtool plugin, collectd writes values into a
+	  round-robin database, using librrd.
+
+endif
diff --git a/rules/collectd.make b/rules/collectd.make
index e2268ae..ed5b5c5 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -127,7 +127,7 @@ COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-redis \
 	--disable-routeros \
 	--disable-rrdcached \
-	--disable-rrdtool \
+	--$(call ptx/endis, PTXCONF_COLLECTD_RRDTOOL)-rrdtool \
 	--disable-sensors \
 	--disable-serial \
 	--disable-sigrok \
@@ -195,6 +195,14 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD
 		/etc/systemd/system/multi-user.target.wants/collectd.service \
 	)
 endif
+
+	# Plugins
+
+ifdef PTXCONF_COLLECTD_RRDTOOL
+	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/lib/collectd/rrdtool.so)
+	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/rrdtool.conf)
+endif
+
 	@$(call install_finish, collectd)
 
 	@$(call touch)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 08/10] collectd: add support for syslog plugin

[Robert Schwebel]

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 generic/etc/collectd.d/syslog.conf | 6 ++++++
 rules/collectd.in                  | 8 ++++++++
 rules/collectd.make                | 7 ++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 generic/etc/collectd.d/syslog.conf

diff --git a/generic/etc/collectd.d/syslog.conf b/generic/etc/collectd.d/syslog.conf
new file mode 100644
index 0000000..bd78ae0
--- /dev/null
+++ b/generic/etc/collectd.d/syslog.conf
@@ -0,0 +1,6 @@
+LoadPlugin syslog
+
+<Plugin syslog>
+  LogLevel info
+</Plugin>
+
diff --git a/rules/collectd.in b/rules/collectd.in
index 7d2d090..a93fc56 100644
--- a/rules/collectd.in
+++ b/rules/collectd.in
@@ -11,6 +11,14 @@ menuconfig COLLECTD
 
 if COLLECTD
 
+comment "Logging Plugins"
+
+config COLLECTD_SYSLOG
+	bool
+	prompt "syslog"
+	help
+	  Syslog support for collectd.
+
 comment "Write Plugins"
 
 config COLLECTD_RRDTOOL
diff --git a/rules/collectd.make b/rules/collectd.make
index ed5b5c5..6b90bb7 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -134,7 +134,7 @@ COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-snmp \
 	--disable-statsd \
 	--disable-swap \
-	--disable-syslog \
+	--$(call ptx/endis, PTXCONF_COLLECTD_SYSLOG)-syslog \
 	--disable-table \
 	--disable-tail \
 	--disable-tail_csv \
@@ -203,6 +203,11 @@ ifdef PTXCONF_COLLECTD_RRDTOOL
 	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/rrdtool.conf)
 endif
 
+ifdef PTXCONF_COLLECTD_SYSLOG
+	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/lib/collectd/syslog.so)
+	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/syslog.conf)
+endif
+
 	@$(call install_finish, collectd)
 
 	@$(call touch)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 09/10] collectd: add support for cpu plugin

[Robert Schwebel]

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 generic/etc/collectd.d/cpu.conf | 1 +
 rules/collectd.in               | 9 +++++++++
 rules/collectd.make             | 7 ++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 generic/etc/collectd.d/cpu.conf

diff --git a/generic/etc/collectd.d/cpu.conf b/generic/etc/collectd.d/cpu.conf
new file mode 100644
index 0000000..30fcc38
--- /dev/null
+++ b/generic/etc/collectd.d/cpu.conf
@@ -0,0 +1 @@
+LoadPlugin cpu
diff --git a/rules/collectd.in b/rules/collectd.in
index a93fc56..1039c21 100644
--- a/rules/collectd.in
+++ b/rules/collectd.in
@@ -28,4 +28,13 @@ config COLLECTD_RRDTOOL
 	  With the RRDtool plugin, collectd writes values into a
 	  round-robin database, using librrd.
 
+comment "Read Plugins"
+
+config COLLECTD_CPU
+	bool
+	prompt "cpu"
+	help
+	  The CPU plugin collects data about what your CPU is actually doing,
+	  and if it is being idle or in the various states.
+
 endif
diff --git a/rules/collectd.make b/rules/collectd.make
index 6b90bb7..cc2715c 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -57,7 +57,7 @@ COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-conntrack \
 	--disable-contextswitch \
 	--disable-cpufreq \
-	--disable-cpu \
+	--$(call ptx/endis, PTXCONF_COLLECTD_CPU)-cpu \
 	--disable-csv \
 	--disable-curl \
 	--disable-curl_json \
@@ -198,6 +198,11 @@ endif
 
 	# Plugins
 
+ifdef PTXCONF_COLLECTD_CPU
+	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/lib/collectd/cpu.so)
+	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/cpu.conf)
+endif
+
 ifdef PTXCONF_COLLECTD_RRDTOOL
 	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/lib/collectd/rrdtool.so)
 	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/rrdtool.conf)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 10/10] collectd: add support for logfile plugin

[Robert Schwebel]

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 generic/etc/collectd.d/logfile.conf | 9 +++++++++
 rules/collectd.in                   | 6 ++++++
 rules/collectd.make                 | 7 ++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 generic/etc/collectd.d/logfile.conf

diff --git a/generic/etc/collectd.d/logfile.conf b/generic/etc/collectd.d/logfile.conf
new file mode 100644
index 0000000..2c7549b
--- /dev/null
+++ b/generic/etc/collectd.d/logfile.conf
@@ -0,0 +1,9 @@
+LoadPlugin logfile
+
+<Plugin logfile>
+  LogLevel info
+  File "/var/log/collectd.log"
+  Timestamp true
+  PrintSeverity false
+</Plugin>
+
diff --git a/rules/collectd.in b/rules/collectd.in
index 1039c21..bff2cb5 100644
--- a/rules/collectd.in
+++ b/rules/collectd.in
@@ -13,6 +13,12 @@ if COLLECTD
 
 comment "Logging Plugins"
 
+config COLLECTD_LOGFILE
+	bool
+	prompt "logfile"
+	help
+	  logfile support for collectd.
+
 config COLLECTD_SYSLOG
 	bool
 	prompt "syslog"
diff --git a/rules/collectd.make b/rules/collectd.make
index cc2715c..00c75d4 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -83,7 +83,7 @@ COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-java \
 	--disable-libvirt \
 	--disable-load \
-	--disable-logfile \
+	--$(call ptx/endis, PTXCONF_COLLECTD_LOGFILE)-logfile \
 	--disable-lpar \
 	--disable-lvm \
 	--disable-madwifi \
@@ -203,6 +203,11 @@ ifdef PTXCONF_COLLECTD_CPU
 	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/cpu.conf)
 endif
 
+ifdef PTXCONF_COLLECTD_LOGFILE
+	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/lib/collectd/logfile.so)
+	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/logfile.conf)
+endif
+
 ifdef PTXCONF_COLLECTD_RRDTOOL
 	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/lib/collectd/rrdtool.so)
 	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/rrdtool.conf)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 02/10] rrdtool: audit configure options

[Michael Olbrich]

On Sun, Jan 25, 2015 at 01:37:18AM +0100, Robert Schwebel wrote:
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  rules/rrdtool.make | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/rrdtool.make b/rules/rrdtool.make
> index 7e458ed..a741bfd 100644
> --- a/rules/rrdtool.make
> +++ b/rules/rrdtool.make
> @@ -40,13 +40,12 @@ RRDTOOL_CONF_ENV	:= \
>  RRDTOOL_CONF_TOOL	:= autoconf
>  RRDTOOL_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> +	--enable-silent-rules \

This is not needed. We default to silent with environment variables unless
'-v' is use as ptxdist option.

Michael

>  	--$(call ptx/endis, PTXCONF_RRDTOOL_RRDCGI)-rrdcgi \
> +	--disable-rrd_graph \
>  	--enable-mmap \
>  	--enable-pthread \
>  	--disable-static-programs \
> -	--enable-shared \
> -	--disable-static \
> -	--enable-fast-install \
>  	--disable-nls \
>  	--disable-rpath \
>  	--disable-libdbi \
> -- 
> 2.1.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 03/10] rrdtool: fix libxml2 handling

[Michael Olbrich]

On Sun, Jan 25, 2015 at 01:37:19AM +0100, Robert Schwebel wrote:
> The configure script searches for the libxml2 headers in /usr/include,
> so we remove the hardcoded path here.
> 
> The check is searching for xmlParseFile, which is part of the SAX2 API.
> This means we need to enable the feature in libxml2.
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  ...c-don-t-specify-hardcoded-include-search-.patch | 27 ++++++++++++++++++++++
>  patches/rrdtool-1.4.9/autogen.sh                   |  1 +
>  patches/rrdtool-1.4.9/series                       |  4 ++++
>  rules/rrdtool.in                                   |  1 +
>  4 files changed, 33 insertions(+)
>  create mode 100644 patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
>  create mode 120000 patches/rrdtool-1.4.9/autogen.sh
>  create mode 100644 patches/rrdtool-1.4.9/series
> 
> diff --git a/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch b/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
> new file mode 100644
> index 0000000..476309e
> --- /dev/null
> +++ b/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
> @@ -0,0 +1,27 @@
> +From: Robert Schwebel <r.schwebel@pengutronix.de>
> +Date: Sat, 24 Jan 2015 20:57:27 +0100
> +Subject: [PATCH] configure.ac: don't specify hardcoded include search path
> +
> +If we crosscompile rrdtool or packetize for a distribution, libxml2
> +headers may be installed in a SYSROOT/DESTDIR directory, not in
> +/usr/include. For the cross compile usecase, this leaks a host header
> +file in.
> +
> +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 9e934595b102..793e02874d4b 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -540,7 +540,7 @@ EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,
> + EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.10.2,  http://cairographics.org/releases/, "")
> + EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
> + fi
> +-EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, /usr/include/libxml2)
> ++EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, "")

m4 uses [] for empty arguments.

Michael

> + 
> + if test "$EX_CHECK_ALL_ERR" = "YES"; then
> +   AC_MSG_ERROR([Please fix the library issues listed above and try again.])
> diff --git a/patches/rrdtool-1.4.9/autogen.sh b/patches/rrdtool-1.4.9/autogen.sh
> new file mode 120000
> index 0000000..9f8a4cb
> --- /dev/null
> +++ b/patches/rrdtool-1.4.9/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/patches/rrdtool-1.4.9/series b/patches/rrdtool-1.4.9/series
> new file mode 100644
> index 0000000..8f63465
> --- /dev/null
> +++ b/patches/rrdtool-1.4.9/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
> +# 4f69babc0b922fa5b09478ce957d196a  - git-ptx-patches magic
> diff --git a/rules/rrdtool.in b/rules/rrdtool.in
> index 0e83e66..3ae66d7 100644
> --- a/rules/rrdtool.in
> +++ b/rules/rrdtool.in
> @@ -9,6 +9,7 @@ menuconfig RRDTOOL
>  	select CAIRO_PS
>  	select PANGO
>  	select LIBXML2
> +	select LIBXML2_SAX1
>  # for autotools only
>  	select HOST_GETTEXT
>  	prompt "rrdtool                       "
> -- 
> 2.1.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 04/10] rrdtool: make graph functionality optional

[Michael Olbrich]

On Sun, Jan 25, 2015 at 01:37:20AM +0100, Robert Schwebel wrote:
> If we need only the rrd functionality of rrdtool and do graphing
> somewhere else, we don't need these dependencies.
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  rules/rrdtool.in   | 16 +++++++++++-----
>  rules/rrdtool.make |  2 +-
>  2 files changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/rules/rrdtool.in b/rules/rrdtool.in
> index 3ae66d7..1249f27 100644
> --- a/rules/rrdtool.in
> +++ b/rules/rrdtool.in
> @@ -3,11 +3,11 @@
>  menuconfig RRDTOOL
>  	tristate
>  	select GLIB
> -	select CAIRO
> -	select CAIRO_SVG
> -	select CAIRO_PDF
> -	select CAIRO_PS
> -	select PANGO
> +	select CAIRO if RRDTOOL_RRD_GRAPH
> +	select CAIRO_SVG if RRDTOOL_RRD_GRAPH
> +	select CAIRO_PDF if RRDTOOL_RRD_GRAPH
> +	select CAIRO_PS if RRDTOOL_RRD_GRAPH
> +	select PANGO if RRDTOOL_RRD_GRAPH

align the 'if's with tabs.

Michael

>  	select LIBXML2
>  	select LIBXML2_SAX1
>  # for autotools only
> @@ -40,6 +40,12 @@ config RRDTOOL_RRDCGI
>  	  purpose is to run as a cgi-program and parse a web page
>  	  template containing special <RRD:: tags.
>  
> +config RRDTOOL_RRD_GRAPH
> +	bool
> +	prompt "install rrd_graph"
> +	help
> +	  Enable all rrd_graph functions.
> +
>  config RRDTOOL_RRDTOOL
>  	bool
>  	prompt "install rrdtool"
> diff --git a/rules/rrdtool.make b/rules/rrdtool.make
> index a741bfd..5e2714e 100644
> --- a/rules/rrdtool.make
> +++ b/rules/rrdtool.make
> @@ -42,7 +42,7 @@ RRDTOOL_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--enable-silent-rules \
>  	--$(call ptx/endis, PTXCONF_RRDTOOL_RRDCGI)-rrdcgi \
> -	--disable-rrd_graph \
> +	--$(call ptx/endis, PTXCONF_RRDTOOL_RRD_GRAPH)-rrd_graph \
>  	--enable-mmap \
>  	--enable-pthread \
>  	--disable-static-programs \
> -- 
> 2.1.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 03/10] rrdtool: fix libxml2 handling

[Uwe Kleine-König]

Halli,

On Mon, Jan 26, 2015 at 04:53:27PM +0100, Michael Olbrich wrote:
> On Sun, Jan 25, 2015 at 01:37:19AM +0100, Robert Schwebel wrote:
> > ++EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, "")
> 
> m4 uses [] for empty arguments.
Or nothing which would allow to drop the comma, too.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 06/10] collectd: add base functionality

[Michael Olbrich]

On Sun, Jan 25, 2015 at 01:37:22AM +0100, Robert Schwebel wrote:
> This adds collectd, without any further plugin support so far.
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  generic/etc/collectd.conf                   |  46 +++++++
>  generic/lib/systemd/system/collectd.service |  15 +++
>  rules/collectd.in                           |  10 ++
>  rules/collectd.make                         | 202 ++++++++++++++++++++++++++++
>  4 files changed, 273 insertions(+)
>  create mode 100644 generic/etc/collectd.conf
>  create mode 100644 generic/lib/systemd/system/collectd.service
>  create mode 100644 rules/collectd.in
>  create mode 100644 rules/collectd.make
> 
> diff --git a/generic/etc/collectd.conf b/generic/etc/collectd.conf
> new file mode 100644
> index 0000000..400ff6d
> --- /dev/null
> +++ b/generic/etc/collectd.conf
> @@ -0,0 +1,46 @@
> +#
> +# Config file for collectd(1).
> +# Please read collectd.conf(5) for a list of options.
> +# http://collectd.org/
> +#
> +
> +##############################################################################
> +# Global                                                                     #
> +#----------------------------------------------------------------------------#
> +# Global settings for the daemon.                                            #
> +##############################################################################
> +
> +Hostname    "localhost"
> +FQDNLookup  true
> +BaseDir     "/var/lib/collectd"
> +PIDFile     "/var/run/collectd.pid"
> +PluginDir   "/usr/lib/collectd"
> +TypesDB     "/usr/share/collectd/types.db"
> +
> +#----------------------------------------------------------------------------#
> +# When enabled, plugins are loaded automatically with the default options    #
> +# when an appropriate <Plugin ...> block is encountered.                     #
> +# Disabled by default.                                                       #
> +#----------------------------------------------------------------------------#
> +AutoLoadPlugin false
> +
> +#----------------------------------------------------------------------------#
> +# Interval at which to query values. This may be overwritten on a per-plugin #
> +# base by using the 'Interval' option of the LoadPlugin block:               #
> +#   <LoadPlugin foo>                                                         #
> +#       Interval 60                                                          #
> +#   </LoadPlugin>                                                            #
> +#----------------------------------------------------------------------------#
> +Interval     10
> +
> +Timeout      2
> +ReadThreads  2
> +WriteThreads 2
> +
> +# Limit the size of the write queue. Default is no limit. Setting up a limit is
> +# recommended for servers handling a high volume of traffic.
> +#WriteQueueLimitHigh 1000000
> +#WriteQueueLimitLow   800000
> +
> +Include "/etc/collectd.d/*.conf"
> +
> diff --git a/generic/lib/systemd/system/collectd.service b/generic/lib/systemd/system/collectd.service
> new file mode 100644
> index 0000000..53eb5db
> --- /dev/null
> +++ b/generic/lib/systemd/system/collectd.service
> @@ -0,0 +1,15 @@
> +[Unit]
> +Description=statistics collection daemon
> +Documentation=man:collectd(1)
> +After=local-fs.target network.target
> +Requires=local-fs.target network.target
> +
> +[Service]
> +ExecStart=/usr/sbin/collectd -C /etc/collectd.conf -f
> +Restart=always
> +RestartSec=10
> +StandardOutput=syslog
> +StandardError=syslog
> +
> +[Install]
> +WantedBy=multi-user.target

This is just a copy from the shipped file, right? Just install it manually
in the install stage and then use install_copy in targetinstall.

> diff --git a/rules/collectd.in b/rules/collectd.in
> new file mode 100644
> index 0000000..c5a29d0
> --- /dev/null
> +++ b/rules/collectd.in
> @@ -0,0 +1,10 @@
> +## SECTION=shell_and_console
> +
> +menuconfig COLLECTD
> +	tristate
> +	prompt "collectd                      "
> +	help
> +	  collectd is a daemon which collects system performance statistics
> +	  periodically and provides mechanisms to store the values in a
> +	  variety of ways, for example in RRD files.
> +
> diff --git a/rules/collectd.make b/rules/collectd.make
> new file mode 100644
> index 0000000..e2268ae
> --- /dev/null
> +++ b/rules/collectd.make
> @@ -0,0 +1,202 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 by Markus Pargmann <mpa@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_COLLECTD) += collectd
> +
> +#
> +# Paths and names
> +#
> +COLLECTD_VERSION	:= 5.4.1
> +COLLECTD		:= collectd-$(COLLECTD_VERSION)
> +COLLECTD_SUFFIX		:= tar.bz2
> +COLLECTD_URL		:= http://collectd.org/files/${COLLECTD}.${COLLECTD_SUFFIX}
> +COLLECTD_MD5		:= 6f56c71c96573a7f4f7fb3bfab185974
> +COLLECTD_DIR		:= $(BUILDDIR)/$(COLLECTD)
> +COLLECTD_SOURCE		:= $(SRCDIR)/$(COLLECTD).$(COLLECTD_SUFFIX)
> +COLLECTD_LICENSE	:= GPL2
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +COLLECTD_CONF_TOOL	:= autoconf
> +COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
> +	--enable-largefile \

	$(GLOBAL_LARGE_FILE_OPTION) \

> +	--disable-standards \
> +	--disable-glibtest \
> +	--disable-debug \
> +	--enable-daemon \
> +	--disable-getifaddrs \
> +	--disable-all-plugins \
> +	--with-included-ltdl \
> +	--with-nan-emulation \
> +	--with-fp-layout=nothing \
> +	\
> +	--disable-aggregation \
> +	--disable-amqp \
> +	--disable-apache \
> +	--disable-apcups \
> +	--disable-apple_sensors \
> +	--disable-aquaero \
> +	--disable-ascent \
> +	--disable-battery \
> +	--disable-bind \
> +	--disable-conntrack \
> +	--disable-contextswitch \
> +	--disable-cpufreq \
> +	--disable-cpu \
> +	--disable-csv \
> +	--disable-curl \
> +	--disable-curl_json \
> +	--disable-curl_xml \
> +	--disable-cgroups \
> +	--disable-dbi \
> +	--disable-df \
> +	--disable-disk \
> +	--disable-dns \
> +	--disable-email \
> +	--disable-entropy \
> +	--disable-ethstat \
> +	--disable-exec \
> +	--disable-filecount \
> +	--disable-fscache \
> +	--disable-gmond \
> +	--disable-hddtemp \
> +	--disable-interface \
> +	--disable-ipmi \
> +	--disable-iptables \
> +	--disable-ipvs \
> +	--disable-irq \
> +	--disable-java \
> +	--disable-libvirt \
> +	--disable-load \
> +	--disable-logfile \
> +	--disable-lpar \
> +	--disable-lvm \
> +	--disable-madwifi \
> +	--disable-match_empty_counter \
> +	--disable-match_hashed \
> +	--disable-match_regex \
> +	--disable-match_timediff \
> +	--disable-match_value \
> +	--disable-mbmon \
> +	--disable-md \
> +	--disable-memcachec \
> +	--disable-memcached \
> +	--disable-memory \
> +	--disable-mic \
> +	--disable-modbus \
> +	--disable-multimeter \
> +	--disable-mysql \
> +	--disable-netapp \
> +	--disable-netlink \
> +	--disable-network \
> +	--disable-nfs \
> +	--disable-nginx \
> +	--disable-notify_desktop \
> +	--disable-notify_email \
> +	--disable-ntpd \
> +	--disable-numa \
> +	--disable-nut \
> +	--disable-olsrd \
> +	--disable-onewire \
> +	--disable-openvpn \
> +	--disable-oracle \
> +	--disable-perl \
> +	--disable-pf \
> +	--disable-pinba \
> +	--disable-ping \
> +	--disable-postgresql \
> +	--disable-powerdns \
> +	--disable-processes \
> +	--disable-protocols \
> +	--disable-python \
> +	--disable-redis \
> +	--disable-routeros \
> +	--disable-rrdcached \
> +	--disable-rrdtool \
> +	--disable-sensors \
> +	--disable-serial \
> +	--disable-sigrok \
> +	--disable-snmp \
> +	--disable-statsd \
> +	--disable-swap \
> +	--disable-syslog \
> +	--disable-table \
> +	--disable-tail \
> +	--disable-tail_csv \
> +	--disable-tape \
> +	--disable-target_notification \
> +	--disable-target_replace \
> +	--disable-target_scale \
> +	--disable-target_set \
> +	--disable-target_v5upgrade \
> +	--disable-tcpconns \
> +	--disable-teamspeak2 \
> +	--disable-ted \
> +	--disable-thermal \
> +	--disable-threshold \
> +	--disable-tokyotyrant \
> +	--disable-unixsock \
> +	--disable-uptime \
> +	--disable-users \
> +	--disable-uuid \
> +	--disable-varnish \
> +	--disable-vmem \
> +	--disable-vserver \
> +	--disable-wireless \
> +	--disable-write_graphite \
> +	--disable-write_http \
> +	--disable-write_mongodb \
> +	--disable-write_redis \
> +	--disable-write_riemann \
> +	--disable-xmms \
> +	--disable-zfs_arc

	\
	--without-perl-bindings

> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/collectd.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, collectd)
> +	@$(call install_fixup, collectd, PRIORITY, optional)
> +	@$(call install_fixup, collectd, SECTION, base)
> +	@$(call install_fixup, collectd, AUTHOR, "Markus Pargmann <mpa@pengutronix.de>")
> +	@$(call install_fixup, collectd, DESCRIPTION, missing)
> +
> +#	# base files + directories
> +	@$(call install_lib, collectd, 0, 0, 0644, libcollectdclient)
> +	@$(call install_copy, collectd, 0, 0, 0755, -, /usr/sbin/collectd)
> +	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.conf)
> +	@$(call install_copy, collectd, 0, 0, 0644, /etc/collectd)
> +	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/share/collectd/types.db)
> +	@$(call install_copy, collectd, 0, 0, 0755, /usr/lib/collectd)
> +
> +
> +ifdef PTXCONF_INITMETHOD_SYSTEMD
> +	@$(call install_alternative, collectd, 0, 0, 0644, /lib/systemd/system/collectd.service)
> +	@$(call install_link, collectd, \
> +		/lib/systemd/system/collectd.service, \

		../collectd.service, \

Michael

> +		/etc/systemd/system/multi-user.target.wants/collectd.service \
> +	)
> +endif
> +	@$(call install_finish, collectd)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.1.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 06/10] collectd: add base functionality

[Robert Schwebel]

On Tue, Jan 27, 2015 at 08:31:42AM +0100, Michael Olbrich wrote:
> > diff --git a/generic/lib/systemd/system/collectd.service b/generic/lib/systemd/system/collectd.service
> > new file mode 100644
> > index 0000000..53eb5db
> > --- /dev/null
> > +++ b/generic/lib/systemd/system/collectd.service
> > @@ -0,0 +1,15 @@
> > +[Unit]
> > +Description=statistics collection daemon
> > +Documentation=man:collectd(1)
> > +After=local-fs.target network.target
> > +Requires=local-fs.target network.target
> > +
> > +[Service]
> > +ExecStart=/usr/sbin/collectd -C /etc/collectd.conf -f
> > +Restart=always
> > +RestartSec=10
> > +StandardOutput=syslog
> > +StandardError=syslog
> > +
> > +[Install]
> > +WantedBy=multi-user.target
> 
> This is just a copy from the shipped file, right? Just install it manually
> in the install stage and then use install_copy in targetinstall.

It's modified to use the standard location for the config file.

rsc
-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 06/10] collectd: add base functionality

[Michael Olbrich]

Hi,

> > This is just a copy from the shipped file, right? Just install it manually
> > in the install stage and then use install_copy in targetinstall.
> 
> It's modified to use the standard location for the config file.

In that case, we should clean it up:

On Tue, Jan 27, 2015 at 11:01:59AM +0100, Robert Schwebel wrote:
> On Tue, Jan 27, 2015 at 08:31:42AM +0100, Michael Olbrich wrote:
> > > diff --git a/generic/lib/systemd/system/collectd.service b/generic/lib/systemd/system/collectd.service
> > > new file mode 100644
> > > index 0000000..53eb5db
> > > --- /dev/null
> > > +++ b/generic/lib/systemd/system/collectd.service
> > > @@ -0,0 +1,15 @@
> > > +[Unit]
> > > +Description=statistics collection daemon
> > > +Documentation=man:collectd(1)
> > > +After=local-fs.target network.target
> > > +Requires=local-fs.target network.target

local-fs.target is already the default, so that can be dropped.
network.target is rarely what you want. What kind of network requirements
does collectd have?

> > > +
> > > +[Service]
> > > +ExecStart=/usr/sbin/collectd -C /etc/collectd.conf -f

drop the config file, it it's the default.

> > > +Restart=always

> > > +RestartSec=10

I don't see a reason to wait 10 seconds. The default should be ok.

> > > +StandardOutput=syslog
> > > +StandardError=syslog

syslog will just be forwarded to the journal, so this can be dropped.

Michael

> > > +
> > > +[Install]
> > > +WantedBy=multi-user.target
> > 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de