|
@@ -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
|