/[pkg-src]/trunk/bluez/patches/bluez-5.14-allow-using-obexd-without-systemd-in-the-user-session.patch |
Contents of /trunk/bluez/patches/bluez-5.14-allow-using-obexd-without-systemd-in-the-user-session.patch
Parent Directory | Revision Log
Revision 2410 -
(show annotations)
(download)
Wed Feb 19 09:06:26 2014 UTC (10 years, 7 months ago) by niro
File size: 1908 byte(s)
Wed Feb 19 09:06:26 2014 UTC (10 years, 7 months ago) by niro
File size: 1908 byte(s)
-fixed obexd
1 | From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 |
2 | From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org> |
3 | Date: Sat, 12 Oct 2013 17:45:25 +0200 |
4 | Subject: [PATCH] Allow using obexd without systemd in the user session |
5 | |
6 | Not all sessions run systemd --user (actually, the majority |
7 | doesn't), so the dbus daemon must be able to spawn obexd |
8 | directly, and to do so it needs the full path of the daemon. |
9 | --- |
10 | Makefile.obexd | 4 ++-- |
11 | obexd/src/org.bluez.obex.service | 4 ---- |
12 | obexd/src/org.bluez.obex.service.in | 4 ++++ |
13 | 3 files changed, 6 insertions(+), 6 deletions(-) |
14 | delete mode 100644 obexd/src/org.bluez.obex.service |
15 | create mode 100644 obexd/src/org.bluez.obex.service.in |
16 | |
17 | diff --git a/Makefile.obexd b/Makefile.obexd |
18 | index 3760867..142e7c3 100644 |
19 | --- a/Makefile.obexd |
20 | +++ b/Makefile.obexd |
21 | @@ -2,12 +2,12 @@ |
22 | if SYSTEMD |
23 | systemduserunitdir = @SYSTEMD_USERUNITDIR@ |
24 | systemduserunit_DATA = obexd/src/obex.service |
25 | +endif |
26 | |
27 | dbussessionbusdir = @DBUS_SESSIONBUSDIR@ |
28 | dbussessionbus_DATA = obexd/src/org.bluez.obex.service |
29 | -endif |
30 | |
31 | -EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service |
32 | +EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in |
33 | |
34 | obex_plugindir = $(libdir)/obex/plugins |
35 | |
36 | diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service |
37 | deleted file mode 100644 |
38 | index a538088..0000000 |
39 | --- a/obexd/src/org.bluez.obex.service |
40 | +++ /dev/null |
41 | @@ -1,4 +0,0 @@ |
42 | -[D-BUS Service] |
43 | -Name=org.bluez.obex |
44 | -Exec=/bin/false |
45 | -SystemdService=dbus-org.bluez.obex.service |
46 | diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in |
47 | new file mode 100644 |
48 | index 0000000..9c815f2 |
49 | --- /dev/null |
50 | +++ b/obexd/src/org.bluez.obex.service.in |
51 | @@ -0,0 +1,4 @@ |
52 | +[D-BUS Service] |
53 | +Name=org.bluez.obex |
54 | +Exec=@libexecdir@/obexd |
55 | +SystemdService=dbus-org.bluez.obex.service |
56 | -- |
57 | 1.8.3.1 |
58 | |
59 |