collectd: three fixes

From: Jackie Huang <[email protected]>

---
The following changes since commit bc969d3705c45928de8525ef3d2d9d2867311864:

inetutils: add -dbg packages for tftpd, telnetd and rshd (2014-04-02 11:18:54 -0400)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib jhuang0/r_collectd_0
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_collectd_0

Ming Liu (1):
collectd: explicitly disable libsensors support

Wenzong Fan (2):
collectd: enable/disable libpq explicitly
collectd: fix init status

 .../collectd/collectd/collectd.init                |   13 ++++++++++++-
 .../recipes-extended/collectd/collectd_5.2.2.bb    |    4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

1.7.9.5

From: Wenzong Fan <[email protected]>

If '--with-libpq' is not included in configure options, the configure script will assume 'with-libpq=yes' and try to figure below variables out with 'pg_config':

with_libpq_includedir, with_libpq_libdir

This causes configure QA errors on some hosts that have 'pg_config' installed (which from postgresql-devel):

* ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.

Anyways the target package should not depend on any host headers/libs, we should enable/disable the libpq support explicitly according to if the postgresql feature was enabled.

---
 .../recipes-extended/collectd/collectd_5.2.2.bb    |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index 25be1c4..4eed2b6 100644
@@ -23,7 +23,8 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp --with-libnetsnmp=no,net-snmp"
 PACKAGECONFIG[libmemcached] = "--with-libmemcached,--without-libmemcached,libmemcached"
 PACKAGECONFIG[iptables] = "--enable-iptables,--disable-iptables,iptables"
-PACKAGECONFIG[postgresql] = "--enable-postgresql,--disable-postgresql,postgresql"
+PACKAGECONFIG[postgresql] = "--enable-postgresql --with-libpq=yes, \
+        --disable-postgresql --with-libpq=no,postgresql"
 PACKAGECONFIG[dbi] = "--enable-dbi,--disable-dbi,libdbi"
 PACKAGECONFIG[modbus] = "--enable-modbus,--disable-modbus,libmodbus"
 PACKAGECONFIG[libowcapi] = "--with-libowcapi,--without-libowcapi,owfs"

1.7.9.5

From: Wenzong Fan <[email protected]>

Fix init status to get it works with 'service --status-all'.

---
 .../collectd/collectd/collectd.init                |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

index abdb194..95f5f73 100644
@@ -146,6 +146,17 @@ d_stop() {
 	return "$rc"
 }
 
+# return:
+#   0 if the daemon is running
+#   3 if the daemon is stopped
+d_status(){
+	if test "$USE_COLLECTDMON" == 1; then
+		status $COLLECTDMON_DAEMON
+	else
+		status $DAEMON
+	fi
+}
+
 case "$1" in
 	start)
 		echo -n "Starting $NAME"

@@ -164,7 +175,7 @@ case "$1" in
 		esac
 		;;
 	status)
-		status_of_proc -p "$_PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
+		d_status
 		;;
 	restart|force-reload)
 		echo -n "Restarting $NAME"

1.7.9.5

From: Ming Liu <[email protected]>

To avoid an implicit build result.

---
 .../recipes-extended/collectd/collectd_5.2.2.bb    |    1 +
 1 file changed, 1 insertion(+)

index 4eed2b6..00010c7 100644
@@ -35,6 +35,7 @@ EXTRA_OECONF = " \
                 --disable-perl --with-libperl=no --with-perl-bindings=no \
                 --with-libgcrypt=${STAGING_BINDIR_CROSS}/libgcrypt-config \
                 --disable-notify_desktop \
+                --with-libsensors=no \
 "
 
 do_install_append() {

1.7.9.5

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[email protected] schreef op 08-04-14 09:54:

Should this be a PACKAGECONFIG option?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFTQ7MVMkyGM64RGpERAmj+AJ4rqJPUBZ4FIn97cJQZbe7N+dplBwCeJY3v vw+CKp3dZdL5QvuP/4jReao=
=yGBZ
-----END PGP SIGNATURE-----

Yeah, it make sense, I will change it to be a PACKAGECONFIG option, thanks!

Thanks,
Jackie