From 9732a2ba2edf2607e61ae4fe0d65a02b7918cfe7 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 28 May 2017 08:59:40 +0200 Subject: busybox: make SYSLOGD optionnal Some distros might choose another syslogd provider like rsyslogd. update-alternative will update the link from syslogd to the right provider. However the syslogd feature is still present and enabled in busybox. This commit adds a new configuration fragment to make syslogd optionnal in busybox. Signed-off-by: Romain Perier Acked-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/busybox/busybox.inc') diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index adc6e9a717..b23eaa1068 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -39,7 +39,7 @@ INITSCRIPT_NAME_${PN}-syslog = "syslog" INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" SYSTEMD_PACKAGES = "${PN}-syslog" -SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service" +SYSTEMD_SERVICE_${PN}-syslog = "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', 'busybox-syslog.service', '', d)}" CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}" CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" @@ -329,8 +329,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "50" -ALTERNATIVE_${PN}-syslog += "syslog-conf" -ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf" +ALTERNATIVE_${PN}-syslog += "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', 'syslog-conf', '', d)}" +ALTERNATIVE_LINK_NAME[syslog-conf] = "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', "${sysconfdir}/syslog.conf", '', d)}" python () { if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): -- cgit 1.2.3-korg