aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-02-16 02:03:11 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-02-23 16:46:32 +0100
commit12c93f70c4faa5c9d71ef66f675447a4d82a1e9a (patch)
treef74ce69bbbed28c94a9f4d5e2af990adb9116d8d /meta-oe/recipes-support
parentaf6d280e2365d21d3968828df8294e4b61af299c (diff)
downloadmeta-openembedded-12c93f70c4faa5c9d71ef66f675447a4d82a1e9a.tar.gz
syslog-ng: remove unneeded systemd code / use ${systemd_unitdir}
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support')
-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 3bbebec717..3489ac5efa 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -7,7 +7,7 @@ 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 = "r6"
+INC_PR = "r7"
inherit autotools systemd
@@ -26,7 +26,7 @@ EXTRA_OECONF = " \
--disable-pcre \
--disable-sql \
--enable-systemd \
- --with-systemdsystemunitdir=${base_libdir}/systemd/system \
+ --with-systemdsystemunitdir=${systemd_unitdir}/system \
"
do_configure_prepend() {
@@ -47,11 +47,6 @@ do_install_append() {
SYSTEMD_PACKAGES = "${PN}-systemd"
SYSTEMD_SERVICE = "${PN}.service"
-PACKAGES =+ "${PN}-systemd"
-
-FILES_${PN}-systemd += "${base_libdir}/systemd"
-RDEPENDS_${PN}-systemd += "${PN}"
-
FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
${sysconfdir} ${sharedstatedir} ${localstatedir} \
${base_bindir}/* ${base_sbindir}/* \