aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/base-files/Makefile1
-rw-r--r--package/utils/busybox/Makefile21
2 files changed, 18 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index d8d093a306..5f816a0d1b 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -47,7 +47,6 @@ define Package/base-files/conffiles
/etc/config/
/etc/config/network
/etc/config/system
-/etc/crontabs/
/etc/dropbear/
/etc/ethers
/etc/group
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index c2f1c1be45..1e7d9dd333 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -73,14 +73,25 @@ define Package/busybox/config
source "$(SOURCE)/Config.in"
endef
-ifdef CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG
-define Package/busybox/conffiles
+ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_FEATURE_SYSLOG)$(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_FEATURE_SYSLOGD_CFG),)
+define Package/busybox/conffiles/syslog
/etc/syslog.conf
endef
+endif
-Package/busybox-selinux/conffiles = $(Package/busybox/conffiles)
+ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_CROND),)
+define Package/busybox/conffiles/crond
+/etc/crontabs/
+endef
endif
+define Package/busybox/conffiles
+$(Package/busybox/conffiles/syslog)
+$(Package/busybox/conffiles/crond)
+endef
+
+Package/busybox-selinux/conffiles = $(Package/busybox/conffiles)
+
ifndef CONFIG_USE_MUSL
LDLIBS:=m crypt
endif
@@ -129,8 +140,12 @@ define Package/busybox/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_FEATURE_SYSLOG)$(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_FEATURE_SYSLOGD_CFG),)
+ touch $(1)/etc/syslog.conf
+endif
ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_CROND),)
$(INSTALL_BIN) ./files/cron $(1)/etc/init.d/cron
+ $(INSTALL_DIR) $(1)/etc/crontabs
endif
ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_NTPD),)
$(INSTALL_BIN) ./files/sysntpd $(1)/etc/init.d/sysntpd