Skip to contentSkip to conversation

package/bluez5_utils: correct systemd service install

PATCH New Martin Bark 3 participants 4 messages Jun 16, 2016 – Jun 18, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/bluez5_utils: correct systemd service install

Commit d732fa4 add the BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD rule, however, it is not correct. The [Install] section of bluetooth.service is as follows:

[Install]
WantedBy=bluetooth.target
Alias=dbus-org.bluez.service

hence there are currently two mistakes:
1) bluetooth.service is wanted by bluetooth.target not multi-user.target
2) dbus-org.bluez.service is a missing alias to bluetooth.service

This commit fixes both these issues.

---
 package/bluez5_utils/bluez5_utils.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/bluez5_utils/bluez5_utils.mk +4 -2
index ddc8c45..49cc7c2 100644
@@ -77,9 +77,11 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-systemd
 endif
 
 define BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants
 	ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/bluetooth.service
+		$(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants/bluetooth.service
+	ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
+		$(TARGET_DIR)/etc/systemd/system/dbus-org.bluez.service
 endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 package/bluez5_utils: correct systemd service install

Martin, All,

On 2016-06-16 18:15 +0100, Martin Bark spake thusly:

Quoted 8 lines

Commit d732fa4 add the BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD rule, however, it is not correct. The [Install] section of bluetooth.service is as follows:

[Install]
WantedBy=bluetooth.target
Alias=dbus-org.bluez.service

Quoted 7 lines

hence there are currently two mistakes:
1) bluetooth.service is wanted by bluetooth.target not multi-user.target
2) dbus-org.bluez.service is a missing alias to bluetooth.service

This commit fixes both these issues.

However, the way we handle the systemd units is not tenable in the long run. If the next version of bluez changes this unit, we'd have to keep in sync. And so on for *all* packages.

I'd pretty much prefer we get something that automatically installs the units in their correct location.

So, maybe we'd need a kind of cross systemctl helper, to provide us with the means to install/remove units in $(O)/target/ instead of duplicating the effort in all our packages...

I think a simple parser that interprets WantedBy, Alias and the likes would be relatively easy to write...

Brought to you by the same "Famous Last Words (TM)" company that brought you the cross ldconfig earlier! ;-] )

Regards,
Yann E. MORIN.

Quoted 29 lines
---
 package/bluez5_utils/bluez5_utils.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/bluez5_utils/bluez5_utils.mk +4 -2
index ddc8c45..49cc7c2 100644
@@ -77,9 +77,11 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-systemd
 endif
 
 define BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants
 	ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/bluetooth.service
+		$(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants/bluetooth.service
+	ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
+		$(TARGET_DIR)/etc/systemd/system/dbus-org.bluez.service
 endef
 
 $(eval $(autotools-package))
Signature · 6 lines
2.7.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/bluez5_utils: correct systemd service install

Yann,

Quoted 32 lines · Yann E. MORIN

Martin, All,

On 2016-06-16 18:15 +0100, Martin Bark spake thusly:

Quoted 8 lines

Commit d732fa4 add the BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD rule, however, it is not correct. The [Install] section of bluetooth.service is as follows:

[Install]
WantedBy=bluetooth.target
Alias=dbus-org.bluez.service

Quoted 7 lines

hence there are currently two mistakes:
1) bluetooth.service is wanted by bluetooth.target not multi-user.target
2) dbus-org.bluez.service is a missing alias to bluetooth.service

This commit fixes both these issues.

However, the way we handle the systemd units is not tenable in the long run. If the next version of bluez changes this unit, we'd have to keep in sync. And so on for *all* packages.

I'd pretty much prefer we get something that automatically installs the units in their correct location.

So, maybe we'd need a kind of cross systemctl helper, to provide us with the means to install/remove units in $(O)/target/ instead of duplicating the effort in all our packages...

Quoted 5 lines

I think a simple parser that interprets WantedBy, Alias and the likes would be relatively easy to write...

Brought to you by the same "Famous Last Words (TM)" company that brought you the cross ldconfig earlier! ;-] )

Yes i agree, i was thinking the exact same thing. The XXX_INSTALL_INIT_SYSTEMD should be automatic since it's just mimicking systemctl enable <service>.

Thanks

Martin

Quoted 41 lines

Regards,
Yann E. MORIN.

Quoted 25 lines
---
 package/bluez5_utils/bluez5_utils.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/bluez5_utils/bluez5_utils.mk +4 -3
index ddc8c45..49cc7c2 100644
@@ -77,9 +77,11 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-systemd
 endif
 
 define BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD
-     mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/
+     mkdir -p $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants
      ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
-             $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/bluetooth.service
+             $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants/bluetooth.service
+     ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
+             $(TARGET_DIR)/etc/systemd/system/dbus-org.bluez.service
 endef
 
 $(eval $(autotools-package))
--

2.7.4

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

#3 lore raw

PATCH 1/1 package/bluez5_utils: correct systemd service install

In reply to Martin Bark

Hello,

Quoted 12 lines · Martin Bark

Commit d732fa4 add the BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD rule, however, it is not correct. The [Install] section of bluetooth.service is as follows:

[Install]
WantedBy=bluetooth.target
Alias=dbus-org.bluez.service

hence there are currently two mistakes:
1) bluetooth.service is wanted by bluetooth.target not multi-user.target
2) dbus-org.bluez.service is a missing alias to bluetooth.service

Quoted 6 lines

This commit fixes both these issues.

---
 package/bluez5_utils/bluez5_utils.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com