[meta-oe][PATCH 0/2] collectd: series of build fixes

[meta-oe][PATCH 0/2] collectd: series of build fixes

[Maciej Borzecki]

This is a series of fixes for collectd that unblock merge of rabbitmq.

The first patch of the series works around the API deprecation on
rabbitmq-c side. Most probabl collectd supports at most rabbitmq-c in
version 0.4.*. It is advisable to update to 0.5.* if no functional
problems are uncovered.

The second patch resolves issues with protobuf-c that is only
available in meta-virtualization.

[meta-oe][PATCH 1/2] collectd: make amqp plugin a selectable feature

[Maciej Borzecki]

The version of rabbitmq-c that collectd is compatible with, is older
than currently available 0.5.0. This results in build errors
triggerred by API deprecation at rabbitmq-c side. Make amqp
plugin a selectable feature, disabled by default.

Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
---
 meta-oe/recipes-extended/collectd/collectd_5.2.2.bb | 2 ++
 1 file changed, 2 insertions(+)

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 6b9b7bd..30279c2 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
@@ -30,6 +30,8 @@ PACKAGECONFIG[modbus] = "--enable-modbus,--disable-modbus,libmodbus"
 PACKAGECONFIG[libowcapi] = "--with-libowcapi,--without-libowcapi,owfs"
 PACKAGECONFIG[sensors] = "--enable-sensors --with-libsensors=yes, \
         --disable-sensors --with-libsensors=no,lmsensors"
+PACKAGECONFIG[amqp] = "--enable-amqp --with-librabbitmq=yes, \
+        --disable-amqp --with-librabbitmq=no,rabbitmq-c"
 
 EXTRA_OECONF = " \
                 ${FPLAYOUT} \
-- 
1.9.0

[meta-oe][PATCH 2/2] collectd: make pinba support a selectable feature

[Maciej Borzecki]

Pinba support requires protobuf-c that is currently only available in
meta-virtualization layer. Make this a selectable feature.

Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
---
 meta-oe/recipes-extended/collectd/collectd_5.2.2.bb | 1 +
 1 file changed, 1 insertion(+)

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 30279c2..837eae5 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
@@ -32,6 +32,7 @@ PACKAGECONFIG[sensors] = "--enable-sensors --with-libsensors=yes, \
         --disable-sensors --with-libsensors=no,lmsensors"
 PACKAGECONFIG[amqp] = "--enable-amqp --with-librabbitmq=yes, \
         --disable-amqp --with-librabbitmq=no,rabbitmq-c"
+PACKAGECONFIG[pinba] = "--enable-pinba,--disable-pinba,protobuf protobuf-native"
 
 EXTRA_OECONF = " \
                 ${FPLAYOUT} \
-- 
1.9.0

Re: [meta-oe][PATCH 2/2] collectd: make pinba support a selectable feature

[Martin Jansa]

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

On Thu, Aug 14, 2014 at 05:31:43PM +0200, Maciej Borzecki wrote:
> Pinba support requires protobuf-c that is currently only available in
> meta-virtualization layer. Make this a selectable feature.

There is some protobuf in meta-oe
meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_2.4.1.bb

is protobuf-c something else?

> Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
> Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
> ---
>  meta-oe/recipes-extended/collectd/collectd_5.2.2.bb | 1 +
>  1 file changed, 1 insertion(+)
> 
> 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 30279c2..837eae5 100644
> --- a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
> +++ b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
> @@ -32,6 +32,7 @@ PACKAGECONFIG[sensors] = "--enable-sensors --with-libsensors=yes, \
>          --disable-sensors --with-libsensors=no,lmsensors"
>  PACKAGECONFIG[amqp] = "--enable-amqp --with-librabbitmq=yes, \
>          --disable-amqp --with-librabbitmq=no,rabbitmq-c"
> +PACKAGECONFIG[pinba] = "--enable-pinba,--disable-pinba,protobuf protobuf-native"
>  
>  EXTRA_OECONF = " \
>                  ${FPLAYOUT} \
> -- 
> 1.9.0
> 
> -- 
> _______________________________________________
> 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: 188 bytes --]

Re: [meta-oe][PATCH 2/2] collectd: make pinba support a selectable feature

[Maciej Borzecki]

On Thursday 14 of August 2014 17:42:20 Martin Jansa wrote:
> On Thu, Aug 14, 2014 at 05:31:43PM +0200, Maciej Borzecki wrote:
> > Pinba support requires protobuf-c that is currently only available in
> > meta-virtualization layer. Make this a selectable feature.
> 
> There is some protobuf in meta-oe
> meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_2.4.1.bb
> 
> is protobuf-c something else?
Yes. protobuf in meta-oe is a tool (protoc) and a C++ library, protobuf-c is a
C implementation of the library.

(sorry if you get multiple copies of this email, kmail got confused with 
multiple email accounts)

> 
> > Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
> > Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
> > ---
> > 
> >  meta-oe/recipes-extended/collectd/collectd_5.2.2.bb | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > 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
> > 30279c2..837eae5 100644
> > --- a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
> > +++ b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
> > @@ -32,6 +32,7 @@ PACKAGECONFIG[sensors] = "--enable-sensors
> > --with-libsensors=yes, \> 
> >          --disable-sensors --with-libsensors=no,lmsensors"
> >  
> >  PACKAGECONFIG[amqp] = "--enable-amqp --with-librabbitmq=yes, \
> >  
> >          --disable-amqp --with-librabbitmq=no,rabbitmq-c"
> > 
> > +PACKAGECONFIG[pinba] = "--enable-pinba,--disable-pinba,protobuf
> > protobuf-native"> 
> >  EXTRA_OECONF = " \
> >  
> >                  ${FPLAYOUT} \

-- 

Maciej Borzęcki 
Senior Software Engineer Open-RnD Sp. z o.o. 
www.open-rnd.pl, Facebook, Twitter 
mobile: +48 telefon, fax: +48 42 657 9079 

Niniejsza wiadomość wraz z załącznikami może zawierać chronione prawem lub 
poufne informacje i została wysłana wyłącznie do wiadomości i użytku osób, do 
których została zaadresowana. Jeśli wiadomość została otrzymana przypadkowo 
zabrania się jej kopiowania lub rozsyłania do osób trzecich. W takim przypadku 
uprasza się o natychmiastowe zniszczenie wiadomości oraz poinformowanie 
nadawcy o zaistniałej sytuacji za pomocą wiadomości zwrotnej. Dziękujemy. 

This message, including any attachments hereto, may contain privileged or 
confidential information and is sent solely for the attention and use of the 
intended addressee(s). If you are not an intended addressee, you may neither 
use this message nor copy or deliver it to anyone. In such case, you should 
immediately destroy this message and kindly notify the sender by reply email. 
Thank you.

Re: [meta-oe][PATCH 2/2] collectd: make pinba support a selectable feature

[Martin Jansa]

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

On Thu, Aug 14, 2014 at 05:45:12PM +0200, Maciej Borzecki wrote:
> On Thursday 14 of August 2014 17:42:20 Martin Jansa wrote:
> > On Thu, Aug 14, 2014 at 05:31:43PM +0200, Maciej Borzecki wrote:
> > > Pinba support requires protobuf-c that is currently only available in
> > > meta-virtualization layer. Make this a selectable feature.
> > 
> > There is some protobuf in meta-oe
> > meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_2.4.1.bb
> > 
> > is protobuf-c something else?
> Yes. protobuf in meta-oe is a tool (protoc) and a C++ library, protobuf-c is a 
> C implementation of the library.

So shouldn't PACKAGECONFIG contain protobuf-c as well?

If yes, then please add comment above PACKAGECONFIG definition that
protobuf-c is in meta-virtualization (so that people don't need to
search commit messages).

Thanks

> > > Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
> > > Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
> > > ---
> > > 
> > >  meta-oe/recipes-extended/collectd/collectd_5.2.2.bb | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > 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
> > > 30279c2..837eae5 100644
> > > --- a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
> > > +++ b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
> > > @@ -32,6 +32,7 @@ PACKAGECONFIG[sensors] = "--enable-sensors
> > > --with-libsensors=yes, \> 
> > >          --disable-sensors --with-libsensors=no,lmsensors"
> > >  
> > >  PACKAGECONFIG[amqp] = "--enable-amqp --with-librabbitmq=yes, \
> > >  
> > >          --disable-amqp --with-librabbitmq=no,rabbitmq-c"
> > > 
> > > +PACKAGECONFIG[pinba] = "--enable-pinba,--disable-pinba,protobuf
> > > protobuf-native"> 
> > >  EXTRA_OECONF = " \
> > >  
> > >                  ${FPLAYOUT} \
> 
> -- 
> Maciek Borzecki <maciek.borzecki@gmail.com>

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

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

Re: [meta-oe][PATCH 2/2] collectd: make pinba support a selectable feature

[Maciej Borzecki]

On Thursday 14 of August 2014 17:50:04 Martin Jansa wrote:
> On Thu, Aug 14, 2014 at 05:45:12PM +0200, Maciej Borzecki wrote:
> > On Thursday 14 of August 2014 17:42:20 Martin Jansa wrote:
> > > On Thu, Aug 14, 2014 at 05:31:43PM +0200, Maciej Borzecki wrote:
> > > > Pinba support requires protobuf-c that is currently only available in
> > > > meta-virtualization layer. Make this a selectable feature.
> > > 
> > > There is some protobuf in meta-oe
> > > meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_2.4.1.bb
> > > 
> > > is protobuf-c something else?
> > 
> > Yes. protobuf in meta-oe is a tool (protoc) and a C++ library, protobuf-c
> > is a C implementation of the library.
> 
> So shouldn't PACKAGECONFIG contain protobuf-c as well?
Indeed, looks like a brain fart on my side :)


> 
> If yes, then please add comment above PACKAGECONFIG definition that
> protobuf-c is in meta-virtualization (so that people don't need to
> search commit messages).
> 
> Thanks
> 
> > > > Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
> > > > Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
> > > > ---
> > > > 
> > > >  meta-oe/recipes-extended/collectd/collectd_5.2.2.bb | 1 +
> > > >  1 file changed, 1 insertion(+)
> > > > 
> > > > 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
> > > > 30279c2..837eae5 100644
> > > > --- a/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
> > > > +++ b/meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
> > > > @@ -32,6 +32,7 @@ PACKAGECONFIG[sensors] = "--enable-sensors
> > > > --with-libsensors=yes, \>
> > > > 
> > > >          --disable-sensors --with-libsensors=no,lmsensors"
> > > >  
> > > >  PACKAGECONFIG[amqp] = "--enable-amqp --with-librabbitmq=yes, \
> > > >  
> > > >          --disable-amqp --with-librabbitmq=no,rabbitmq-c"
> > > > 
> > > > +PACKAGECONFIG[pinba] = "--enable-pinba,--disable-pinba,protobuf
> > > > protobuf-native">
> > > > 
> > > >  EXTRA_OECONF = " \
> > > >  
> > > >                  ${FPLAYOUT} \

-- 

Maciej Borzęcki 
Senior Software Engineer Open-RnD Sp. z o.o. 
www.open-rnd.pl, Facebook, Twitter 
mobile: +48 telefon, fax: +48 42 657 9079 

Niniejsza wiadomość wraz z załącznikami może zawierać chronione prawem lub 
poufne informacje i została wysłana wyłącznie do wiadomości i użytku osób, do 
których została zaadresowana. Jeśli wiadomość została otrzymana przypadkowo 
zabrania się jej kopiowania lub rozsyłania do osób trzecich. W takim przypadku 
uprasza się o natychmiastowe zniszczenie wiadomości oraz poinformowanie 
nadawcy o zaistniałej sytuacji za pomocą wiadomości zwrotnej. Dziękujemy. 

This message, including any attachments hereto, may contain privileged or 
confidential information and is sent solely for the attention and use of the 
intended addressee(s). If you are not an intended addressee, you may neither 
use this message nor copy or deliver it to anyone. In such case, you should 
immediately destroy this message and kindly notify the sender by reply email. 
Thank you.