[PATCH] bluez5: allow D-Bus to spawn obexd in systems without systemd

[PATCH] bluez5: allow D-Bus to spawn obexd in systems without systemd

[Javier Viguera]

This includes a proper D-Bus service file for obexd in systems that do
not support systemd.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta/recipes-connectivity/bluez5/bluez5.inc        |  1 +
 ...-obexd-without-systemd-in-the-user-sessio.patch | 63 ++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index ff2bdcba62a4..f38eaa503598 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -19,6 +19,7 @@ PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
 SRC_URI = "\
     ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
     file://init \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
 "
 S = "${WORKDIR}/bluez-${PV}"
 
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
new file mode 100644
index 000000000000..2fde7bc06923
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
@@ -0,0 +1,63 @@
+From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
+Date: Sat, 12 Oct 2013 17:45:25 +0200
+Subject: [PATCH] Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+
+Upstream-Status: Denied
+
+Not accepted by upstream maintainer for being a distro specific
+configuration. See thread:
+
+http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843
+
+Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+---
+ Makefile.obexd                      | 4 ++--
+ obexd/src/org.bluez.obex.service    | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 2e33cbc72f2b..d5d858c857b4 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,12 @@
+ if SYSTEMD
+ systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ obex_plugindir = $(libdir)/obex/plugins
+ 
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a53808884554..000000000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 000000000000..9c815f246b77
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service

Re: [PATCH] bluez5: allow D-Bus to spawn obexd in systems without systemd

[Javier Viguera]

On 24/02/16 19:12, Javier Viguera wrote:
> This includes a proper D-Bus service file for obexd in systems that do
> not support systemd.
>
> Signed-off-by: Javier Viguera <javier.viguera-i7dp0qKlBMg@public.gmane.org>

Ping.

-- 
Thanks,

Javier Viguera

Re: [PATCH] bluez5: allow D-Bus to spawn obexd in systems without systemd

[Javier Viguera]

On 09/03/16 19:33, Javier Viguera wrote:
> On 24/02/16 19:12, Javier Viguera wrote:
>> This includes a proper D-Bus service file for obexd in systems that do
>> not support systemd.
>>
>> Signed-off-by: Javier Viguera
>> <javier.viguera-i7dp0qKlBMg-XMD5yJDbdMReXY1tMh2IBg@public.gmane.org>
>
> Ping.
>

I know people is probably busy enough trying to stabilize the upcoming 
2.1 release, but could this be considered for master?


Thanks,

Javier Viguera

Re: [PATCH] bluez5: allow D-Bus to spawn obexd in systems without systemd

[Otavio Salvador]

On Fri, Mar 18, 2016 at 12:33 PM, Javier Viguera
<javier.viguera@digi.com> wrote:
> On 09/03/16 19:33, Javier Viguera wrote:
>>
>> On 24/02/16 19:12, Javier Viguera wrote:
>>>
>>> This includes a proper D-Bus service file for obexd in systems that do
>>> not support systemd.
>>>
>>> Signed-off-by: Javier Viguera
>>> <javier.viguera-i7dp0qKlBMg-XMD5yJDbdMReXY1tMh2IBg@public.gmane.org>
>>
>>
>> Ping.
>>
>
> I know people is probably busy enough trying to stabilize the upcoming 2.1
> release, but could this be considered for master?

Agreed; this is good to be included as it does address an issue for a
lot of users. Ross, could you queue it for MUT please?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH] bluez5: allow D-Bus to spawn obexd in systems without systemd

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

On 18 March 2016 at 18:48, Otavio Salvador <otavio.salvador@ossystems.com.br
> wrote:

> Agreed; this is good to be included as it does address an issue for a
> lot of users. Ross, could you queue it for MUT please?
>

I didn't merge it straight away as I wanted to understand why upstream
rejected this, but it was merged earlier today.

Ross

[-- Attachment #2: Type: text/html, Size: 765 bytes --]