aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlater, Joseph <joe.slater@windriver.com>2018-06-18 16:36:48 -0700
committerKhem Raj <raj.khem@gmail.com>2018-06-18 16:43:29 -0700
commit4846b3daa744c81ad45adf55b92681c39abcf068 (patch)
tree6e613d672c1d93be3e01b002c612e442eb8892c2
parent029ad49c25315cc7f05e1e3ec5f494c5e57ce885 (diff)
downloadmeta-openembedded-master-next.zip
meta-openembedded-master-next.tar.gz
meta-openembedded-master-next.tar.bz2
syslog-ng: repackage json related conf filesmaster-next
Only include conf files that need json if it is enabled when building syslog-ng. Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc13
1 files 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 a0ae7bd..cf6a3de 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"