[oe] [meta-oe][PATCH V2 1/1] syslog-ng: fix build without json

Peter Kjellerstedt peter.kjellerstedt at axis.com
Tue Jun 19 12:08:11 UTC 2018


> -----Original Message-----
> From: openembedded-devel-bounces at lists.openembedded.org
> [mailto:openembedded-devel-bounces at lists.openembedded.org] On Behalf Of
> Andre McCurdy
> Sent: den 15 juni 2018 21:04
> To: Joe Slater <joe.slater at windriver.com>
> Cc: openembeded-devel <openembedded-devel at lists.openembedded.org>
> Subject: Re: [oe] [meta-oe][PATCH V2 1/1] syslog-ng: fix build without
> json
> 
> On Fri, Jun 15, 2018 at 11:21 AM, Joe Slater <joe.slater at windriver.com>
> wrote:
> > Remove configurations requiring json from target.
> >
> > Signed-off-by: Joe Slater <joe.slater at windriver.com>
> > ---
> >  meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 7 +++++++
> >  1 file changed, 7 insertions(+)
> >
> > diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-
> oe/recipes-support/syslog-ng/syslog-ng.inc
> > index cb7ca31..6c5adbd 100644
> > --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
> > +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
> > @@ -85,6 +85,13 @@ do_install_append() {
> >      install -d ${D}/${localstatedir}/lib/${BPN}
> >      # Remove /var/run as it is created on startup
> >      rm -rf ${D}${localstatedir}/run
> > +
> > +    # If json is not supported, remove certain conf files.
> > +    if ${@bb.utils.contains('PACKAGECONFIG','json','false','true',d)} ; then
> 
> Inverting the result of bb.utils.contains() by swapping true and false
> makes this a little difficult to read. Perhaps this would be clearer:
> 
>   if ! ${@bb.utils.contains('PACKAGECONFIG','json','true','false',d)} ; then
> 
> ?

Alternatively you can write:

    if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'json', d)}" ]; then

> > +        for f in loggly logmatic cim elasticsearch ; do
> > +            rm -rf ${D}${datadir}/${BPN}/include/scl/$f
> > +        done
> > +    fi
> >  }
> >
> >  FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools"
> > --
> > 2.7.4

//Peter




More information about the Openembedded-devel mailing list