summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
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
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')
-rw-r--r--meta/recipes-core/busybox/busybox.inc6
-rw-r--r--meta/recipes-core/busybox/busybox/defconfig20
-rw-r--r--meta/recipes-core/busybox/busybox/syslog.cfg11
-rw-r--r--meta/recipes-core/busybox/busybox_1.24.1.bb1
4 files changed, 24 insertions, 14 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):
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index 8803b52ac6..54202efc7e 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -1053,17 +1053,15 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y
1053# 1053#
1054# System Logging Utilities 1054# System Logging Utilities
1055# 1055#
1056CONFIG_SYSLOGD=y 1056# CONFIG_SYSLOGD is not set
1057CONFIG_FEATURE_ROTATE_LOGFILE=y 1057# CONFIG_FEATURE_ROTATE_LOGFILE is not set
1058CONFIG_FEATURE_REMOTE_LOG=y 1058# CONFIG_FEATURE_REMOTE_LOG is not set
1059CONFIG_FEATURE_SYSLOGD_DUP=y 1059# CONFIG_FEATURE_SYSLOGD_DUP is not set
1060CONFIG_FEATURE_SYSLOGD_CFG=y 1060# CONFIG_FEATURE_SYSLOGD_CFG is not set
1061CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 1061# CONFIG_FEATURE_IPC_SYSLOG is not set
1062CONFIG_FEATURE_IPC_SYSLOG=y 1062# CONFIG_LOGREAD is not set
1063CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64 1063# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
1064CONFIG_LOGREAD=y 1064# CONFIG_FEATURE_KMSG_SYSLOG is not set
1065CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
1066CONFIG_FEATURE_KMSG_SYSLOG=y
1067CONFIG_KLOGD=y 1065CONFIG_KLOGD=y
1068 1066
1069# 1067#
diff --git a/meta/recipes-core/busybox/busybox/syslog.cfg b/meta/recipes-core/busybox/busybox/syslog.cfg
new file mode 100644
index 0000000000..e2425ed80e
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/syslog.cfg
@@ -0,0 +1,11 @@
1CONFIG_SYSLOGD=y
2CONFIG_FEATURE_ROTATE_LOGFILE=y
3CONFIG_FEATURE_REMOTE_LOG=y
4CONFIG_FEATURE_SYSLOGD_DUP=y
5CONFIG_FEATURE_SYSLOGD_CFG=y
6CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
7CONFIG_FEATURE_IPC_SYSLOG=y
8CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64
9CONFIG_LOGREAD=y
10CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
11CONFIG_FEATURE_KMSG_SYSLOG=y
diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb
index e26dfff776..1baadeacd7 100644
--- a/meta/recipes-core/busybox/busybox_1.24.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.24.1.bb
@@ -40,6 +40,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
40 file://resize.cfg \ 40 file://resize.cfg \
41 ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ 41 ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \
42 ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \ 42 ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \
43 file://syslog.cfg \
43 file://inittab \ 44 file://inittab \
44 file://rcS \ 45 file://rcS \
45 file://rcK \ 46 file://rcK \