diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-12-05 11:32:58 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-12-06 11:21:10 +0100 |
| commit | af50ba2d39e55bbf3e603353e73d19953415c267 (patch) | |
| tree | 400446a10cb6b46041df733db589ffd2d385a84a /meta-oe/recipes-support/syslog-ng | |
| parent | d5b2825b5023a31e85196bb4b5b74ff6d470474b (diff) | |
| download | meta-openembedded-contrib-af50ba2d39e55bbf3e603353e73d19953415c267.tar.gz | |
syslog-ng: upgrade to latest version from 3.2 series and rework modules.conf fix
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 | 12 | ||||
| -rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb | 10 | ||||
| -rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb | 10 |
3 files changed, 16 insertions, 16 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 073b6d635a..c57c5abf7d 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -28,17 +28,20 @@ EXTRA_OECONF = " \ " do_configure_prepend() { - eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" + eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" } +# rename modules.conf because it breaks update-modules +# see http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-October/035537.html do_install_append() { + mv ${D}/${sysconfdir}/modules.conf ${D}/${sysconfdir}/scl-modules.conf + sed -i "s#@include 'modules.conf'#@include 'scl-modules.conf'#g" ${D}/${sysconfdir}/scl.conf install -d ${D}/${sysconfdir}/${PN} install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}.conf install -d ${D}/${sysconfdir}/init.d 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}/* \ @@ -46,10 +49,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${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" +CONFFILES_${PN} = "${sysconfdir}/${PN}.conf ${sysconfdir}/scl.conf ${sysconfdir}/scl-modules.conf" pkg_postinst_${PN} () { /etc/init.d/syslog stop 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 deleted file mode 100644 index c8b5ac807c..0000000000 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require syslog-ng.inc -PR = "${INC_PR}.2" - -SRC_URI += " \ - file://syslog-ng.conf \ - file://initscript \ -" - -SRC_URI[md5sum] = "ed8ebe559d52a63fb61e3e2db566643f" -SRC_URI[sha256sum] = "fa5abd4d99acee8fff8217061fb2407698a5bc89804d69f3ae97bffc72fcce48" diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb new file mode 100644 index 0000000000..ff1e2479e2 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb @@ -0,0 +1,10 @@ +require syslog-ng.inc +PR = "${INC_PR}.0" + +SRC_URI += " \ + file://syslog-ng.conf \ + file://initscript \ +" + +SRC_URI[md5sum] = "60737452ce898f9dc7170dfdc9bfd732" +SRC_URI[sha256sum] = "ffc9f3a0ebea836c1c737b1ff49efe731d885af1d8aacf9eca79d9144eeefa89" |