From e71badcea9abe374e5f40d65866f82edc29d764a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 10 Jun 2012 21:46:41 +0000
Subject: [PATCH] syslog-ng: move systemd support to meta-systemd
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

(From meta-openembedded rev: d1f914398dcfc1e0613007154b1515e7ffddc6d8)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
 .../meta-oe/recipes-support/syslog-ng/syslog-ng.inc           |  9 ++-------
 .../recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend        | 11 +++++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 meta-openembedded/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend

diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 50ce4a4..584e4a4 100644
--- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-openembedded/meta-oe/recipes-support/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 = "r8"
+INC_PR = "r9"
 
-inherit autotools systemd
+inherit autotools
 
 SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${PN}_${PV}.tar.gz"
 
@@ -25,8 +25,6 @@ EXTRA_OECONF = " \
   --disable-linux-caps \
   --disable-pcre \
   --disable-sql \
-  --enable-systemd \
-  --with-systemdsystemunitdir=${systemd_unitdir}/system \
 "
 
 do_configure_prepend() {
@@ -44,9 +42,6 @@ do_install_append() {
         install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN}
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
-
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
             ${base_bindir}/* ${base_sbindir}/* \
diff --git a/meta-openembedded/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend b/meta-openembedded/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend
new file mode 100644
index 0000000..92c2e77
--- /dev/null
+++ b/meta-openembedded/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend
@@ -0,0 +1,11 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+EXTRA_OECONF += " \
+  --enable-systemd \
+  --with-systemdsystemunitdir=${systemd_unitdir}/system \
+"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
-- 
2.7.4