gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Petazzoni 2014-11-30 15:18:46 +01:00 committed by Peter Korsgaard
parent 1c8369ce3f
commit 8a6482db88
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/rsyslog/rsyslog.mk
View File

@ -39,18 +39,16 @@ else
endif
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
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
endef
RSYSLOG_POST_INSTALL_TARGET_HOOKS += RSYSLOG_INSTALL_CONF_SCRIPT
RSYSLOG_POST_INSTALL_TARGET_HOOKS += RSYSLOG_INSTALL_CONF
$(eval $(autotools-package))