From a1928d736cf0572fe6294eaa505d62852cd0e4e1 Mon Sep 17 00:00:00 2001 From: Jimmy Huang Date: Wed, 3 Sep 2014 19:50:28 -0700 Subject: [PATCH] Fixes TC-1563 - Blackscreen when launching Modello Phone The previous commit moved Phoned to start on the system bus, but this caused phone plugin to not able to connect to it over dbus as Phoned api is registered on the session bus on DBUS. Have phoned start on the session bus for now. Change-Id: I3f22e31e3e5c055b730ad32f838281fde4050c60 Signed-off-by: Jimmy Huang --- CMakeLists.txt | 2 +- packaging/phoned.changes | 3 +++ packaging/phoned.spec | 6 +++--- scripts/phoned.service | 2 -- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1155271..19a2c58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ ADD_DEFINITIONS("-std=c++11") SET(DESTINATION_PREFIX bin) SET(DBUS_SERVICE_PREFIX share/dbus-1/services) -SET(SYSTEMD_SERVICE_PREFIX lib/systemd/system) +SET(SYSTEMD_SERVICE_PREFIX lib/systemd/user) # ----------------------------------------------------------------------------- # Macros for pkgconfig diff --git a/packaging/phoned.changes b/packaging/phoned.changes index 11c1d09..a637126 100644 --- a/packaging/phoned.changes +++ b/packaging/phoned.changes @@ -1,3 +1,6 @@ +* Wed Sep 03 2014 Jimmy Huang accepted/tizen/ivi/20140901.103829-1-ga645ab6 +- Fixes TC-1563 - Blackscreen when launching Modello Phone + * Wed Aug 27 2014 Jimmy Huang submit/tizen/20140416.223255-3-g9e04e01 - Fixed systemd unit files diff --git a/packaging/phoned.spec b/packaging/phoned.spec index db14dcd..7d741bc 100644 --- a/packaging/phoned.spec +++ b/packaging/phoned.spec @@ -33,12 +33,12 @@ make %{?jobs:-j%jobs} VERBOSE=1 rm -rf %{buildroot} %make_install -%install_service multi-user.target.wants phoned.service +%install_service ../user/weston.target.wants phoned.service %files %{_libdir}/pkgconfig/phoned.pc %{_prefix}/bin/phoned %{_prefix}/share/dbus-1/services/org.tizen.phone.service -%{_unitdir}/phoned.service -%{_unitdir}/multi-user.target.wants/phoned.service +%{_unitdir_user}/phoned.service +%{_unitdir_user}/weston.target.wants/phoned.service diff --git a/scripts/phoned.service b/scripts/phoned.service index 965d810..1988abc 100644 --- a/scripts/phoned.service +++ b/scripts/phoned.service @@ -4,10 +4,8 @@ After=ofono.service [Service] Type=dbus -User=app BusName=org.tizen.phone ExecStart=/usr/bin/phoned -Type=simple [Install] WantedBy=multi-user.target -- 2.7.4