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

[jethro][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 df42c88b9da3..d1af31ea45cd 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -18,6 +18,7 @@ PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
 
 SRC_URI = "\
     ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
+    ${@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: [jethro][PATCH] bluez5: allow D-Bus to spawn obexd in systems without systemd

[Joshua G Lock]

Hi Javier,

On Wed, 2016-02-24 at 19:14 +0100, Javier Viguera wrote:
> This includes a proper D-Bus service file for obexd in systems that
> do
> not support systemd.
> 

This looks like a valid patch for the master branch too?

The development process we try to follow is for patches to go into the
master branch first, then be backported into the release branches.

Regards,

Joshua

> 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 df42c88b9da3..d1af31ea45cd 100644
> --- a/meta/recipes-connectivity/bluez5/bluez5.inc
> +++ b/meta/recipes-connectivity/bluez5/bluez5.inc
> @@ -18,6 +18,7 @@ PACKAGECONFIG[experimental] = "--enable-
> experimental,--disable-experimental,"
>  
>  SRC_URI = "\
>      ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
> +    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0
> 001-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.gma
> ne.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: [jethro][PATCH] bluez5: allow D-Bus to spawn obexd in systems without systemd

[Viguera, Javier]

Hi Joshua,

> -----Original Message-----
> From: Joshua G Lock [mailto:joshua.g.lock@linux.intel.com] 
> Sent: Thursday, March 03, 2016 12:08 PM
> To: Viguera, Javier; openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [jethro][PATCH] bluez5: allow D-Bus to spawn obexd in systems without systemd
> 
> This looks like a valid patch for the master branch too?

Absolutely. That's why I sent both patches together, one for master and this one for Jethro.

See the one for master: 

http://patchwork.openembedded.org/patch/116389/

By the way, for Jethro I sent also a different patch (master backport):

http://patchwork.openembedded.org/patch/116661/

This last one is already in master and it would be great to have it in Jethro as well.

--
Javier Viguera 

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

[Joshua G Lock]

On Thu, 2016-03-03 at 11:22 +0000, Viguera, Javier wrote:
> Hi Joshua,
> 
> > 
> > -----Original Message-----
> > From: Joshua G Lock [mailto:joshua.g.lock@linux.intel.com] 
> > Sent: Thursday, March 03, 2016 12:08 PM
> > To: Viguera, Javier; openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [jethro][PATCH] bluez5: allow D-Bus to spawn
> > obexd in systems without systemd
> > 
> > This looks like a valid patch for the master branch too?
> Absolutely. That's why I sent both patches together, one for master
> and this one for Jethro.
> 
> See the one for master: 
> 
> http://patchwork.openembedded.org/patch/116389/

Ah, I hadn't seen that patch as I was only looking at patches tagged
jethro. We can consider this change for jethro once it lands in master.

> 
> By the way, for Jethro I sent also a different patch (master
> backport):
> 
> http://patchwork.openembedded.org/patch/116661/
> 
> This last one is already in master and it would be great to have it
> in Jethro as well.

I just included this patch in a consolidated Jethro pull request.

Regards,

Joshua

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

[Javier Viguera]

Hi Joshua

On 03/03/16 12:30, Joshua G Lock wrote:
>
> Ah, I hadn't seen that patch as I was only looking at patches tagged
> jethro. We can consider this change for jethro once it lands in master.
>

This has been finally merged into master.

Would you now consider cherry-picking it into *jethro* ?

Thanks,

Javier Viguera

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

[Joshua G Lock]

Hi Robert,

On Mon, 2016-03-21 at 12:36 +0100, Javier Viguera wrote:
> Hi Joshua
> 
> On 03/03/16 12:30, Joshua G Lock wrote:
> > Ah, I hadn't seen that patch as I was only looking at patches
> > tagged
> > jethro. We can consider this change for jethro once it lands in
> > master.
> > 
> This has been finally merged into master.
> 
> Would you now consider cherry-picking it into *jethro* ?

Could you consider cherry-picking this fix for Jethro?

http://git.openembedded.org/openembedded-core/commit/?id=75c5dc8d4a5506
bf5b89292a96c7b9f91e9d71c8

---

bluez5: allow D-Bus to spawn obexd in systems without systemd
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>
Signed-off-by: Ross Burton <ross.burton@intel.com>

---

Thanks,

Joshua