diff options
author | Maxin B. John <maxin.john@intel.com> | 2018-06-12 14:18:14 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-18 11:07:57 +0100 |
commit | 1ddec43ce1cbab1984cb6925be34a05b4ccee9e0 (patch) | |
tree | ed5f3b6f753906b9609a33cf039469249bdcf222 | |
parent | 9ac26a877356c9c2de2cc95c63420a18f05d81b9 (diff) | |
download | poky-1ddec43ce1cbab1984cb6925be34a05b4ccee9e0.tar.gz |
bluez5: upgrade to 5.50
Refresh the following patch:
0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
(From OE-Core rev: 4032fd3ae640da8076617403152a30841507db4f)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch | 45 | ||||
-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 @@ | |||
1 | From 99ccdbe155028c4c789803a429072675b87d0c3a Mon Sep 17 00:00:00 2001 | ||
1 | From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org> | 2 | From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org> |
2 | Date: Sat, 12 Oct 2013 17:45:25 +0200 | 3 | Date: Sat, 12 Oct 2013 17:45:25 +0200 |
3 | Subject: [PATCH] Allow using obexd without systemd in the user session | 4 | Subject: [PATCH] Allow using obexd without systemd in the user session |
@@ -14,19 +15,18 @@ configuration. See thread: | |||
14 | http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843 | 15 | http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843 |
15 | 16 | ||
16 | Signed-off-by: Javier Viguera <javier.viguera@digi.com> | 17 | Signed-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 | ||
25 | diff --git a/Makefile.obexd b/Makefile.obexd | 25 | diff --git a/Makefile.obexd b/Makefile.obexd |
26 | index 2e33cbc72f2b..d5d858c857b4 100644 | 26 | index 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 | ||
44 | diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service | 44 | diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in |
45 | deleted file mode 100644 | 45 | similarity index 76% |
46 | index a53808884554..000000000000 | 46 | rename from obexd/src/org.bluez.obex.service |
47 | rename to obexd/src/org.bluez.obex.service.in | ||
48 | index 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 | ||
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 | 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 | ||
3 | REQUIRED_DISTRO_FEATURES = "bluez5" | 3 | REQUIRED_DISTRO_FEATURES = "bluez5" |
4 | 4 | ||
5 | SRC_URI[md5sum] = "f210e84db707d66af3b889084a6f8bef" | 5 | SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178" |
6 | SRC_URI[sha256sum] = "33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95" | 6 | SRC_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 |