summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch45
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.50.bb (renamed from meta/recipes-connectivity/bluez5/bluez5_5.49.bb)4
2 files changed, 21 insertions, 28 deletions
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
index 2fde7bc069..da7140922d 100644
--- 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
@@ -1,3 +1,4 @@
1From 99ccdbe155028c4c789803a429072675b87d0c3a Mon Sep 17 00:00:00 2001
1From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org> 2From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
2Date: Sat, 12 Oct 2013 17:45:25 +0200 3Date: Sat, 12 Oct 2013 17:45:25 +0200
3Subject: [PATCH] Allow using obexd without systemd in the user session 4Subject: [PATCH] Allow using obexd without systemd in the user session
@@ -14,19 +15,18 @@ configuration. See thread:
14http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843 15http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843
15 16
16Signed-off-by: Javier Viguera <javier.viguera@digi.com> 17Signed-off-by: Javier Viguera <javier.viguera@digi.com>
18
17--- 19---
18 Makefile.obexd | 4 ++-- 20 Makefile.obexd | 4 ++--
19 obexd/src/org.bluez.obex.service | 4 ---- 21 obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +-
20 obexd/src/org.bluez.obex.service.in | 4 ++++ 22 2 files changed, 3 insertions(+), 3 deletions(-)
21 3 files changed, 6 insertions(+), 6 deletions(-) 23 rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (76%)
22 delete mode 100644 obexd/src/org.bluez.obex.service
23 create mode 100644 obexd/src/org.bluez.obex.service.in
24 24
25diff --git a/Makefile.obexd b/Makefile.obexd 25diff --git a/Makefile.obexd b/Makefile.obexd
26index 2e33cbc72f2b..d5d858c857b4 100644 26index c462692..0325f66 100644
27--- a/Makefile.obexd 27--- a/Makefile.obexd
28+++ b/Makefile.obexd 28+++ b/Makefile.obexd
29@@ -2,12 +2,12 @@ 29@@ -1,12 +1,12 @@
30 if SYSTEMD 30 if SYSTEMD
31 systemduserunitdir = @SYSTEMD_USERUNITDIR@ 31 systemduserunitdir = @SYSTEMD_USERUNITDIR@
32 systemduserunit_DATA = obexd/src/obex.service 32 systemduserunit_DATA = obexd/src/obex.service
@@ -39,25 +39,18 @@ index 2e33cbc72f2b..d5d858c857b4 100644
39-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service 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 40+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
41 41
42 obex_plugindir = $(libdir)/obex/plugins 42 if OBEX
43 43
44diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service 44diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in
45deleted file mode 100644 45similarity index 76%
46index a53808884554..000000000000 46rename from obexd/src/org.bluez.obex.service
47rename to obexd/src/org.bluez.obex.service.in
48index a538088..9c815f2 100644
47--- a/obexd/src/org.bluez.obex.service 49--- 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
54diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
55new file mode 100644
56index 000000000000..9c815f246b77
57--- /dev/null
58+++ b/obexd/src/org.bluez.obex.service.in 50+++ b/obexd/src/org.bluez.obex.service.in
59@@ -0,0 +1,4 @@ 51@@ -1,4 +1,4 @@
60+[D-BUS Service] 52 [D-BUS Service]
61+Name=org.bluez.obex 53 Name=org.bluez.obex
54-Exec=/bin/false
62+Exec=@libexecdir@/obexd 55+Exec=@libexecdir@/obexd
63+SystemdService=dbus-org.bluez.obex.service 56 SystemdService=dbus-org.bluez.obex.service
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.49.bb b/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
index b79bda2861..66271432fe 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.49.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
@@ -2,8 +2,8 @@ require bluez5.inc
2 2
3REQUIRED_DISTRO_FEATURES = "bluez5" 3REQUIRED_DISTRO_FEATURES = "bluez5"
4 4
5SRC_URI[md5sum] = "f210e84db707d66af3b889084a6f8bef" 5SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178"
6SRC_URI[sha256sum] = "33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95" 6SRC_URI[sha256sum] = "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911"
7 7
8# noinst programs in Makefile.tools that are conditional on READLINE 8# noinst programs in Makefile.tools that are conditional on READLINE
9# support 9# support