diff options
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 1 | ||||
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch | 63 |
2 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index df42c88b9d..d1af31ea45 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," | |||
18 | 18 | ||
19 | SRC_URI = "\ | 19 | SRC_URI = "\ |
20 | ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ | 20 | ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ |
21 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ | ||
21 | " | 22 | " |
22 | S = "${WORKDIR}/bluez-${PV}" | 23 | S = "${WORKDIR}/bluez-${PV}" |
23 | 24 | ||
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 0000000000..2fde7bc069 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org> | ||
2 | Date: Sat, 12 Oct 2013 17:45:25 +0200 | ||
3 | Subject: [PATCH] Allow using obexd without systemd in the user session | ||
4 | |||
5 | Not all sessions run systemd --user (actually, the majority | ||
6 | doesn't), so the dbus daemon must be able to spawn obexd | ||
7 | directly, and to do so it needs the full path of the daemon. | ||
8 | |||
9 | Upstream-Status: Denied | ||
10 | |||
11 | Not accepted by upstream maintainer for being a distro specific | ||
12 | configuration. See thread: | ||
13 | |||
14 | http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843 | ||
15 | |||
16 | Signed-off-by: Javier Viguera <javier.viguera@digi.com> | ||
17 | --- | ||
18 | Makefile.obexd | 4 ++-- | ||
19 | obexd/src/org.bluez.obex.service | 4 ---- | ||
20 | obexd/src/org.bluez.obex.service.in | 4 ++++ | ||
21 | 3 files changed, 6 insertions(+), 6 deletions(-) | ||
22 | delete mode 100644 obexd/src/org.bluez.obex.service | ||
23 | create mode 100644 obexd/src/org.bluez.obex.service.in | ||
24 | |||
25 | diff --git a/Makefile.obexd b/Makefile.obexd | ||
26 | index 2e33cbc72f2b..d5d858c857b4 100644 | ||
27 | --- a/Makefile.obexd | ||
28 | +++ b/Makefile.obexd | ||
29 | @@ -2,12 +2,12 @@ | ||
30 | if SYSTEMD | ||
31 | systemduserunitdir = @SYSTEMD_USERUNITDIR@ | ||
32 | systemduserunit_DATA = obexd/src/obex.service | ||
33 | +endif | ||
34 | |||
35 | dbussessionbusdir = @DBUS_SESSIONBUSDIR@ | ||
36 | dbussessionbus_DATA = obexd/src/org.bluez.obex.service | ||
37 | -endif | ||
38 | |||
39 | -EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service | ||
40 | +EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in | ||
41 | |||
42 | obex_plugindir = $(libdir)/obex/plugins | ||
43 | |||
44 | diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service | ||
45 | deleted file mode 100644 | ||
46 | index a53808884554..000000000000 | ||
47 | --- a/obexd/src/org.bluez.obex.service | ||
48 | +++ /dev/null | ||
49 | @@ -1,4 +0,0 @@ | ||
50 | -[D-BUS Service] | ||
51 | -Name=org.bluez.obex | ||
52 | -Exec=/bin/false | ||
53 | -SystemdService=dbus-org.bluez.obex.service | ||
54 | diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in | ||
55 | new file mode 100644 | ||
56 | index 000000000000..9c815f246b77 | ||
57 | --- /dev/null | ||
58 | +++ b/obexd/src/org.bluez.obex.service.in | ||
59 | @@ -0,0 +1,4 @@ | ||
60 | +[D-BUS Service] | ||
61 | +Name=org.bluez.obex | ||
62 | +Exec=@libexecdir@/obexd | ||
63 | +SystemdService=dbus-org.bluez.obex.service | ||