From 4846b3daa744c81ad45adf55b92681c39abcf068 Mon Sep 17 00:00:00 2001 From: "Slater, Joseph" Date: Mon, 18 Jun 2018 16:36:48 -0700 Subject: syslog-ng: repackage json related conf files Only include conf files that need json if it is enabled when building syslog-ng. Signed-off-by: Joe Slater Signed-off-by: Khem Raj --- meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index a0ae7bd6f6..cf6a3de499 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -93,10 +93,19 @@ do_install_append() { } FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools" -RDEPENDS_${PN} += "gawk" +RDEPENDS_${PN} += "gawk ${@bb.utils.contains('PACKAGECONFIG','json','${PN}-jconf','',d)}" + +FILES_${PN}-jconf += " \ +${datadir}/${BPN}/include/scl/cim \ +${datadir}/${BPN}/include/scl/elasticsearch \ +${datadir}/${BPN}/include/scl/ewmm \ +${datadir}/${BPN}/include/scl/graylog2 \ +${datadir}/${BPN}/include/scl/loggly \ +${datadir}/${BPN}/include/scl/logmatic \ +" # This overcomes the syslog-ng rdepends on syslog-ng-dev QA Error -PACKAGES =+ "${PN}-libs ${PN}-libs-dev ${PN}-libs-dbg" +PACKAGES =+ "${PN}-jconf ${PN}-libs ${PN}-libs-dev ${PN}-libs-dbg" FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" FILES_${PN}-libs-dbg = "${libdir}/${BPN}/.debug" -- cgit 1.2.3-korg