[oe] [meta-oe V3 19/23] syslog-ng: remove unneeded systemd code / use ${systemd_unitdir}
Andreas Müller
schnitzeltony at googlemail.com
Thu Feb 23 12:10:50 UTC 2012
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 9 ++-------
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 3bbebec..3489ac5 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}/* \
--
1.7.6.4
More information about the Openembedded-devel
mailing list