From cbe34dd655f456393979588aeb8372d417164022 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 30 Nov 2014 15:17:58 +0100 Subject: [PATCH] stunnel: use the _INSTALL_INIT_SYSV mechanism Since the existing STUNNEL_INSTALL_CONF_SCRIPT hook no longer installs the init script, we rename it to STUNNEL_INSTALL_CONF. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/stunnel/stunnel.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index dc5626165c..ac2963e03d 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -18,14 +18,17 @@ else STUNNEL_CONF_OPTS += --disable-systemd endif -define STUNNEL_INSTALL_CONF_SCRIPT - $(INSTALL) -m 0755 -D package/stunnel/S50stunnel $(TARGET_DIR)/etc/init.d/S50stunnel +define STUNNEL_INSTALL_CONF [ -f $(TARGET_DIR)/etc/stunnel/stunnel.conf ] || \ $(INSTALL) -m 0644 -D $(@D)/tools/stunnel.conf \ $(TARGET_DIR)/etc/stunnel/stunnel.conf rm -f $(TARGET_DIR)/etc/stunnel/stunnel.conf-sample endef -STUNNEL_POST_INSTALL_TARGET_HOOKS += STUNNEL_INSTALL_CONF_SCRIPT +STUNNEL_POST_INSTALL_TARGET_HOOKS += STUNNEL_INSTALL_CONF + +define STUNNEL_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/stunnel/S50stunnel $(TARGET_DIR)/etc/init.d/S50stunnel +endef $(eval $(autotools-package)) -- 2.30.2