* [Buildroot] [git commit branch/2017.11.x] busybox: don't remove S01logging when CONFIG_SYSLOGD is disabled
@ 2018-01-16 18:43 Peter Korsgaard
0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2018-01-16 18:43 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=6c97236d04e7ec493dedf91030afa649f8303572
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2017.11.x
The current busybox.mk explicitly removes S01logging if CONFIG_SYSLOGD
is disabled in the Busybox configuration. However:
- This causes the removal of the S01logging script potentially
installed by another package (currently syslog-ng, rsyslog and
sysklogd can all install a S01logging script).
- We generally don't try to clean-up stuff that we may have installed
in a previous make invocation and that is no longer needed
following a configuration change.
Fixes bug #10176
Reported-by: Karl Krach <mail@kkrach.de>
Fix-provided-by: Karl Krach <mail@kkrach.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
(cherry picked from commit 84e835ea9261b3e844f1a18489dd89253e3eb839)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/busybox/busybox.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 1aeeeef..e0c5ca7 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -221,7 +221,7 @@ define BUSYBOX_INSTALL_LOGGING_SCRIPT
if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
$(INSTALL) -m 0755 -D package/busybox/S01logging \
$(TARGET_DIR)/etc/init.d/S01logging; \
- else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi
+ fi
endef
ifeq ($(BR2_INIT_BUSYBOX),y)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-01-16 18:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-16 18:43 [Buildroot] [git commit branch/2017.11.x] busybox: don't remove S01logging when CONFIG_SYSLOGD is disabled Peter Korsgaard
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.