Enable systemd-based dbus activiation for deviced.service

Change-Id: Ia9d1c38bc5d8baad1e0660fb5dcb3fa5e0721691
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50475c8..be3ac66 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,17 +255,15 @@ IF(TIZEN_FEATURE_CPU_MODULE STREQUAL on)
        INSTALL_CONF(conf cpu)
 ENDIF()
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/conf/org.tizen.system.deviced.conf DESTINATION /etc/dbus-1/system.d)
-
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/systemd/ DESTINATION lib/systemd/system
-               FILES_MATCHING
-               PATTERN "*.service"
-               PATTERN "*.socket"
-               PATTERN "sdb-prestart.service" EXCLUDE
-               PATTERN "usb-host*" EXCLUDE)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/conf/org.tizen.system.deviced.conf       DESTINATION /etc/dbus-1/system.d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/org.tizen.system.deviced.service DESTINATION /usr/share/dbus-1/system-services)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/deviced.service                  DESTINATION /usr/lib/systemd/system)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/deviced.socket                   DESTINATION /usr/lib/systemd/system)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/usb-host-ffs-test-daemon.service DESTINATION /usr/lib/systemd/system)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/usb-host-test.socket             DESTINATION /usr/lib/systemd/system)
 
 IF(TIZEN_FEATURE_USBHOST_TEST STREQUAL on)
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/usb-host-ffs-test-daemon.service

diff --git a/packaging/deviced.spec b/packaging/deviced.spec
index 7e0f6be..baa8ccb 100755 (executable)
--- a/packaging/deviced.spec
+++ b/packaging/deviced.spec
@@ -211,6 +211,7 @@ mv %{_libdir}/display-tv.so %{_libdir}/deviced/display.so
 %{_unitdir}/sockets.target.wants/deviced.socket
 %{_unitdir}/deviced.service
 %{_unitdir}/deviced.socket
+%{_datadir}/dbus-1/system-services/org.tizen.system.deviced.service
 %if %{?sdb_prestart} == on
 %{_unitdir}/sdb-prestart.service
 %{_unitdir}/basic.target.wants/sdb-prestart.service

diff --git a/systemd/org.tizen.system.deviced.service b/systemd/org.tizen.system.deviced.service
new file mode 100644 (file)
index 0000000..3a592cc
--- /dev/null
+++ b/systemd/org.tizen.system.deviced.service
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.tizen.system.deviced
+Exec=/bin/false
+User=root
+SystemdService=deviced.service