diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 14:55:46 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:05 +0200 |
| commit | 2db07ef244ef4ae249e954bcda93f83052bb96a0 (patch) | |
| tree | 229c34146a64ce330b1c0701b8ed4d5cabfab410 | |
| parent | 5ba9463567bc2d7d52ec5c04105c79c18bdf981e (diff) | |
| download | meta-openembedded-contrib-2db07ef244ef4ae249e954bcda93f83052bb96a0.tar.gz | |
rsyslog: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog.inc | 14 | ||||
| -rw-r--r-- | meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend | 12 |
2 files changed, 9 insertions, 17 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc index a4bd180bee..dc6e51160a 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc +++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc @@ -1,19 +1,18 @@ DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd" DEPENDS = "zlib" +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" HOMEPAGE = "http://www.rsyslog.com/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973" -INC_PR = "r5" +INC_PR = "r8" SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \ file://rsyslog.conf" -inherit autotools +inherit autotools systemd -SYSTEMD_UNITDIR ??= "no" - -EXTRA_OECONF = "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}" +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" do_install_append() { install -d ${D}/${sysconfdir}/${PN} @@ -21,3 +20,8 @@ do_install_append() { } CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "${PN}.service" diff --git a/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend b/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend deleted file mode 100644 index 64ef39da1a..0000000000 --- a/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -inherit systemd - -PRINC := "${@int(PRINC) + 2}" - -DEPENDS += "systemd" - -SYSTEMD_UNITDIR = "${systemd_unitdir}/system" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${PN}.service" |