diff mbox

[28/38] squid: systemd support

Message ID 46428a55d4456ed7558735aafeb331bc37cef9ea.1432332802.git.alex.suykov@gmail.com
State Accepted
Headers show

Commit Message

Alex Suykov May 23, 2015, 10:07 a.m. UTC
squid comes with a .service file, but does not install it.

Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
---
 package/squid/squid.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Thomas Petazzoni July 5, 2015, 2:10 p.m. UTC | #1
Dear Alex Suykov,

On Sat, 23 May 2015 13:07:42 +0300, Alex Suykov wrote:
> squid comes with a .service file, but does not install it.
> 
> Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
> ---
>  package/squid/squid.mk | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/package/squid/squid.mk b/package/squid/squid.mk
> index 745c9ad..5a9fbb7 100644
> --- a/package/squid/squid.mk
> +++ b/package/squid/squid.mk
> @@ -81,4 +81,12 @@ define SQUID_INSTALL_INIT_SYSV
>  		$(TARGET_DIR)/etc/init.d/S97squid
>  endef
>  
> +define SQUID_INSTALL_INIT_SYSTEMD
> +	$(INSTALL) -D -m 0644 $(@D)/tools/squid.service \
> +		$(TARGET_DIR)/usr/lib/systemd/system/squid.service
> +	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
> +	ln -sf /usr/lib/systemd/system/squid.service \
> +		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/squid.service

We prefer to use a relative path for the symlink, so that the symlink
appears to be valid when looking at $(TARGET_DIR) on the build machine.

I've fixed that up before committing, and also fixed it on the upmpdcli
package, which I forgot to do when merging your patch on this package.

Thanks,

Thomas
diff mbox

Patch

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 745c9ad..5a9fbb7 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -81,4 +81,12 @@  define SQUID_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S97squid
 endef
 
+define SQUID_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 $(@D)/tools/squid.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/squid.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf /usr/lib/systemd/system/squid.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/squid.service
+endef
+
 $(eval $(autotools-package))