[meta-oe][PATCH v2 0/3] collectd: three fixes

[meta-oe][PATCH v2 0/3] collectd: three fixes

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

v2 comment:
"collectd: explicitly enable/disable libsensors support":
changed the config option to be a PACKAGECONFIG option

---
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_1
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_collectd_1

Ming Liu (1):
  collectd: explicitly enable/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    |    6 ++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

-- 
1.7.9.5

[meta-oe][PATCH v2 1/3] collectd: enable/disable libpq explicitly

[jackie.huang]

From: Wenzong Fan <wenzong.fan@windriver.com>

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.

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../recipes-extended/collectd/collectd_5.2.2.bb    |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
index 25be1c4..4eed2b6 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
@@ -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

[meta-oe][PATCH v2 2/3] collectd: fix init status

[jackie.huang]

From: Wenzong Fan <wenzong.fan@windriver.com>

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

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../collectd/collectd/collectd.init                |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd.init b/meta-oe/recipes-extended/collectd/collectd/collectd.init
index abdb194..95f5f73 100644
--- a/meta-oe/recipes-extended/collectd/collectd/collectd.init
+++ b/meta-oe/recipes-extended/collectd/collectd/collectd.init
@@ -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

[meta-oe][PATCH v2 3/3] collectd: explicitly enable/disable libsensors support

[jackie.huang]

From: Ming Liu <ming.liu@windriver.com>

To avoid an implicit build result.

Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../recipes-extended/collectd/collectd_5.2.2.bb    |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
index 4eed2b6..7cb41b9 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
@@ -28,7 +28,8 @@ PACKAGECONFIG[postgresql] = "--enable-postgresql --with-libpq=yes, \
 PACKAGECONFIG[dbi] = "--enable-dbi,--disable-dbi,libdbi"
 PACKAGECONFIG[modbus] = "--enable-modbus,--disable-modbus,libmodbus"
 PACKAGECONFIG[libowcapi] = "--with-libowcapi,--without-libowcapi,owfs"
-PACKAGECONFIG[sensors] = "--enable-sensors,--disable-sensors,lmsensors"
+PACKAGECONFIG[sensors] = "--enable-sensors --with-libsensors=yes, \
+        --disable-sensors --with-libsensors=no,lmsensors"
 
 EXTRA_OECONF = " \
                 ${FPLAYOUT} \
-- 
1.7.9.5

Re: [meta-oe][PATCH v2 0/3] collectd: three fixes

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1976 bytes --]

On Tue, Apr 08, 2014 at 05:07:47PM +0800, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> v2 comment:
> "collectd: explicitly enable/disable libsensors support":
> changed the config option to be a PACKAGECONFIG option

I'm going to merge all 3, but can you add load.so, disk.so,
threshold.so to PRIVATE_LIBS to hide following warnings?

log.world.20140418_190059.log/bitbake.log:WARNING: gegl-0.2.0 was
registered as shlib provider for load.so, changing it to collectd-5.2.2
because it was built later
log.world.20140418_190059.log/bitbake.log:WARNING:
libgphoto2-camlibs-2.4.11 was registered as shlib provider for disk.so,
changing it to collectd-5.2.2 because it was built later
log.world.20140418_190059.log/bitbake.log:WARNING: gegl-0.2.0 was
registered as shlib provider for threshold.so, changing it to
collectd-5.2.2 because it was built later

> 
> ---
> 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_1
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_collectd_1
> 
> Ming Liu (1):
>   collectd: explicitly enable/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    |    6 ++++--
>  2 files changed, 16 insertions(+), 3 deletions(-)
> 
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe][PATCH v2 0/3] collectd: three fixes

[Huang, Jie (Jackie)]

> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-devel-
> bounces@lists.openembedded.org] On Behalf Of Martin Jansa
> Sent: Sunday, April 20, 2014 5:09 PM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH v2 0/3] collectd: three fixes
> 
> On Tue, Apr 08, 2014 at 05:07:47PM +0800, jackie.huang@windriver.com wrote:
> > From: Jackie Huang <jackie.huang@windriver.com>
> >
> > v2 comment:
> > "collectd: explicitly enable/disable libsensors support":
> > changed the config option to be a PACKAGECONFIG option
> 
> I'm going to merge all 3, but can you add load.so, disk.so, threshold.so to PRIVATE_LIBS to hide
> following warnings?

Sure, I will do that.

Thanks,
Jackie

> 
> log.world.20140418_190059.log/bitbake.log:WARNING: gegl-0.2.0 was registered as shlib provider for
> load.so, changing it to collectd-5.2.2 because it was built later
> log.world.20140418_190059.log/bitbake.log:WARNING:
> libgphoto2-camlibs-2.4.11 was registered as shlib provider for disk.so, changing it to collectd-5.2.2
> because it was built later
> log.world.20140418_190059.log/bitbake.log:WARNING: gegl-0.2.0 was registered as shlib provider for
> threshold.so, changing it to
> collectd-5.2.2 because it was built later
> 
> >
> > ---
> > 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_1
> >
> > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_collec
> > td_1
> >
> > Ming Liu (1):
> >   collectd: explicitly enable/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    |    6 ++++--
> >  2 files changed, 16 insertions(+), 3 deletions(-)
> >
> > --
> > 1.7.9.5
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com