summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-06-10 21:46:41 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-07-16 09:39:06 +0200
commitd1f914398dcfc1e0613007154b1515e7ffddc6d8 (patch)
tree2d742236ae2d1718281e62d4a781c68fdb04494a /meta-oe
parent2dae284c9e4fc4be7dbe846f984ee7cf647c7faf (diff)
downloadmeta-openembedded-d1f914398dcfc1e0613007154b1515e7ffddc6d8.tar.gz
syslog-ng: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 50ce4a4e2..584e4a43e 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7ec1bcc46f28b11f4722e20d9b7dd4d5"
7# update-rc.d and update-alternatives is important 7# update-rc.d and update-alternatives is important
8RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" 8RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
9 9
10INC_PR = "r8" 10INC_PR = "r9"
11 11
12inherit autotools systemd 12inherit autotools
13 13
14SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${PN}_${PV}.tar.gz" 14SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${PN}_${PV}.tar.gz"
15 15
@@ -25,8 +25,6 @@ EXTRA_OECONF = " \
25 --disable-linux-caps \ 25 --disable-linux-caps \
26 --disable-pcre \ 26 --disable-pcre \
27 --disable-sql \ 27 --disable-sql \
28 --enable-systemd \
29 --with-systemdsystemunitdir=${systemd_unitdir}/system \
30" 28"
31 29
32do_configure_prepend() { 30do_configure_prepend() {
@@ -44,9 +42,6 @@ do_install_append() {
44 install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN} 42 install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN}
45} 43}
46 44
47SYSTEMD_PACKAGES = "${PN}-systemd"
48SYSTEMD_SERVICE = "${PN}.service"
49
50FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ 45FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
51 ${sysconfdir} ${sharedstatedir} ${localstatedir} \ 46 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
52 ${base_bindir}/* ${base_sbindir}/* \ 47 ${base_bindir}/* ${base_sbindir}/* \