diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-16 18:54:37 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-18 01:31:10 +0200 |
| commit | 1ab4e30380da2444cfc66fe5283beb83168964a7 (patch) | |
| tree | 7010432a8c5bb40fa0820253a247b4c748538aa6 /meta-oe/recipes-support/syslog-ng | |
| parent | 1b170fa28c9c52d4c8d87e9cbe07af1e664a96c3 (diff) | |
| download | meta-openembedded-contrib-1ab4e30380da2444cfc66fe5283beb83168964a7.tar.gz | |
syslog-ng: move conflicting file modules.conf to own packages and fix unpackaged files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng')
| -rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index c3a36c18f9..073b6d635a 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 f9eef248b3..c8b5ac807c 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 \ |