diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2018-01-10 23:03:59 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2018-01-10 23:03:59 +0100 |
| commit | 84e835ea9261b3e844f1a18489dd89253e3eb839 (patch) | |
| tree | 62edf39aa292943b4db8f5c9c7c6c7238116ed4e | |
| parent | 28d5ca9c96f5144e86fac7ec6485fa5634cd6e97 (diff) | |
| download | buildroot-84e835ea9261b3e844f1a18489dd89253e3eb839.tar.gz buildroot-84e835ea9261b3e844f1a18489dd89253e3eb839.zip | |
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>
| -rw-r--r-- | package/busybox/busybox.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 8b720b30b8..d0bbd3fd6e 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) |
