NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lighttpd: install init script and config file unconditionally

Browse Source 
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.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-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:44 +01:00 committed by Peter Korsgaard
parent febe876dcc
commit fa36ccd2f5
1 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/lighttpd/lighttpd.mk
View File

@ -62,28 +62,16 @@ endif
define LIGHTTPD_INSTALL_CONFIG
$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d
$(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www
[ -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] || \
$(INSTALL) -D -m 755 $(@D)/doc/config/lighttpd.conf \
$(TARGET_DIR)/etc/lighttpd/lighttpd.conf
[ -f $(TARGET_DIR)/etc/lighttpd/modules.conf ] || \
$(INSTALL) -D -m 755 $(@D)/doc/config/modules.conf \
$(TARGET_DIR)/etc/lighttpd/modules.conf
[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf ] || \
$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/access_log.conf \
$(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf
[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf ] || \
$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/debug.conf \
$(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf
[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf ] || \
$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/dirlisting.conf \
$(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf
[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf ] || \
$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/mime.conf \
$(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf
endef
@ -91,13 +79,11 @@ endef
LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_CONFIG
define LIGHTTPD_INSTALL_INIT_SYSV
[ -f $(TARGET_DIR)/etc/init.d/S50lighttpd ] || \
$(INSTALL) -D -m 755 package/lighttpd/S50lighttpd \
$(TARGET_DIR)/etc/init.d/S50lighttpd
endef
define LIGHTTPD_INSTALL_INIT_SYSTEMD
[ -f $(TARGET_DIR)/etc/systemd/system/lighttpd.service ] || \
$(INSTALL) -D -m 644 package/lighttpd/lighttpd.service \
$(TARGET_DIR)/etc/systemd/system/lighttpd.service