summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChengwei Yang <chengwei.yang@intel.com>2013-08-21 05:08:48 (GMT)
committerChengwei Yang <chengwei.yang@intel.com>2013-08-21 05:13:21 (GMT)
commit904a5884eb0d707d5a1c91e05b9e11708ae62905 (patch)
tree0d8421edd1e28b0ecdd6e58de4e641c521907c7a
parent7e8b83f83bfff517a45f6db7fbe85e0f9d4e8756 (diff)
downloadoma-ds-agent-904a5884eb0d707d5a1c91e05b9e11708ae62905.zip
oma-ds-agent-904a5884eb0d707d5a1c91e05b9e11708ae62905.tar.gz
oma-ds-agent-904a5884eb0d707d5a1c91e05b9e11708ae62905.tar.bz2
Install dbus service file to system-wide dbus service directoryrefs/changes/28/7928/4
This is a minor fix for dbus activation, there are two kinds of dbus bus daemon, system-wide bus and session bus per user. And they have its own different service directory. Change-Id: I52936caa5822bd3211488a7828f8f79f3b613ee9 Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
-rwxr-xr-xoma-ds-agent.manifest2
-rw-r--r--packaging/oma-ds-agent.changes3
-rwxr-xr-xpackaging/oma-ds-agent.spec2
-rwxr-xr-xsrc/agent/CMakeLists.txt2
4 files changed, 6 insertions, 3 deletions
diff --git a/oma-ds-agent.manifest b/oma-ds-agent.manifest
index 76626bf..607dc95 100755
--- a/oma-ds-agent.manifest
+++ b/oma-ds-agent.manifest
@@ -16,7 +16,7 @@
<filesystem path="/etc/rc.d/rc3.d/S91oma-ds-agent" label="_" exec_label="none"/>
<filesystem path="/etc/rc.d/rc5.d/S91oma-ds-agent" label="_" exec_label="none"/>
<filesystem path="/etc/init.d/oma-ds" label="_" exec_label="none"/>
- <filesystem path="/usr/share/dbus-1/services/com.samsung.omadsagent.service" label="_"/>
+ <filesystem path="/usr/share/dbus-1/system-services/com.samsung.omadsagent.service" label="_"/>
<filesystem path="/etc/dbus-1/system.d/com.samsung.omadsagent.conf" label="_"/>
</assign>
<request>
diff --git a/packaging/oma-ds-agent.changes b/packaging/oma-ds-agent.changes
index cecdc72..129fc74 100644
--- a/packaging/oma-ds-agent.changes
+++ b/packaging/oma-ds-agent.changes
@@ -1,4 +1,7 @@
* Wed Aug 21 2013 Chengwei Yang <chengwei.yang@intel.com>
+- Install dbus service file to system-wide dbus service directory, TDIST-295
+
+* Wed Aug 21 2013 Chengwei Yang <chengwei.yang@intel.com>
- Fix dbus service file by adding User
* Wed Aug 21 2013 Chengwei Yang <chengwei.yang@intel.com>
diff --git a/packaging/oma-ds-agent.spec b/packaging/oma-ds-agent.spec
index 1a2ffec..6518f4f 100755
--- a/packaging/oma-ds-agent.spec
+++ b/packaging/oma-ds-agent.spec
@@ -108,7 +108,7 @@ rm -rf /usr/share/oma-ds-cfg
%manifest oma-ds-agent.manifest
%defattr(-,root,root,-)
-/usr/share/dbus-1/services/*
+/usr/share/dbus-1/system-services/com.samsung.omadsagent.service
/usr/bin/oma-ds-agent
/usr/share/oma-ds-cfg/*
diff --git a/src/agent/CMakeLists.txt b/src/agent/CMakeLists.txt
index 4c98e87..0d99c9e 100755
--- a/src/agent/CMakeLists.txt
+++ b/src/agent/CMakeLists.txt
@@ -72,7 +72,7 @@ INSTALL(TARGETS ${EXENAME} DESTINATION ${BINDIR})
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/oma-ds-cfg DESTINATION /usr/share)
# install oma ds dbus file
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadsagent.service DESTINATION /usr/share/dbus-1/services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadsagent.service DESTINATION /usr/share/dbus-1/system-services)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadsagent.conf DESTINATION /etc/dbus-1/system.d)
# install systemd unit