Patchwork [meta-oe,meta-efl,meta-gnome,01/10] syslog-ng: move conflicting file modules.conf to own packages and fix unpackaged files

login
register
mail settings
Submitter Martin Jansa
Date Oct. 17, 2011, 11:35 p.m.
Message ID <1ab4e30380da2444cfc66fe5283beb83168964a7.1318894479.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/13373/
State Accepted
Commit 1ab4e30380da2444cfc66fe5283beb83168964a7
Headers show

Comments

Martin Jansa - Oct. 17, 2011, 11:35 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |   11 +++++++++++
 .../recipes-support/syslog-ng/syslog-ng_3.2.2.bb   |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)

Patch

diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index c3a36c1..073b6d6 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/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-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb
index f9eef24..c8b5ac8 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb
+++ b/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 \