Initial git sync

Change-Id: I4854222501d2665e24bcee145e7296ac7318797f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d377582..4098ad7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(INCLUDEDIR "\${prefix}/include")
 
 # Set required packages
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED glib-2.0 gobject-2.0 tcore dlog)
+pkg_check_modules(pkgs REQUIRED glib-2.0 gobject-2.0 tcore dlog libsystemd-daemon)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
@@ -40,10 +40,5 @@ TARGET_LINK_LIBRARIES(telephony-daemon ${pkgs_LDFLAGS} "-ldl")
 INSTALL(TARGETS telephony-daemon
                RUNTIME DESTINATION bin)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resource/etc/rc.d/init.d/telephony-daemon DESTINATION /etc/rc.d/init.d/
-                       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resource/etc/rc.d/rc3.d/S30telephony-daemon DESTINATION /etc/rc.d/rc3.d/
-                       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resource/etc/rc.d/rc5.d/S30telephony-daemon DESTINATION /etc/rc.d/rc5.d/
-                       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME telephony-daemon)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/telephony.service DESTINATION /usr/lib/systemd/system)

diff --git a/packaging/telephony-daemon.manifest b/packaging/telephony-daemon.manifest
index 017d22d..e50ab35 100644 (file)
--- a/packaging/telephony-daemon.manifest
+++ b/packaging/telephony-daemon.manifest
@@ -1,5 +1,9 @@
 <manifest>
- <request>
-    <domain name="_"/>
- </request>
+       <assign>
+               <filesystem path="/usr/lib/systemd/system/telephony.service" label="_" exec_label="none" />
+               <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/telephony.service" label="_" exec_label="none" />
+       </assign>
+       <request>
+               <domain name="_"/>
+       </request>
 </manifest>

diff --git a/packaging/telephony-daemon.spec b/packaging/telephony-daemon.spec
index 8756669..d6579bd 100644 (file)
--- a/packaging/telephony-daemon.spec
+++ b/packaging/telephony-daemon.spec
@@ -1,17 +1,19 @@
 Name:       telephony-daemon
 Summary:    Telephony daemon
-Version:    0.1.12
+Version:    0.1.13
 Release:    2
 Group:      System/Telephony
 License:    Apache
 Source0:    %{name}-%{version}.tar.gz
-Source1:    telephony.service
 Source1001:    telephony-daemon.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(tcore)
 BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(libsystemd-daemon)
+Requires(post):           sys-assert
+%{?systemd_requires}
 
 %description
 Description: Telephony daemon
@@ -27,7 +29,6 @@ make %{?jobs:-j%jobs}
 %install
 %make_install
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants
-install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system/telephony.service
 ln -s ../telephony.service %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/telephony.service
 mkdir -p %{buildroot}/usr/share/license
 
@@ -35,9 +36,6 @@ mkdir -p %{buildroot}/usr/share/license
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_bindir}/telephony-daemon
-%{_sysconfdir}/rc.d/init.d/telephony-daemon
-%{_sysconfdir}/rc.d/rc3.d/S30telephony-daemon
-%{_sysconfdir}/rc.d/rc5.d/S30telephony-daemon
 %{_prefix}/lib/systemd/system/telephony.service
 %{_prefix}/lib/systemd/system/multi-user.target.wants/telephony.service
 /usr/share/license/telephony-daemon

diff --git a/src/main.c b/src/main.c
index d2f3bc7..efd2959 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -18,6 +18,7 @@
  * limitations under the License.
  */
 
+#include <systemd/sd-daemon.h>
 #include <stdio.h>
 #include <string.h>
 #include <pthread.h>
@@ -272,6 +273,9 @@ int main(int argc, char *argv[])
 
        info("server mainloop start");
 
+       /* Notification to systemd */
+       sd_notify(0, "READY=1");
+
        if (tcore_server_run(s) == FALSE) {
                err("server_run failed.");
        }

diff --git a/systemd/telephony.service b/systemd/telephony.service
new file mode 100644 (file)
index 0000000..ffd44e3
--- /dev/null
+++ b/systemd/telephony.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Telephony daemon
+After=modem.service vconf-setup.service
+
+[Service]
+Type=notify
+ExecStart=/usr/bin/telephony-daemon
+
+[Install]
+WantedBy=multi-user.target