code.ossystems Code Review - openembedded-core.git/blob

   1 From f74eb97c9fb3c0ee2895742e773ac6a3c41c999c 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 Upstream-Status: Denied
  11
  12 Not accepted by upstream maintainer for being a distro specific
  13 configuration. See thread:
  14
  15 http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843
  16
  17 Signed-off-by: Javier Viguera <javier.viguera@digi.com>
  18
  19 ---
  20  Makefile.obexd                                                | 4 ++--
  21  .../src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +-
  22  2 files changed, 3 insertions(+), 3 deletions(-)
  23  rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (76%)
  24
  25 diff --git a/Makefile.obexd b/Makefile.obexd
  26 index de59d29..73004a3 100644
  27 --- a/Makefile.obexd
  28 +++ b/Makefile.obexd
  29 @@ -1,12 +1,12 @@
  30  if SYSTEMD
  31  systemduserunitdir = $(SYSTEMD_USERUNITDIR)
  32  systemduserunit_DATA = obexd/src/obex.service
  33 +endif
  34
  35  dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
  36  dbussessionbus_DATA = obexd/src/org.bluez.obex.service
  37 -endif
  38
  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
  41
  42  if OBEX
  43
  44 diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in
  45 similarity index 76%
  46 rename from obexd/src/org.bluez.obex.service
  47 rename to obexd/src/org.bluez.obex.service.in
  48 index a538088..9c815f2 100644
  49 --- a/obexd/src/org.bluez.obex.service
  50 +++ b/obexd/src/org.bluez.obex.service.in
  51 @@ -1,4 +1,4 @@
  52  [D-BUS Service]
  53  Name=org.bluez.obex
  54 -Exec=/bin/false
  55 +Exec=@libexecdir@/obexd
  56  SystemdService=dbus-org.bluez.obex.service