Fix conf filename format to {module}-profile-{profile}.conf

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a5b58e..49efd97 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -340,11 +340,11 @@ IF(BATTERY_MODULE STREQUAL on)
        ADD_SUBDIRECTORY(plugins/wearable/battery)
 ENDIF()
 
-INSTALL_CONF(conf mobile-display)
-INSTALL_CONF(conf wearable-display)
-INSTALL_CONF(conf tv-display)
-INSTALL_CONF(conf iot-headed-display)
-INSTALL_CONF(conf iot-headless-input)
+INSTALL_CONF(conf display-profile-mobile)
+INSTALL_CONF(conf display-profile-wearable)
+INSTALL_CONF(conf display-profile-tv)
+INSTALL_CONF(conf display-profile-iot-headed)
+INSTALL_CONF(conf input-profile-iot-headless)
 
 # Tests
 ADD_SUBDIRECTORY(tests/deviced-common-private-test)

diff --git a/conf/iot-headed-display.conf b/conf/display-profile-iot-headed.conf
similarity index 100%
rename from conf/iot-headed-display.conf
rename to conf/display-profile-iot-headed.conf

diff --git a/conf/mobile-display.conf b/conf/display-profile-mobile.conf
similarity index 100%
rename from conf/mobile-display.conf
rename to conf/display-profile-mobile.conf

diff --git a/conf/tv-display.conf b/conf/display-profile-tv.conf
similarity index 100%
rename from conf/tv-display.conf
rename to conf/display-profile-tv.conf

diff --git a/conf/wearable-display.conf b/conf/display-profile-wearable.conf
similarity index 100%
rename from conf/wearable-display.conf
rename to conf/display-profile-wearable.conf

diff --git a/conf/iot-headless-input.conf b/conf/input-profile-iot-headless.conf
similarity index 100%
rename from conf/iot-headless-input.conf
rename to conf/input-profile-iot-headless.conf

diff --git a/packaging/deviced.spec b/packaging/deviced.spec
index e45ed0c..1cbbc79 100644 (file)
--- a/packaging/deviced.spec
+++ b/packaging/deviced.spec
@@ -222,7 +222,7 @@ update-alternatives --remove shutdown %{_sbindir}/deviced-power-command || :
 %postun -n libdeviced -p /sbin/ldconfig
 
 %post plugin-profile-mobile
-mv %{_sysconfdir}/deviced/mobile-display.conf %{_sysconfdir}/deviced/display.conf
+mv %{_sysconfdir}/deviced/display-profile-mobile.conf %{_sysconfdir}/deviced/display.conf
 mkdir -p %{_libdir}/deviced
 mv %{_libdir}/mobile-display.so %{_libdir}/deviced/display.so
 %if %{?battery_module} == on
@@ -230,7 +230,7 @@ mv %{_libdir}/mobile-battery.so %{_libdir}/deviced/battery.so
 %endif
 
 %post plugin-profile-wearable
-mv %{_sysconfdir}/deviced/wearable-display.conf %{_sysconfdir}/deviced/display.conf
+mv %{_sysconfdir}/deviced/display-profile-wearable.conf %{_sysconfdir}/deviced/display.conf
 mkdir -p %{_libdir}/deviced
 mv %{_libdir}/wearable-display.so %{_libdir}/deviced/display.so
 %if %{?battery_module} == on
@@ -238,17 +238,17 @@ mv %{_libdir}/wearable-battery.so %{_libdir}/deviced/battery.so
 %endif
 
 %post plugin-profile-tv
-mv %{_sysconfdir}/deviced/tv-display.conf %{_sysconfdir}/deviced/display.conf
+mv %{_sysconfdir}/deviced/display-profile-tv.conf %{_sysconfdir}/deviced/display.conf
 mkdir -p %{_libdir}/deviced
 mv %{_libdir}/tv-display.so %{_libdir}/deviced/display.so
 
 %post plugin-profile-iot-headed
-mv %{_sysconfdir}/deviced/iot-headed-display.conf %{_sysconfdir}/deviced/display.conf
+mv %{_sysconfdir}/deviced/display-profile-iot-headed.conf %{_sysconfdir}/deviced/display.conf
 mkdir -p %{_libdir}/deviced
 mv %{_libdir}/iot-headed-display.so %{_libdir}/deviced/display.so
 
 %post plugin-profile-iot-headless
-mv %{_sysconfdir}/deviced/iot-headless-input.conf %{_sysconfdir}/deviced/input.conf
+mv %{_sysconfdir}/deviced/input-profile-iot-headless.conf %{_sysconfdir}/deviced/input.conf
 mkdir -p %{_libdir}/deviced
 mv %{_libdir}/iot-headless-input-handler.so %{_libdir}/deviced/input-handler.so
 mv %{_libdir}/iot-headless-power.so %{_libdir}/deviced/power.so
@@ -332,7 +332,7 @@ mv %{_libdir}/iot-headless-battery.so %{_libdir}/deviced/battery.so
 %manifest deviced.manifest
 %license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/deviced/mobile-display.conf
+%config %{_sysconfdir}/deviced/display-profile-mobile.conf
 %{_libdir}/mobile-display.so
 %if %{?battery_module} == on
 %{_libdir}/mobile-battery.so
@@ -344,7 +344,7 @@ mv %{_libdir}/iot-headless-battery.so %{_libdir}/deviced/battery.so
 %manifest deviced.manifest
 %license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/deviced/wearable-display.conf
+%config %{_sysconfdir}/deviced/display-profile-wearable.conf
 %{_libdir}/wearable-display.so
 %if %{?battery_module} == on
 %{_libdir}/wearable-battery.so
@@ -356,7 +356,7 @@ mv %{_libdir}/iot-headless-battery.so %{_libdir}/deviced/battery.so
 %manifest deviced.manifest
 %license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/deviced/tv-display.conf
+%config %{_sysconfdir}/deviced/display-profile-tv.conf
 %{_libdir}/tv-display.so
 %{_unitdir}/rndis.service
 %{_bindir}/rndis.sh
@@ -365,7 +365,7 @@ mv %{_libdir}/iot-headless-battery.so %{_libdir}/deviced/battery.so
 %manifest deviced.manifest
 %license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/deviced/iot-headed-display.conf
+%config %{_sysconfdir}/deviced/display-profile-iot-headed.conf
 %{_libdir}/iot-headed-display.so
 %{_unitdir}/rndis.service
 %{_bindir}/rndis.sh
@@ -374,7 +374,7 @@ mv %{_libdir}/iot-headless-battery.so %{_libdir}/deviced/battery.so
 %manifest deviced.manifest
 %license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/deviced/iot-headless-input.conf
+%config %{_sysconfdir}/deviced/input-profile-iot-headless.conf
 %{_libdir}/iot-headless-input-handler.so
 %{_libdir}/iot-headless-power.so
 %{_libdir}/iot-headless-battery.so