From c35d94949fe24f5d0e20218ebbe5840e0ba25eb1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 16 Oct 2011 18:54:37 +0200 Subject: [PATCH] syslog-ng: move conflicting file modules.conf to own packages and fix unpackaged files (From meta-openembedded rev: 1ab4e30380da2444cfc66fe5283beb83168964a7) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 11 +++++++++++ .../meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index c3a36c1..073b6d6 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -38,6 +38,17 @@ do_install_append() { install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN} } +PACKAGES =+ "${PN}-config" +FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ + ${sysconfdir} ${sharedstatedir} ${localstatedir} \ + ${base_bindir}/* ${base_sbindir}/* \ + ${base_libdir}/*${SOLIBS} \ + ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \ + ${datadir}/include/scl/ ${datadir}/xsd" +FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la ${libdir}/${BPN}/*${SOLIBSDEV}" +# moved intentionaly to ${PN}-config without RDEPENDing on it, because it breaks update-modules +# see http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-October/035537.html +FILES_${PN}-config += "${syconfdir}/modules.conf" CONFFILES_${PN} = "${sysconfdir}/${PN}.conf" pkg_postinst_${PN} () { diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb index f9eef24..c8b5ac8 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb @@ -1,5 +1,5 @@ require syslog-ng.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI += " \ file://syslog-ng.conf \ -- 2.7.4