Преглед изворни кода

rsyslog: install init script and config file unconditionally

As discussed, users should use a rootfs overlay or a post-build script
instead of a custom skeleton to override files installed by Buildroot,
so there is no point in having conditions when installing init scripts
or configuration files.

Also, we take this opportunity to rename RSYSLOG_INSTALL_CONF_SCRIPT
to RSYSLOG_INSTALL_CONF because it is no longer installing an init
script.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas Petazzoni пре 10 година
родитељ
комит
8a6482db88
1 измењених фајлова са 6 додато и 8 уклоњено
  1. 6 8
      package/rsyslog/rsyslog.mk

+ 6 - 8
package/rsyslog/rsyslog.mk

@@ -39,18 +39,16 @@ else
 endif
 endif
 
 
 define RSYSLOG_INSTALL_INIT_SYSV
 define RSYSLOG_INSTALL_INIT_SYSV
-	[ -f $(TARGET_DIR)/etc/init.d/S01rsyslog ] || \
-		$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
-			$(TARGET_DIR)/etc/init.d/S01rsyslog
+	$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
+		$(TARGET_DIR)/etc/init.d/S01rsyslog
 endef
 endef
 
 
-define RSYSLOG_INSTALL_CONF_SCRIPT
-	[ -f $(TARGET_DIR)/etc/rsyslog.conf ] || \
-		$(INSTALL) -m 0644 -D $(@D)/platform/redhat/rsyslog.conf \
-			$(TARGET_DIR)/etc/rsyslog.conf
+define RSYSLOG_INSTALL_CONF
+	$(INSTALL) -m 0644 -D $(@D)/platform/redhat/rsyslog.conf \
+		$(TARGET_DIR)/etc/rsyslog.conf
 	mkdir -p $(TARGET_DIR)/etc/rsyslog.d
 	mkdir -p $(TARGET_DIR)/etc/rsyslog.d
 endef
 endef
 
 
-RSYSLOG_POST_INSTALL_TARGET_HOOKS += RSYSLOG_INSTALL_CONF_SCRIPT
+RSYSLOG_POST_INSTALL_TARGET_HOOKS += RSYSLOG_INSTALL_CONF
 
 
 $(eval $(autotools-package))
 $(eval $(autotools-package))