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/syslog-ng.inc | |
parent | d5b2825b5023a31e85196bb4b5b74ff6d470474b (diff) | |
download | meta-openembedded-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/syslog-ng.inc')
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 073b6d635..c57c5abf7 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 = " \ | |||
28 | " | 28 | " |
29 | 29 | ||
30 | do_configure_prepend() { | 30 | do_configure_prepend() { |
31 | eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" | 31 | eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" |
32 | } | 32 | } |
33 | 33 | ||
34 | # rename modules.conf because it breaks update-modules | ||
35 | # see http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-October/035537.html | ||
34 | do_install_append() { | 36 | do_install_append() { |
37 | mv ${D}/${sysconfdir}/modules.conf ${D}/${sysconfdir}/scl-modules.conf | ||
38 | sed -i "s#@include 'modules.conf'#@include 'scl-modules.conf'#g" ${D}/${sysconfdir}/scl.conf | ||
35 | install -d ${D}/${sysconfdir}/${PN} | 39 | install -d ${D}/${sysconfdir}/${PN} |
36 | install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}.conf | 40 | install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}.conf |
37 | install -d ${D}/${sysconfdir}/init.d | 41 | install -d ${D}/${sysconfdir}/init.d |
38 | install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN} | 42 | install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN} |
39 | } | 43 | } |
40 | 44 | ||
41 | PACKAGES =+ "${PN}-config" | ||
42 | FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ | 45 | FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ |
43 | ${sysconfdir} ${sharedstatedir} ${localstatedir} \ | 46 | ${sysconfdir} ${sharedstatedir} ${localstatedir} \ |
44 | ${base_bindir}/* ${base_sbindir}/* \ | 47 | ${base_bindir}/* ${base_sbindir}/* \ |
@@ -46,10 +49,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} | |||
46 | ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \ | 49 | ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \ |
47 | ${datadir}/include/scl/ ${datadir}/xsd" | 50 | ${datadir}/include/scl/ ${datadir}/xsd" |
48 | FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la ${libdir}/${BPN}/*${SOLIBSDEV}" | 51 | FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la ${libdir}/${BPN}/*${SOLIBSDEV}" |
49 | # moved intentionaly to ${PN}-config without RDEPENDing on it, because it breaks update-modules | 52 | CONFFILES_${PN} = "${sysconfdir}/${PN}.conf ${sysconfdir}/scl.conf ${sysconfdir}/scl-modules.conf" |
50 | # see http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-October/035537.html | ||
51 | FILES_${PN}-config += "${syconfdir}/modules.conf" | ||
52 | CONFFILES_${PN} = "${sysconfdir}/${PN}.conf" | ||
53 | 53 | ||
54 | pkg_postinst_${PN} () { | 54 | pkg_postinst_${PN} () { |
55 | /etc/init.d/syslog stop | 55 | /etc/init.d/syslog stop |