summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox.inc
diff options
context:
space:
mode:
authorRomain Perier <romain.perier@collabora.com>2017-05-28 08:59:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-29 15:15:20 +0100
commit298dd9baab2217f03907a8e1f92f92aec7893ac5 (patch)
tree2c15b11b672d756673b5431c574c5bec17f3431e /meta/recipes-core/busybox/busybox.inc
parent1c0ce38ba059fed36cb512a66a208f731537347f (diff)
downloadpoky-298dd9baab2217f03907a8e1f92f92aec7893ac5.tar.gz
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. (From OE-Core rev: 9732a2ba2edf2607e61ae4fe0d65a02b7918cfe7) Signed-off-by: Romain Perier <romain.perier@collabora.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox.inc')
-rw-r--r--meta/recipes-core/busybox/busybox.inc6
1 files changed, 3 insertions, 3 deletions
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"
39INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 39INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
40 40
41SYSTEMD_PACKAGES = "${PN}-syslog" 41SYSTEMD_PACKAGES = "${PN}-syslog"
42SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service" 42SYSTEMD_SERVICE_${PN}-syslog = "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', 'busybox-syslog.service', '', d)}"
43 43
44CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}" 44CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}"
45CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" 45CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
@@ -329,8 +329,8 @@ inherit update-alternatives
329 329
330ALTERNATIVE_PRIORITY = "50" 330ALTERNATIVE_PRIORITY = "50"
331 331
332ALTERNATIVE_${PN}-syslog += "syslog-conf" 332ALTERNATIVE_${PN}-syslog += "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', 'syslog-conf', '', d)}"
333ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf" 333ALTERNATIVE_LINK_NAME[syslog-conf] = "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', "${sysconfdir}/syslog.conf", '', d)}"
334 334
335python () { 335python () {
336 if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 336 if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):