diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-12 19:14:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-15 09:10:46 +0000 |
commit | 47a9dac49f5cf3781c0494fa02c86701131225c3 (patch) | |
tree | c41d5090a7f50c9fa73038ed6e529d6af920e397 /meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch | |
parent | c26566e44ba2e01111674d74a1c590ef6c5baa02 (diff) | |
download | poky-47a9dac49f5cf3781c0494fa02c86701131225c3.tar.gz |
bluez: update 5.50 -> 5.52
Drop a big pile of backports.
Disable zsh completions, as they're unlikely to be useful.
(From OE-Core rev: dad8cd50bcc4203a65d153dc2445502c1e728975)
(From OE-Core rev: 1a31a31a3bd68f027ba0a13f8e66ce92104a4d4c)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch')
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch | 12 |
1 files changed, 6 insertions, 6 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 da7140922d..618ed734a9 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,4 +1,4 @@ | |||
1 | From 99ccdbe155028c4c789803a429072675b87d0c3a Mon Sep 17 00:00:00 2001 | 1 | From f74eb97c9fb3c0ee2895742e773ac6a3c41c999c Mon Sep 17 00:00:00 2001 |
2 | From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org> | 2 | From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org> |
3 | Date: Sat, 12 Oct 2013 17:45:25 +0200 | 3 | Date: Sat, 12 Oct 2013 17:45:25 +0200 |
4 | Subject: [PATCH] Allow using obexd without systemd in the user session | 4 | Subject: [PATCH] Allow using obexd without systemd in the user session |
@@ -17,22 +17,22 @@ http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843 | |||
17 | Signed-off-by: Javier Viguera <javier.viguera@digi.com> | 17 | Signed-off-by: Javier Viguera <javier.viguera@digi.com> |
18 | 18 | ||
19 | --- | 19 | --- |
20 | Makefile.obexd | 4 ++-- | 20 | Makefile.obexd | 4 ++-- |
21 | obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +- | 21 | .../src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +- |
22 | 2 files changed, 3 insertions(+), 3 deletions(-) | 22 | 2 files changed, 3 insertions(+), 3 deletions(-) |
23 | rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (76%) | 23 | rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (76%) |
24 | 24 | ||
25 | diff --git a/Makefile.obexd b/Makefile.obexd | 25 | diff --git a/Makefile.obexd b/Makefile.obexd |
26 | index c462692..0325f66 100644 | 26 | index de59d29..73004a3 100644 |
27 | --- a/Makefile.obexd | 27 | --- a/Makefile.obexd |
28 | +++ b/Makefile.obexd | 28 | +++ b/Makefile.obexd |
29 | @@ -1,12 +1,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 |
33 | +endif | 33 | +endif |
34 | 34 | ||
35 | dbussessionbusdir = @DBUS_SESSIONBUSDIR@ | 35 | dbussessionbusdir = $(DBUS_SESSIONBUSDIR) |
36 | dbussessionbus_DATA = obexd/src/org.bluez.obex.service | 36 | dbussessionbus_DATA = obexd/src/org.bluez.obex.service |
37 | -endif | 37 | -endif |
38 | 38 | ||