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

Joe Slater joe.slater at windriver.com
Mon Jun 18 18:36:51 UTC 2018


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 a0ae7bd..417e8c6 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -80,6 +80,13 @@ do_install_append() {
     # 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','true','false',d)} ; then
+        for f in cim elasticsearch ewmm graylog2 loggly logmatic ; do
+            rm -rf ${D}${datadir}/${BPN}/include/scl/$f
+        done
+    fi
+
     # support for systemd
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -d ${D}${systemd_unitdir}/system/
-- 
2.7.4




More information about the Openembedded-devel mailing list