diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-11-30 15:17:49 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 22:33:18 +0100 |
| commit | 6b1c75cbdc8ffe825c3954bb57bd14320d5cb693 (patch) | |
| tree | fb1bfe001c57eb97a4db0516a6368bc552926a44 /package | |
| parent | 1d627b3632f4b212f6ebe66813e7135a734c54ea (diff) | |
vsftpd: use <pkg>_INSTALL_INIT_SYSV and rename init script
This commit changes the vsftpd package to use the
<pkg>_INSTALL_INIT_SYSV mechanism to install its init script, and
renames the init script in the Buildroot source tree to match how it's
named on the target.
Also, the init script is now installed unconditionally, as is done in
most packages.
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>
Diffstat (limited to 'package')
| -rwxr-xr-x | package/vsftpd/S70vsftpd (renamed from package/vsftpd/vsftpd-init) | 0 | ||||
| -rw-r--r-- | package/vsftpd/vsftpd.mk | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/package/vsftpd/vsftpd-init b/package/vsftpd/S70vsftpd index 6048907f60..6048907f60 100755 --- a/package/vsftpd/vsftpd-init +++ b/package/vsftpd/S70vsftpd diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index cab5afb732..1c468edd6d 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -43,15 +43,16 @@ define VSFTPD_BUILD_CMDS LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(@D) endef +define VSFTPD_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/vsftpd/S70vsftpd $(TARGET_DIR)/etc/init.d/S70vsftpd +endef + define VSFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D -m 755 $(@D)/vsftpd $(TARGET_DIR)/usr/sbin/vsftpd $(INSTALL) -D -m 644 $(@D)/vsftpd.8 \ $(TARGET_DIR)/usr/share/man/man8/vsftpd.8 $(INSTALL) -D -m 644 $(@D)/vsftpd.conf.5 \ $(TARGET_DIR)/usr/share/man/man5/vsftpd.conf.5 - test -f $(TARGET_DIR)/etc/init.d/S70vsftpd || \ - $(INSTALL) -D -m 755 package/vsftpd/vsftpd-init \ - $(TARGET_DIR)/etc/init.d/S70vsftpd test -f $(TARGET_DIR)/etc/vsftpd.conf || \ $(INSTALL) -D -m 644 $(@D)/vsftpd.conf \ $(TARGET_DIR)/etc/vsftpd.conf |