Hi Joe
For expediency can you rebase on master-next and resend. On Fri, Jun 15, 2018 at 11:21 AM Joe Slater <[email protected]> wrote: > > Remove configurations requiring json from target. > > Signed-off-by: Joe Slater <[email protected]> > --- > 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 cb7ca31..6c5adbd 100644 > --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc > +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc > @@ -85,6 +85,13 @@ 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 ${@bb.utils.contains('PACKAGECONFIG','json','false','true',d)} ; then > + for f in loggly logmatic cim elasticsearch ; do > + rm -rf ${D}${datadir}/${BPN}/include/scl/$f > + done > + fi > } > > FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools" > -- > 2.7.4 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
