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

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

[Joe Slater]

Remove configurations requiring json from target.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 771cdb1..a5e4e72 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -83,6 +83,11 @@ 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 ${@oe.utils.conditional('PACKAGECONFIG','json','false','true',d)} ; then
+        rm -rf ${D}${datadir}/${BPN}/include/scl/{loggly,logmatic,cim,elasticsearch}
+    fi
 }
 
 FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools"
-- 
2.7.4

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

[Andre McCurdy]

On Wed, May 30, 2018 at 10:18 AM, Joe Slater <joe.slater@windriver.com> wrote:
> Remove configurations requiring json from target.
>
> Signed-off-by: Joe Slater <joe.slater@windriver.com>
> ---
>  meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
> index 771cdb1..a5e4e72 100644
> --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
> +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
> @@ -83,6 +83,11 @@ 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 ${@oe.utils.conditional('PACKAGECONFIG','json','false','true',d)} ; then

oe.utils.conditional() probably isn't the best way to test whether or
not PACKAGECONFIG contains a particular value. Maybe try
bb.utils.contains() instead?

> +        rm -rf ${D}${datadir}/${BPN}/include/scl/{loggly,logmatic,cim,elasticsearch}

This kind of brace expansion is bash specific.

> +    fi
>  }
>
>  FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel