]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
busybox: don't remove S01logging when CONFIG_SYSLOGD is disabled
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 10 Jan 2018 22:03:59 +0000 (23:03 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 10 Jan 2018 22:03:59 +0000 (23:03 +0100)
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>
package/busybox/busybox.mk

index 8b720b30b87656bc3c6a5539b5dde257f6376073..d0bbd3fd6ee682edad4dc1f4723f72fb67d693e2 100644 (file)
@@ -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)