mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 09:32:17 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
9ac26a8773
commit
1ddec43ce1
@@ -1,3 +1,4 @@
|
||||
From 99ccdbe155028c4c789803a429072675b87d0c3a Mon Sep 17 00:00:00 2001
|
||||
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
|
||||
@@ -14,19 +15,18 @@ 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
|
||||
Makefile.obexd | 4 ++--
|
||||
obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (76%)
|
||||
|
||||
diff --git a/Makefile.obexd b/Makefile.obexd
|
||||
index 2e33cbc72f2b..d5d858c857b4 100644
|
||||
index c462692..0325f66 100644
|
||||
--- a/Makefile.obexd
|
||||
+++ b/Makefile.obexd
|
||||
@@ -2,12 +2,12 @@
|
||||
@@ -1,12 +1,12 @@
|
||||
if SYSTEMD
|
||||
systemduserunitdir = @SYSTEMD_USERUNITDIR@
|
||||
systemduserunit_DATA = obexd/src/obex.service
|
||||
@@ -39,25 +39,18 @@ index 2e33cbc72f2b..d5d858c857b4 100644
|
||||
-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
|
||||
if OBEX
|
||||
|
||||
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
|
||||
deleted file mode 100644
|
||||
index a53808884554..000000000000
|
||||
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in
|
||||
similarity index 76%
|
||||
rename from obexd/src/org.bluez.obex.service
|
||||
rename to obexd/src/org.bluez.obex.service.in
|
||||
index a538088..9c815f2 100644
|
||||
--- 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
|
||||
@@ -1,4 +1,4 @@
|
||||
[D-BUS Service]
|
||||
Name=org.bluez.obex
|
||||
-Exec=/bin/false
|
||||
+Exec=@libexecdir@/obexd
|
||||
+SystemdService=dbus-org.bluez.obex.service
|
||||
SystemdService=dbus-org.bluez.obex.service
|
||||
|
||||
@@ -2,8 +2,8 @@ require bluez5.inc
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "bluez5"
|
||||
|
||||
SRC_URI[md5sum] = "f210e84db707d66af3b889084a6f8bef"
|
||||
SRC_URI[sha256sum] = "33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95"
|
||||
SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178"
|
||||
SRC_URI[sha256sum] = "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911"
|
||||
|
||||
# noinst programs in Makefile.tools that are conditional on READLINE
|
||||
# support
|
||||
Reference in New Issue
Block a user