[oe-commits] Chen Qi : sysklogd: lower the ALTERNATIVE_PRIORITY in case of systemd

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 45d18a1b6bcdc56d252b289d0d304b26799943b0
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=45d18a1b6bcdc56d252b289d0d304b26799943b0

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Tue Sep  3 10:14:51 2013 +0800

sysklogd: lower the ALTERNATIVE_PRIORITY in case of systemd

The sysklogd package hasn't got systemd support yet. So in case of
a systemd based system, the commands and corresponding configuration
files should have a lower priority than that of the busybox's syslogd
and klogd utilities. These two utilities from busybox have internal
systemd support if CONFIG_FEATURE_SYSTEMD is enabled. And that config
item is enabled by default.

[YOCTO #5066]

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-extended/sysklogd/sysklogd.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 1167328..3a51810 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -38,7 +38,9 @@ do_install () {
 	install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog
 }
 
-ALTERNATIVE_PRIORITY = "100"
+# sysklogd package has no internal systemd support, so we weigh busybox's
+# sysklogd utility over it in case of systemd
+ALTERNATIVE_PRIORITY = "${@base_contains('DISTRO_FEATURES','systemd','10','100',d)}"
 
 ALTERNATIVE_${PN} = "syslogd klogd syslog-init syslog-conf"