Patchwork [meta-oe,V2,30/32] rsyslog: move systemd support to meta-systemd

login
mail settings
Submitter Andreas Müller
Date July 13, 2012, 8:30 a.m.
Message ID <1342168240-7760-31-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/31901/
State Accepted
Commit fca1dffca771f1c6bdcb859ac4fe2d380ee5f404
Headers show

Comments

Andreas Müller - July 13, 2012, 8:30 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-extended/rsyslog/rsyslog.inc       |   10 +++++-----
 .../rsyslog/rsyslog_5.8.0.bbappend                 |   10 ++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend

Patch

diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
index 97fd026..a4bd180 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
@@ -1,19 +1,19 @@ 
 DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd"
-DEPENDS = "zlib systemd"
+DEPENDS = "zlib"
 HOMEPAGE = "http://www.rsyslog.com/"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
            file://rsyslog.conf"
            
+inherit autotools
 
-inherit autotools systemd
+SYSTEMD_UNITDIR ??= "no"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+EXTRA_OECONF = "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
 
 do_install_append() {
         install -d ${D}/${sysconfdir}/${PN}
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
new file mode 100644
index 0000000..b813a50
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
@@ -0,0 +1,10 @@ 
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+DEPENDS += "systemd"
+
+SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"