tizen id: change path of Tizen ID to RW path

- Previous: /etc/tizenid (RO)
- Now: /opt/etc/tizenid (RW)
- Previous path is RO and thus Tizen ID cannot be made
  at runtime. Thus the path is changed to RW path.

Change-Id: Iad21c3e9f7331581765cfa4223231aff489c32b8
Signed-off-by: Taeyoung Kim <ty317.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f1bd98..14638c0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DCONFIG_FILE_PATH=\"${CONFIG_FILE_PATH}\"")
 ADD_DEFINITIONS("-DINFO_FILE_PATH=\"${INFO_FILE_PATH}\"")
-ADD_DEFINITIONS("-DOS_RELEASE_FILE_PATH=\"${OS_RELEASE_FILE_PATH}\"")
-ADD_DEFINITIONS("-DSERIAL_PATH=\"${SERIAL_PATH}\"")
 ADD_DEFINITIONS("-DTIZEN_ID_PATH=\"${TIZEN_ID_PATH}\"")
 ADD_DEFINITIONS("-DLIBPATH=\"${LIB_INSTALL_DIR}\"")
 

diff --git a/packaging/capi-system-info.spec b/packaging/capi-system-info.spec
index 3b29404..a2c4da0 100644 (file)
--- a/packaging/capi-system-info.spec
+++ b/packaging/capi-system-info.spec
@@ -6,7 +6,6 @@ Summary:        A System Information library in Core API
 Group:          System/API
 Source0:        %{name}-%{version}.tar.gz
 Source1001:     %{name}.manifest
-Source2001:     tizenid.service
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(dlog)
@@ -14,6 +13,7 @@ BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
 
@@ -32,17 +32,13 @@ cp %{SOURCE1001} .
 
 %define config_file_path /etc/config/model-config.xml
 %define info_file_path /etc/info.ini
-%define os_release_file_path /etc/os-release
-%define serial_path /csa/imei/serialno.dat
-%define tizen_id_path /etc/tizenid
+%define tizen_id_path %{TZ_SYS_ETC}/tizenid
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
 %cmake . -DCONFIG_FILE_PATH=%{config_file_path} \
                 -DINFO_FILE_PATH=%{info_file_path} \
-                -DOS_RELEASE_FILE_PATH=%{os_release_file_path} \
-                -DSERIAL_PATH=%{serial_path} \
                 -DMAJORVER=${MAJORVER} \
                 -DFULLVER=%{version} \
                 -DTIZEN_ID_PATH=%{tizen_id_path}

diff --git a/src/tizenid/CMakeLists.txt b/src/tizenid/CMakeLists.txt
index 2955e2c..0cf7989 100755 (executable)
--- a/src/tizenid/CMakeLists.txt
+++ b/src/tizenid/CMakeLists.txt
@@ -28,4 +28,10 @@ ADD_EXECUTABLE(${TIZENID} ${SRCS})
 TARGET_LINK_LIBRARIES(${TIZENID} ${tizenid_pkgs_LDFLAGS})
 
 INSTALL(TARGETS ${TIZENID} DESTINATION bin)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/tizenid.service DESTINATION lib/systemd/system)
+
+CONFIGURE_FILE(
+               tizenid.service.in
+               ${CMAKE_CURRENT_SOURCE_DIR}/tizenid.service
+               @ONLY
+)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tizenid.service DESTINATION lib/systemd/system)

diff --git a/packaging/tizenid.service b/src/tizenid/tizenid.service.in
similarity index 65%
rename from packaging/tizenid.service
rename to src/tizenid/tizenid.service.in
index 75bf12e..4a908e9 100644 (file)
--- a/packaging/tizenid.service
+++ b/src/tizenid/tizenid.service.in
@@ -4,7 +4,7 @@ Description=Making Tizen ID
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/tizen_id
-ExecStartPost=/usr/bin/chsmack -a "System::Shared" /etc/tizenid
+ExecStartPost=/usr/bin/chsmack -a "System::Shared" @TIZEN_ID_PATH@
 
 [Install]
 WantedBy=multi-user.target