Rename conf file for consistency

Change-Id: I37b3ffdad300b2902586615f93bef1657796df71
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/packaging/resourced.spec b/packaging/resourced.spec
index 312e69a..45bad5d 100644 (file)
--- a/packaging/resourced.spec
+++ b/packaging/resourced.spec
@@ -190,13 +190,13 @@ if [ $1 -eq 0 ]; then
 fi
 
 %post config-tv
-%{_sbindir}/update-alternatives --install %{confdir}/config-tv-memory.conf resourced-config-memory %{confdir}/configs/config-tv-memory.conf 150
-%{_sbindir}/update-alternatives --install %{confdir}/config-tv-vip-process.conf resourced-config-vip-process %{confdir}/configs/config-tv-vip-process.conf 150
+%{_sbindir}/update-alternatives --install %{confdir}/memory.conf resourced-config-memory %{confdir}/configs/config-memory-tv.conf 150
+%{_sbindir}/update-alternatives --install %{confdir}/vip-process.conf resourced-config-vip-process %{confdir}/configs/config-vip-process-tv.conf 150
 
 %preun config-tv
 if [ $1 -eq 0 ]; then
-       %{_sbindir}/update-alternatives --remove resourced-config-memory %{confdir}/configs/config-tv-memory.conf
-       %{_sbindir}/update-alternatives --remove resourced-config-vip-process %{confdir}/configs/config-tv-vip-process.conf
+       %{_sbindir}/update-alternatives --remove resourced-config-memory %{confdir}/configs/config-memory-tv.conf
+       %{_sbindir}/update-alternatives --remove resourced-config-vip-process %{confdir}/configs/config-vip-process-tv.conf
 fi
 
 %files
@@ -233,8 +233,8 @@ fi
 
 %files config-tv
 %manifest resourced.manifest
-%{confdir}/configs/config-tv-memory.conf
-%{confdir}/configs/config-tv-vip-process.conf
+%{confdir}/configs/config-memory-tv.conf
+%{confdir}/configs/config-vip-process-tv.conf
 
 %if %{?mem_stress} == ON
 %files mem-stress

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 86a3efe..327cbc1 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -212,10 +212,8 @@ INSTALL(TARGETS ${RD_BINARY_NAME}
   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE WORLD_EXECUTE)
 
 IF("${MEMORY_MODULE}" STREQUAL "ON")
-       INSTALL(FILES ${MEMORY_SOURCE_DIR}/memory.conf
-               DESTINATION ${RD_CONFIG_PATH} RENAME memory.conf)
-       INSTALL(FILES ${MEMORY_SOURCE_DIR}/memory_tv.conf
-               DESTINATION ${RD_CONFIG_PATH} RENAME tv-memory.conf)
+       INSTALL(FILES ${MEMORY_SOURCE_DIR}/memory.conf DESTINATION ${RD_CONFIG_PATH})
+       INSTALL(FILES ${MEMORY_SOURCE_DIR}/memory-tv.conf DESTINATION ${RD_CONFIG_PATH})
 ENDIF()
 
 IF("${CPU_MODULE}" STREQUAL "ON")
@@ -231,12 +229,8 @@ IF("${VIP_AGENT}" STREQUAL "ON")
   ADD_EXECUTABLE(vip-release-agent ${VIP_SOURCE_DIR}/vip-release-agent.c)
   TARGET_LINK_LIBRARIES(vip-release-agent resourced-private-api dlog)
   INSTALL(TARGETS vip-release-agent DESTINATION bin)
-  INSTALL(FILES ${VIP_SOURCE_DIR}/vip-process.conf
-    DESTINATION
-       ${RD_CONFIG_PATH} RENAME vip-process.conf)
-  INSTALL(FILES ${VIP_SOURCE_DIR}/vip-process_tv.conf
-    DESTINATION
-       ${RD_CONFIG_PATH} RENAME tv-vip-process.conf)
+  INSTALL(FILES ${VIP_SOURCE_DIR}/vip-process.conf DESTINATION ${RD_CONFIG_PATH})
+  INSTALL(FILES ${VIP_SOURCE_DIR}/vip-process-tv.conf DESTINATION ${RD_CONFIG_PATH})
 ENDIF()
 
 INSTALL(FILES ${PROC-STAT_SOURCE_DIR}/proc.conf

diff --git a/src/memory/memory_tv.conf b/src/memory/memory-tv.conf
similarity index 100%
rename from src/memory/memory_tv.conf
rename to src/memory/memory-tv.conf

diff --git a/src/vip-agent/vip-process_tv.conf b/src/vip-agent/vip-process-tv.conf
similarity index 100%
rename from src/vip-agent/vip-process_tv.conf
rename to src/vip-agent/vip-process-tv.conf