aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2018-01-10 23:03:59 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-01-16 19:43:50 +0100
commit6c97236d04e7ec493dedf91030afa649f8303572 (patch)
treec96e0f032668d128607877a8bba8a2a2eb7a94a4
parentfe3ac2c20aef525e51ff425f8acbb14f9b7a9334 (diff)
downloadbuildroot-6c97236d04e7ec493dedf91030afa649f8303572.tar.gz
buildroot-6c97236d04e7ec493dedf91030afa649f8303572.tar.bz2
busybox: don't remove S01logging when CONFIG_SYSLOGD is disabled
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>
-rw-r--r--package/busybox/busybox.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 1aeeeef4bf..e0c5ca7234 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)