Skip to contentSkip to conversation

package/iputils: fix service installation

PATCH New Petr Vorel 3 participants 5 messages Nov 2, 2019 – Nov 3, 2019

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/1 package/iputils: fix service installation

service files aren't installed by meson for some reason, thus install them manually.
This is temporary fix, until it's fixed upstream.
It might be caused by install_dir ignoring the prefix and installing always into systemd.get_pkgconfig_variable('systemdsystemunitdir').

Fixes ada815afcf ("package/iputils: enable systemd services")

---
Quick fix, going to submit solution to upstream. Feel free to wait for proper fix.

Kind regards,
Petr

 package/iputils/iputils.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/iputils/iputils.mk +4 -0
index 57e90a973a..98f6f60dfe 100644
@@ -59,6 +59,8 @@ IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false
 else
 IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true
 define IPUTILS_INSTALL_SERVICE_NINFOD
+	$(INSTALL) -D -m 0644 $(@D)/systemd/ninfod.service.in \
+		$(TARGET_DIR)/usr/lib/systemd/system/ninfod.service
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
 	ln -sf ../../../../lib/systemd/system/ninfod.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ninfod.service
@@ -115,6 +117,8 @@ endef
 endif
 
 define IPUTILS_INSTALL_SERVICE_RDISC
+	$(INSTALL) -D -m 0644 $(@D)/systemd/rdisc.service.in \
+		$(TARGET_DIR)/usr/lib/systemd/system/rdisc.service
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
 	ln -sf ../../../../lib/systemd/system/rdisc.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rdisc.service
Signature · 1 line
2.24.0.rc2
#1 lore raw

PATCH 1/1 package/iputils: fix service installation

Hello Petr,

package/iputils/iputils.mk IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false · line 63

Quoted 3 lines · On Sat, 2 Nov 2019 16:17:26 +0100 Petr Vorel <[email protected]> wrote:

define IPUTILS_INSTALL_SERVICE_NINFOD

package/iputils/iputils.mk +2 -0
+	$(INSTALL) -D -m 0644 $(@D)/systemd/ninfod.service.in \
+		$(TARGET_DIR)/usr/lib/systemd/system/ninfod.service

This cannot be right: ninfod.service.in contains @sbindir@ that needs to be replaced before being installed.

package/iputils/iputils.mk endef · line 121

Quoted 3 lines

define IPUTILS_INSTALL_SERVICE_RDISC

package/iputils/iputils.mk +2 -0
+	$(INSTALL) -D -m 0644 $(@D)/systemd/rdisc.service.in \
+		$(TARGET_DIR)/usr/lib/systemd/system/rdisc.service

Ditto.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#2 lore raw

PATCH 1/1 package/iputils: fix service installation

Hi Thomas,

Quoted 6 lines

package/iputils/iputils.mk IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false · line 63

Quoted 3 lines

define IPUTILS_INSTALL_SERVICE_NINFOD

package/iputils/iputils.mk +2 -0
+	$(INSTALL) -D -m 0644 $(@D)/systemd/ninfod.service.in \
+		$(TARGET_DIR)/usr/lib/systemd/system/ninfod.service

This cannot be right: ninfod.service.in contains @sbindir@ that needs to be replaced before being installed.

I'm sorry to overlook that. If it's ok to be replaced by sed/awk I'll send a new patch.
Or we can wait for a proper fix in upstream.

Kind regards,
Petr

#3 lore raw

PATCH 1/1 package/iputils: fix service installation

In reply to Petr Vorel
Quoted 3 lines · Petr Vorel

service files aren't installed by meson for some reason, thus install them manually.

Are you sure? When I was testing my service symlink patch they were being installed, they were just not being enabled.

Quoted 42 lines

This is temporary fix, until it's fixed upstream.
It might be caused by install_dir ignoring the prefix and installing always into systemd.get_pkgconfig_variable('systemdsystemunitdir').

Fixes ada815afcf ("package/iputils: enable systemd services")

---
Quick fix, going to submit solution to upstream. Feel free to wait for proper fix.

Kind regards,
Petr

 package/iputils/iputils.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/iputils/iputils.mk +4 -1
index 57e90a973a..98f6f60dfe 100644
@@ -59,6 +59,8 @@ IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false
 else
 IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true
 define IPUTILS_INSTALL_SERVICE_NINFOD
+       $(INSTALL) -D -m 0644 $(@D)/systemd/ninfod.service.in \
+               $(TARGET_DIR)/usr/lib/systemd/system/ninfod.service
        mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
        ln -sf ../../../../lib/systemd/system/ninfod.service \
                $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ninfod.service
@@ -115,6 +117,8 @@ endef
 endif
 
 define IPUTILS_INSTALL_SERVICE_RDISC
+       $(INSTALL) -D -m 0644 $(@D)/systemd/rdisc.service.in \
+               $(TARGET_DIR)/usr/lib/systemd/system/rdisc.service
        mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
        ln -sf ../../../../lib/systemd/system/rdisc.service \
                $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rdisc.service
--

2.24.0.rc2

#4 lore raw

PATCH 1/1 package/iputils: fix service installation

In reply to Petr Vorel
Quoted 3 lines · Petr Vorel

service files aren't installed by meson for some reason, thus install them manually.

This should hopefully fix it:
https://patchwork.ozlabs.org/patch/1188505/

Quoted 42 lines

This is temporary fix, until it's fixed upstream.
It might be caused by install_dir ignoring the prefix and installing always into systemd.get_pkgconfig_variable('systemdsystemunitdir').

Fixes ada815afcf ("package/iputils: enable systemd services")

---
Quick fix, going to submit solution to upstream. Feel free to wait for proper fix.

Kind regards,
Petr

 package/iputils/iputils.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/iputils/iputils.mk +4 -1
index 57e90a973a..98f6f60dfe 100644
@@ -59,6 +59,8 @@ IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false
 else
 IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true
 define IPUTILS_INSTALL_SERVICE_NINFOD
+       $(INSTALL) -D -m 0644 $(@D)/systemd/ninfod.service.in \
+               $(TARGET_DIR)/usr/lib/systemd/system/ninfod.service
        mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
        ln -sf ../../../../lib/systemd/system/ninfod.service \
                $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ninfod.service
@@ -115,6 +117,8 @@ endef
 endif
 
 define IPUTILS_INSTALL_SERVICE_RDISC
+       $(INSTALL) -D -m 0644 $(@D)/systemd/rdisc.service.in \
+               $(TARGET_DIR)/usr/lib/systemd/system/rdisc.service
        mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
        ln -sf ../../../../lib/systemd/system/rdisc.service \
                $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rdisc.service
--

2.24.0.rc2