summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-09-03 10:14:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-06 23:03:21 +0100
commit43510e5c775597fd78eab5f703e447fb238403f6 (patch)
treee1f420c26a5d8059fec535278db8410e16fa2b98 /meta
parent101662d357adfb200c5b38b71494fced1fda5607 (diff)
downloadpoky-43510e5c775597fd78eab5f703e447fb238403f6.tar.gz
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] (From OE-Core rev: 45d18a1b6bcdc56d252b289d0d304b26799943b0) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 11673283f6..3a518103ea 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -38,7 +38,9 @@ do_install () {
38 install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog 38 install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog
39} 39}
40 40
41ALTERNATIVE_PRIORITY = "100" 41# sysklogd package has no internal systemd support, so we weigh busybox's
42# sysklogd utility over it in case of systemd
43ALTERNATIVE_PRIORITY = "${@base_contains('DISTRO_FEATURES','systemd','10','100',d)}"
42 44
43ALTERNATIVE_${PN} = "syslogd klogd syslog-init syslog-conf" 45ALTERNATIVE_${PN} = "syslogd klogd syslog-init syslog-conf"
44 46