diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 14:53:18 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:05 +0200 |
| commit | 5ba9463567bc2d7d52ec5c04105c79c18bdf981e (patch) | |
| tree | 33526c3178ec10171d86b46a3cc781ce9020f3fd /meta-oe/recipes-support | |
| parent | a61c15efe444c8917da50264817b44cdcb775fc9 (diff) | |
| download | meta-openembedded-5ba9463567bc2d7d52ec5c04105c79c18bdf981e.tar.gz | |
syslog-ng: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc index 584e4a43ee..bac1be1698 100644 --- a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7ec1bcc46f28b11f4722e20d9b7dd4d5" # update-rc.d and update-alternatives is important RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" -INC_PR = "r9" +INC_PR = "r12" -inherit autotools +inherit autotools systemd SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${PN}_${PV}.tar.gz" @@ -27,6 +27,9 @@ EXTRA_OECONF = " \ --disable-sql \ " +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)}" + 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)}" } @@ -51,6 +54,11 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la ${libdir}/${BPN}/*${SOLIBSDEV}" CONFFILES_${PN} = "${sysconfdir}/${PN}.conf ${sysconfdir}/scl.conf ${sysconfdir}/scl-modules.conf" +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "${PN}.service" + pkg_postinst_${PN} () { /etc/init.d/syslog stop update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 200 |