Add dbus activation feature

Change-Id: Ibf4510ed3d0e6ce022979ef69beed82de4ffbf51
Signed-off-by: Jusung Son <jusung07.son@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef58439..eb6a587 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,8 @@ SET_TARGET_PROPERTIES(esd PROPERTIES LINK_FLAGS "-pie -Wl,-z,relro")
 
 # pkgconfig file
 configure_file(esd.manifest.in esd.manifest @ONLY)
+configure_file(org.tizen.esd.service.in org.tizen.esd.service @ONLY)
 
 INSTALL(TARGETS esd DESTINATION bin)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/eventsystem.conf DESTINATION /etc/dbus-1/system.d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.esd.service DESTINATION ${SHARE_INSTALL_PREFIX}/dbus-1/system-services/)
\ No newline at end of file

diff --git a/org.tizen.esd.service.in b/org.tizen.esd.service.in
new file mode 100644 (file)
index 0000000..4315d2c
--- /dev/null
+++ b/org.tizen.esd.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=tizen.system.event.app2esd\r
+Exec=/bin/false
+SystemdService=esd.service
\ No newline at end of file

diff --git a/packaging/esd.service b/packaging/esd.service
index 37a0556..cc8c69e 100644 (file)
--- a/packaging/esd.service
+++ b/packaging/esd.service
@@ -1,15 +1,17 @@
 [Unit]
 Description=Start the Event System Daemon
-Wants=wait-mount@opt-usr.service
-After=wait-mount@opt-usr.service
+Requires=dbus.socket buxton2.service
+After=dbus.socket buxton2.service
 
 [Service]
 User=app_fw
 Group=app_fw
+Type=dbus
 SmackProcessLabel=System
+BusName=tizen.system.event.app2esd
 ExecStart=/usr/bin/esd
 Restart=on-failure
 RestartSec=0
 
 [Install]
-WantedBy=default.target
+WantedBy=multi-user.target
\ No newline at end of file

diff --git a/packaging/esd.spec b/packaging/esd.spec
index 95ed77a..ef615c0 100644 (file)
--- a/packaging/esd.spec
+++ b/packaging/esd.spec
@@ -55,9 +55,9 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/esd.service
-ln -sf ../esd.service %{buildroot}%{_unitdir}/graphical.target.wants/esd.service
+ln -sf ../esd.service %{buildroot}%{_unitdir}/multi-user.target.wants/esd.service
 
 %post -p /sbin/ldconfig
 
@@ -69,7 +69,8 @@ ln -sf ../esd.service %{buildroot}%{_unitdir}/graphical.target.wants/esd.service
 %defattr(-,root,root,-)
 %{_bindir}/esd
 %{_unitdir}/esd.service
-%{_unitdir}/graphical.target.wants/esd.service
+%{_unitdir}/multi-user.target.wants/esd.service
+%attr(0644,root,root) %{_datadir}/dbus-1/system-services/org.tizen.esd.service
 %license LICENSE
 
 %files devel