1. Enable privlilege check routine

Recently, Tizen dbus policy has been changed.
If don't enable dbus priviliege check by config file, dbus commm. always
fails (PERMISSION DENIED error will hanppen).

2. Changed the name of zigbee-daemon to zigbeed

With renaming the daemon, change related settings as well.

Change-Id: I64d6a6be3a6afd1f46edb1b90f3e552255653ae7
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/packaging/org.tizen.zigbee.service b/packaging/org.tizen.zigbee.service
index 92a7f03..6177c62 100644 (file)
--- a/packaging/org.tizen.zigbee.service
+++ b/packaging/org.tizen.zigbee.service
@@ -4,4 +4,4 @@ Name=org.tizen.zigbee.manager
 Exec=/bin/false
 User=network_fw
 Group=network_fw
-SystemdService=zigbee-daemon.service
+SystemdService=zigbee-manager.service

diff --git a/zigbee-daemon/resources/zigbee-daemon.service b/packaging/zigbee-manager.service
similarity index 87%
rename from zigbee-daemon/resources/zigbee-daemon.service
rename to packaging/zigbee-manager.service
index 8da1635..79490e1 100644 (file)
--- a/zigbee-daemon/resources/zigbee-daemon.service
+++ b/packaging/zigbee-manager.service
@@ -9,7 +9,7 @@ BusName=org.tizen.zigbee.manager
 User=network_fw
 Group=network_fw
 SmackProcessLabel=System
-ExecStart=/usr/bin/zigbee-daemon
+ExecStart=/usr/bin/zigbeed
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/zigbee-manager.spec b/packaging/zigbee-manager.spec
index 6a2b4c5..b6e9346 100644 (file)
--- a/packaging/zigbee-manager.spec
+++ b/packaging/zigbee-manager.spec
@@ -1,17 +1,18 @@
 %define major 0
 %define minor 1
 %define patchlevel 2
-%define CHECK_ZIGBEE_PRIVILEGE False
+%define CHECK_ZIGBEE_PRIVILEGE True
 
 Name:           zigbee-manager
 Version:        %{major}.%{minor}.%{patchlevel}
 Release:        1
 License:        Apache-2.0
-Summary:        ZigBee Daemon
+Summary:        ZigBee Manager
 Group:          System/Network
 Source0:        %{name}-%{version}.tar.gz
-Source1:        org.tizen.zigbee.service
-Source2:        zigbee.conf
+Source1:        zigbee-manager.service
+Source2:        org.tizen.zigbee.service
+Source3:        zigbee.conf
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -25,9 +26,10 @@ BuildRequires:  pkgconfig(gmock)
 
 # if image creater does not know 'network_fw'
 Requires: security-config
+Requires: awk
 
 %description
-Description: ZigBee Daemon
+Description: ZigBee Manager
 
 %package -n zigbee-lib
 Summary:         ZigBee library
@@ -75,13 +77,20 @@ make %{?_smp_mflags}
 
 # Do not execute daemon on boot time
 #mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-#ln -s %{_unitdir}/zigbee-daemon.service %{buildroot}%{_unitdir}/multi-user.target.wants/zigbee-daemon.service
+#ln -s %{_unitdir}/zigbee-manager.service %{buildroot}%{_unitdir}/multi-user.target.wants/zigbee-manager.service
 
+mkdir -p %{buildroot}%{_libdir}/systemd/system
+cp %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/zigbee-manager.service
+%if "%{?_lib}" == "lib64"
+mkdir -p %{buildroot}%{_unitdir}
+cp %{SOURCE1} %{buildroot}%{_unitdir}/zigbee-manager.service
+%endif
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
-mkdir -p %{buildroot}%{_datadir}/dbus-1/system.d/
-cp %{SOURCE1} %{buildroot}%{_datadir}/dbus-1/system-services/org.tizen.zigbee.service
+cp %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system-services/org.tizen.zigbee.service
+
 %if %{CHECK_ZIGBEE_PRIVILEGE} == "True"
-cp %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system.d/zigbee.conf
+mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
+cp %{SOURCE3} %{buildroot}%{_sysconfdir}/dbus-1/system.d/zigbee.conf
 %endif
 
 %post -p /sbin/ldconfig
@@ -89,14 +98,17 @@ cp %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system.d/zigbee.conf
 %postun -p /sbin/ldconfig
 
 %files
-%manifest zigbee-daemon.manifest
+%manifest zigbee-manager.manifest
 %defattr(-,root,root,-)
-%attr(755,network_fw,network_fw) %{_bindir}/zigbee-daemon
-%{_unitdir}/zigbee-daemon.service
-#%{_unitdir}/multi-user.target.wants/zigbee-daemon.service
-%attr(644,root,root) %{_datadir}/dbus-1/system-services/*
+%attr(755,network_fw,network_fw) %{_bindir}/zigbeed
+%{_libdir}/systemd/system/zigbee-manager.service
+%if "%{?_lib}" == "lib64"
+%{_unitdir}/zigbee-manager.service
+%endif
+#%{_unitdir}/multi-user.target.wants/zigbee-manager.service
+%{_datadir}/dbus-1/system-services/org.tizen.zigbee.service
 %if %{CHECK_ZIGBEE_PRIVILEGE} == "True"
-%{_datadir}/dbus-1/system.d/zigbee.conf
+%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/zigbee.conf
 %endif
 %license LICENSE
 %if 0%{?gtests:1}

diff --git a/zigbee-daemon/CMakeLists.txt b/zigbee-daemon/CMakeLists.txt
index 0a44dbf..af9aedf 100644 (file)
--- a/zigbee-daemon/CMakeLists.txt
+++ b/zigbee-daemon/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(zigbee-daemon C)
+PROJECT(zigbeed C)
 
 MESSAGE(===================================================================)
 MESSAGE(Building...)
@@ -103,4 +103,3 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} zigbee-service zigbee-interface ${pkgs_LDF
 ### Install files ###
 INSTALL(TARGETS zigbee-lib DESTINATION ${LIBDIR} COMPONENT Runtime)
 INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/resources/zigbee-daemon.service DESTINATION ${UNITDIR})

diff --git a/zigbee-daemon.manifest b/zigbee-manager.manifest
similarity index 100%
rename from zigbee-daemon.manifest
rename to zigbee-manager.manifest