diff options
| author | Slater, Joseph <joe.slater@windriver.com> | 2018-06-18 16:36:48 -0700 | 
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-06-18 16:43:29 -0700 | 
| commit | 4846b3daa744c81ad45adf55b92681c39abcf068 (patch) | |
| tree | 6e613d672c1d93be3e01b002c612e442eb8892c2 | |
| parent | 029ad49c25315cc7f05e1e3ec5f494c5e57ce885 (diff) | |
| download | meta-openembedded-4846b3daa744c81ad45adf55b92681c39abcf068.tar.gz | |
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 <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 13 | 
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 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() { | |||
| 93 | } | 93 | } | 
| 94 | 94 | ||
| 95 | FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools" | 95 | FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools" | 
| 96 | RDEPENDS_${PN} += "gawk" | 96 | RDEPENDS_${PN} += "gawk ${@bb.utils.contains('PACKAGECONFIG','json','${PN}-jconf','',d)}" | 
| 97 | |||
| 98 | FILES_${PN}-jconf += " \ | ||
| 99 | ${datadir}/${BPN}/include/scl/cim \ | ||
| 100 | ${datadir}/${BPN}/include/scl/elasticsearch \ | ||
| 101 | ${datadir}/${BPN}/include/scl/ewmm \ | ||
| 102 | ${datadir}/${BPN}/include/scl/graylog2 \ | ||
| 103 | ${datadir}/${BPN}/include/scl/loggly \ | ||
| 104 | ${datadir}/${BPN}/include/scl/logmatic \ | ||
| 105 | " | ||
| 97 | 106 | ||
| 98 | # This overcomes the syslog-ng rdepends on syslog-ng-dev QA Error | 107 | # This overcomes the syslog-ng rdepends on syslog-ng-dev QA Error | 
| 99 | PACKAGES =+ "${PN}-libs ${PN}-libs-dev ${PN}-libs-dbg" | 108 | PACKAGES =+ "${PN}-jconf ${PN}-libs ${PN}-libs-dev ${PN}-libs-dbg" | 
| 100 | FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" | 109 | FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" | 
| 101 | FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" | 110 | FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" | 
| 102 | FILES_${PN}-libs-dbg = "${libdir}/${BPN}/.debug" | 111 | FILES_${PN}-libs-dbg = "${libdir}/${BPN}/.debug" | 
