* [PATCH v4] busybox: make SYSLOGD optionnal
@ 2017-05-28 6:59 Romain Perier
2017-05-28 22:30 ` Otavio Salvador
0 siblings, 1 reply; 3+ messages in thread
From: Romain Perier @ 2017-05-28 6:59 UTC (permalink / raw)
To: Qi.Chen; +Cc: openembedded-core
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 <romain.perier@collabora.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v4:
- Added missing syslog.cfg (whoops, sorry guys!)
Changes in v3:
- Rebased onto oe-core master
- Added Acked-by tag for Otavio
Changes in v2:
- Rebased onto master branch (thanks to patchwork)
meta/recipes-core/busybox/busybox.inc | 6 +++---
meta/recipes-core/busybox/busybox/defconfig | 20 +++++++++-----------
meta/recipes-core/busybox/busybox/syslog.cfg | 11 +++++++++++
meta/recipes-core/busybox/busybox_1.24.1.bb | 1 +
4 files changed, 24 insertions(+), 14 deletions(-)
create mode 100644 meta/recipes-core/busybox/busybox/syslog.cfg
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index adc6e9a..b23eaa1 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):
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index 8803b52..54202ef 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -1053,17 +1053,15 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y
#
# System Logging Utilities
#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-CONFIG_FEATURE_SYSLOGD_DUP=y
-CONFIG_FEATURE_SYSLOGD_CFG=y
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64
-CONFIG_LOGREAD=y
-CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
-CONFIG_FEATURE_KMSG_SYSLOG=y
+# CONFIG_SYSLOGD is not set
+# CONFIG_FEATURE_ROTATE_LOGFILE is not set
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+# CONFIG_FEATURE_KMSG_SYSLOG is not set
CONFIG_KLOGD=y
#
diff --git a/meta/recipes-core/busybox/busybox/syslog.cfg b/meta/recipes-core/busybox/busybox/syslog.cfg
new file mode 100644
index 0000000..e2425ed
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/syslog.cfg
@@ -0,0 +1,11 @@
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_CFG=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_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 e26dfff..1baadeac 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 \
file://resize.cfg \
${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \
${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \
+ file://syslog.cfg \
file://inittab \
file://rcS \
file://rcK \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v4] busybox: make SYSLOGD optionnal
2017-05-28 6:59 [PATCH v4] busybox: make SYSLOGD optionnal Romain Perier
@ 2017-05-28 22:30 ` Otavio Salvador
2017-05-30 6:36 ` Romain Perier
0 siblings, 1 reply; 3+ messages in thread
From: Otavio Salvador @ 2017-05-28 22:30 UTC (permalink / raw)
To: Romain Perier; +Cc: Patches and discussions about the oe-core layer
On Sun, May 28, 2017 at 3:59 AM, Romain Perier
<romain.perier@collabora.com> wrote:
> 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 <romain.perier@collabora.com>
> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
This is a good addition; once this is merged on master I would like to
propose to backport it to pyro as it does not change the current
behaviour but allows for better finer-grained configuration.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v4] busybox: make SYSLOGD optionnal
2017-05-28 22:30 ` Otavio Salvador
@ 2017-05-30 6:36 ` Romain Perier
0 siblings, 0 replies; 3+ messages in thread
From: Romain Perier @ 2017-05-30 6:36 UTC (permalink / raw)
To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer
Hello,
Le 29/05/2017 à 00:30, Otavio Salvador a écrit :
> On Sun, May 28, 2017 at 3:59 AM, Romain Perier
> <romain.perier@collabora.com> wrote:
>> 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 <romain.perier@collabora.com>
>> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
> This is a good addition; once this is merged on master I would like to
> propose to backport it to pyro as it does not change the current
> behaviour but allows for better finer-grained configuration.
>
I agree, this is something that I wanted to propose too.
Regards,
Romain
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-30 6:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-28 6:59 [PATCH v4] busybox: make SYSLOGD optionnal Romain Perier
2017-05-28 22:30 ` Otavio Salvador
2017-05-30 6:36 ` Romain Perier
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.