Fix the path to the host specific system configurations

Fix the path to the host specific system configurations,
'/usr/conf/' to follow the standard '/etc'.
And all configurations of agl basesystem should stored
under subdirectory, 'basesystem'.

Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Change-Id: I2be55d483a4a359e69250fc36d1f03a55a01cd8e

diff --git a/service/native/backup_manager/config/Makefile b/service/native/backup_manager/config/Makefile
index b307a66..bbd66e6 100755 (executable)
--- a/service/native/backup_manager/config/Makefile
+++ b/service/native/backup_manager/config/Makefile
@@ -37,6 +37,6 @@ $(ID_HEADER): $(XML_PATH)/$(ALL_XML)
 CLEAN_FILES := $(ID_HEADER)
 
 install: $(XML_PATH)/$(BACKUP_XML)
-       install -m 0755 -d $(DESTDIR)/usr/agl/conf/BS/ns/backup_manager/rodata
-       install -m 0644 $(XML_PATH)/$(BACKUP_XML) $(DESTDIR)/usr/agl/conf/BS/ns/backup_manager/rodata/
+       install -m 0755 -d $(DESTDIR)/etc/basesystem/BS/ns/backup_manager/rodata
+       install -m 0644 $(XML_PATH)/$(BACKUP_XML) $(DESTDIR)/etc/basesystem/BS/ns/backup_manager/rodata/
 include ../../native_service.mk

diff --git a/service/native/backup_manager/server/src/bkup_param.cpp b/service/native/backup_manager/server/src/bkup_param.cpp
index 900779b..581524b 100755 (executable)
--- a/service/native/backup_manager/server/src/bkup_param.cpp
+++ b/service/native/backup_manager/server/src/bkup_param.cpp
@@ -35,7 +35,7 @@
 #include "bkup_util.h"
 
 #define BKUP_XML_PATH_MAX 100
-#define BKUP_XML_PATH "/usr/agl/conf/BS/ns/backup_manager/rodata/"
+#define BKUP_XML_PATH "/etc/basesystem/BS/ns/backup_manager/rodata/"
 #define BKUP_XML_PREFIX "backup_"
 #define BKUP_XML_EXTENSION ".xml"
 

diff --git a/service/native/framework_unified/client/Makefile b/service/native/framework_unified/client/Makefile
index 29ed628..b97ef4a 100755 (executable)
--- a/service/native/framework_unified/client/Makefile
+++ b/service/native/framework_unified/client/Makefile
@@ -263,7 +263,7 @@ install-data:install_cfg
        install -d -m 775 $(DESTDIR)/nv/BS/ns/framework_unified/rwdata
 
 install_cfg:
-       install -d -m 775 $(DESTDIR)/usr/agl/conf/BS/ns/framework_unified/rodata
-       install -m 644 -t $(DESTDIR)/usr/agl/conf/BS/ns/framework_unified/rodata NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg
+       install -d -m 775 $(DESTDIR)/etc/basesystem/BS/ns/framework_unified/rodata
+       install -m 644 -t $(DESTDIR)/etc/basesystem/BS/ns/framework_unified/rodata NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg
 
 include ../../native_service.mk

diff --git a/service/native/framework_unified/client/NS_Logger/src/ns_logger.cpp b/service/native/framework_unified/client/NS_Logger/src/ns_logger.cpp
index 94f775c..3d09650 100755 (executable)
--- a/service/native/framework_unified/client/NS_Logger/src/ns_logger.cpp
+++ b/service/native/framework_unified/client/NS_Logger/src/ns_logger.cpp
@@ -106,7 +106,7 @@ FRAMEWORKUNIFIEDLOGSYSEVENTPARAM g_FrameworkunifiedLogSysEventParams = {FALSE};
 #define ZONEMASK_MAX BITS_IN_TZONE  // ((UI_32)(BITS_IN_TZONE * TZONE_COUNT))
 
 #define FRAMEWORKUNIFIEDLOG_DEFAULT_FLAG_ID (0)
-#define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN "/usr/agl/conf/BS/ns/framework_unified/rodata/ns_logger_frameworkunifiedlog__CWORD84_.cfg"
+#define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__FN "/etc/basesystem/BS/ns/framework_unified/rodata/ns_logger_frameworkunifiedlog__CWORD84_.cfg"
 #define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__TMP "ns_logger_frameworkunifiedlog__CWORD84_.tmp"
 #define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV "ns_logger_frameworkunifiedlog__CWORD84_.cfg"
 

diff --git a/service/native/framework_unified/client/NativeServices/Makefile b/service/native/framework_unified/client/NativeServices/Makefile
index c346b28..de8de1d 100755 (executable)
--- a/service/native/framework_unified/client/NativeServices/Makefile
+++ b/service/native/framework_unified/client/NativeServices/Makefile
@@ -23,7 +23,7 @@ all:
 install-data:install_cfg
 
 install_cfg:
-       install -d -m 775 $(SDKTARGETSYSROOT)/usr/agl/conf/ns_logger
-       install -m 644 -t $(SDKTARGETSYSROOT)/usr/agl/conf/ns_logger scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg
+       install -d -m 775 $(SDKTARGETSYSROOT)/etc/basesystem/ns_logger
+       install -m 644 -t $(SDKTARGETSYSROOT)/etc/basesystem/ns_logger scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg
 
 include ../../../native_service.mk

diff --git a/service/system/config/library/system_manager_config/last2order/Makefile b/service/system/config/library/system_manager_config/last2order/Makefile
index 8384d72..5962200 100755 (executable)
--- a/service/system/config/library/system_manager_config/last2order/Makefile
+++ b/service/system/config/library/system_manager_config/last2order/Makefile
@@ -16,13 +16,13 @@
 
 # ==== Customization ================
 #Directory path located XMLs for conversion
-CONFXML_DIR_PATH ?= $(SDKTARGETSYSROOT)/usr/agl/conf/sm_last2order
+CONFXML_DIR_PATH ?= $(SDKTARGETSYSROOT)/etc/basesystem/sm_last2order
 
 #path to order file
 ORDER_DEF_PATH ?= $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_wakeup_order.h
 
 #path to be installed CFO file
-CONF_INSTALL_DIR ?= $(SDKTARGETSYSROOT)/usr/agl/conf/systemmanager
+CONF_INSTALL_DIR ?= $(SDKTARGETSYSROOT)/etc/basesystem/systemmanager
 
 # ==================================
 
@@ -43,8 +43,8 @@ _all:$(CFOFILES)
 install:install-pre install-cfo 
 
 install-pre:
-       install -d -m 775  $(DESTDIR)/usr/agl/conf/sm_last2order;\
-       install -m 644 -t  $(DESTDIR)/usr/agl/conf/systemmanager sm_last2order.cfo 
+       install -d -m 775  $(DESTDIR)/etc/basesystem/sm_last2order;\
+       install -m 644 -t  $(DESTDIR)/etc/basesystem/systemmanager sm_last2order.cfo 
 
 install-cfo:_all
        set -e ;\

diff --git a/service/system/config/library/system_manager_config/order/Makefile b/service/system/config/library/system_manager_config/order/Makefile
index e0d68fe..87c7777 100755 (executable)
--- a/service/system/config/library/system_manager_config/order/Makefile
+++ b/service/system/config/library/system_manager_config/order/Makefile
@@ -18,14 +18,14 @@
 HOST_CPP = cpp
 HOST_ORDER_XML2CFG = ./launch_order_xml2cfg.pl
 
-CONF_DIR = $(SDKTARGETSYSROOT)/usr/agl/conf
+CONF_DIR = $(SDKTARGETSYSROOT)/etc/basesystem
 CONF_WON_H = $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_wakeup_order.h
 
 LAUNCH_XMLFILES = $(shell cd $(CONF_DIR)/sm_launch; ls *.xml)
 ORDER_XMLFILES = $(LAUNCH_XMLFILES:%.xml=%.order)
 ORDER_CFGFILES = $(ORDER_XMLFILES:%.order=%.order.cfg)
 
-INST_CONFDIR = $(SDKTARGETSYSROOT)/usr/agl/conf/systemmanager
+INST_CONFDIR = $(SDKTARGETSYSROOT)/etc/basesystem/systemmanager
 
 CLEAN_FILES = launch_order_body.xml $(ORDER_CFGFILES)
 
@@ -35,7 +35,7 @@ VPATH += ../xml
 install:install-pre install-cfg
 
 install-pre:
-       install -m 644 -t  $(DESTDIR)/usr/agl/conf/sm_launch system_launcher_main.xml 
+       install -m 644 -t  $(DESTDIR)/etc/basesystem/sm_launch system_launcher_main.xml 
 
 install-cfg:$(ORDER_CFGFILES)
        set -e                                 ;\

diff --git a/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp b/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp
index 0459af1..ab28019 100755 (executable)
--- a/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp
+++ b/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp
@@ -130,7 +130,7 @@ static EFrameworkunifiedStatus setEvnVariableForLaunchConfigFile(std::string f_s
         l_pLaunchConfigFile = LaunchConfigFileName2;
       }
 
-      std::string cnfPath = "/usr/agl/conf/BS/ss/system_manager/rwdata/";
+      std::string cnfPath = "/etc/basesystem/BS/ss/system_manager/rwdata/";
       cnfPath += l_pLaunchConfigFile;
       if (access(cnfPath.c_str(), F_OK) != 0) {
         l_pLaunchConfigFile = LaunchConfigFileName1;

diff --git a/service/system/config/library/system_manager_config/xml/Makefile b/service/system/config/library/system_manager_config/xml/Makefile
index b73fdc2..aed3c27 100755 (executable)
--- a/service/system/config/library/system_manager_config/xml/Makefile
+++ b/service/system/config/library/system_manager_config/xml/Makefile
@@ -18,13 +18,13 @@
 HOST_CPP = cpp
 HOST_LAUNCH_XML2CFG = ./launch_xml2cfg.sh
 
-CONF_DIR = $(SDKTARGETSYSROOT)/usr/agl/conf
+CONF_DIR = $(SDKTARGETSYSROOT)/etc/basesystem
 CONF_THREAD_H = $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_thread.h
 
 LAUNCH_XMLFILES = $(shell cd $(CONF_DIR)/sm_launch; ls *.xml)
 LAUNCH_CFGFILES = $(LAUNCH_XMLFILES:%.xml=%.cfg)
 
-INST_CONFDIR = $(SDKTARGETSYSROOT)/usr/agl/conf/systemmanager
+INST_CONFDIR = $(SDKTARGETSYSROOT)/etc/basesystem/systemmanager
 
 CLEAN_FILES = system_launcher_body.xml $(LAUNCH_CFGFILES)
 
@@ -33,10 +33,10 @@ VPATH = $(CONF_DIR)/sm_launch
 install:install-pre install-cfg
 
 install-pre:
-       install -d -m 775  $(DESTDIR)/usr/agl/conf;\
-       install -d -m 775  $(DESTDIR)/usr/agl/conf/sm_launch;\
-       install -d -m 775  $(DESTDIR)/usr/agl/conf/systemmanager;\
-       install -m 644 -t  $(DESTDIR)/usr/agl/conf/sm_launch sm_launch_agl.xml 
+       install -d -m 775  $(DESTDIR)/etc/basesystem;\
+       install -d -m 775  $(DESTDIR)/etc/basesystem/sm_launch;\
+       install -d -m 775  $(DESTDIR)/etc/basesystem/systemmanager;\
+       install -m 644 -t  $(DESTDIR)/etc/basesystem/sm_launch sm_launch_agl.xml 
 
 install-cfg:$(LAUNCH_CFGFILES)
        set -e                                 ;\

diff --git a/service/system/interface_unified/Makefile.client b/service/system/interface_unified/Makefile.client
index de16e15..4925383 100755 (executable)
--- a/service/system/interface_unified/Makefile.client
+++ b/service/system/interface_unified/Makefile.client
@@ -19,14 +19,14 @@ SUBDIRS := library
 install:install_cfg install_cfg_pram
 
 install_cfg_pram:
-       install -d -m 775  $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata
-       install -m 644 -t  $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata scfg_pram/gpf_ss_sm_config_data.cfg
+       install -d -m 775  $(DESTDIR)/etc/basesystem/BS/ss/system_manager/rwdata
+       install -m 644 -t  $(DESTDIR)/etc/basesystem/BS/ss/system_manager/rwdata scfg_pram/gpf_ss_sm_config_data.cfg
 
 install_cfg:
-       install -d -m 775  $(DESTDIR)/usr/agl/conf/BS/ss/power_service/rodata
-       install -m 644 -t  $(DESTDIR)/usr/agl/conf/BS/ss/power_service/rodata scfg/gpf_ss_ps_config.cfg
-       install -d -m 775  $(DESTDIR)/usr/agl/conf/BS/ss/logger_service/rodata
-       install -m 644 -t  $(DESTDIR)/usr/agl/conf/BS/ss/logger_service/rodata scfg/ss_logger.cfg
+       install -d -m 775  $(DESTDIR)/etc/basesystem/BS/ss/power_service/rodata
+       install -m 644 -t  $(DESTDIR)/etc/basesystem/BS/ss/power_service/rodata scfg/gpf_ss_ps_config.cfg
+       install -d -m 775  $(DESTDIR)/etc/basesystem/BS/ss/logger_service/rodata
+       install -m 644 -t  $(DESTDIR)/etc/basesystem/BS/ss/logger_service/rodata scfg/ss_logger.cfg
 
 include ../system_service.mk
 

diff --git a/service/system/interface_unified/library/include/ss_last_to_order_local.h b/service/system/interface_unified/library/include/ss_last_to_order_local.h
index 889a733..b806eec 100755 (executable)
--- a/service/system/interface_unified/library/include/ss_last_to_order_local.h
+++ b/service/system/interface_unified/library/include/ss_last_to_order_local.h
@@ -33,7 +33,7 @@
 
 #include <string>
 
-#define SS_LAST_TO_ORDER_CONF_PATH "/usr/agl/conf/BS/ss/system_manager/rodata/sm_last2order.cfo"
+#define SS_LAST_TO_ORDER_CONF_PATH "/etc/basesystem/BS/ss/system_manager/rodata/sm_last2order.cfo"
 
 #endif  // INTERFACE_UNIFIED_LIBRARY_INCLUDE_SS_LAST_TO_ORDER_LOCAL_H_
 /** @}*/

diff --git a/service/system/logger_service/server/lib/ss_logger_store_logs.cpp b/service/system/logger_service/server/lib/ss_logger_store_logs.cpp
index 2bd8b79..a391844 100755 (executable)
--- a/service/system/logger_service/server/lib/ss_logger_store_logs.cpp
+++ b/service/system/logger_service/server/lib/ss_logger_store_logs.cpp
@@ -51,7 +51,7 @@
 #include "ss_logger_store_logs_loggerservicelog.h"
 #include "ss_logger_cfg.h"
 
-#define LOGGERSERVICELOG_CONFIG_PATH       "/usr/agl/conf/BS/ss/logger_service/rodata/ss_logger.cfg"
+#define LOGGERSERVICELOG_CONFIG_PATH       "/etc/basesystem/BS/ss/logger_service/rodata/ss_logger.cfg"
 #define LOGGER_TMP_FN            "__LOGGER.tmp"
 #define LOGGERSERVICELOG_TMP_OUTPUT_PATH   "/tmp"
 #define PSTORE_DIR_PATH          "/dev/pstore"

diff --git a/service/system/logger_service/server/src/loggerservice_application.cpp b/service/system/logger_service/server/src/loggerservice_application.cpp
index 2d39fb2..afec695 100755 (executable)
--- a/service/system/logger_service/server/src/loggerservice_application.cpp
+++ b/service/system/logger_service/server/src/loggerservice_application.cpp
@@ -178,7 +178,7 @@ EFrameworkunifiedStatus FrameworkunifiedOnInitialization(HANDLE hApp) {
   LOG_STATUS_IF_ERRORED(l_eStatus, "g_loggerCfg.Initialize()");  // LCOV_EXCL_BR_LINE 15: macro
 
   std::string l_cfgFilePathAndName =
-      "/usr/agl/conf/BS/ss/logger_service/rodata/ss_logger.cfg";
+      "/etc/basesystem/BS/ss/logger_service/rodata/ss_logger.cfg";
   if (eFrameworkunifiedStatusOK != (l_eStatus = g_loggerCfg.Load(l_cfgFilePathAndName))) {  // LCOV_EXCL_BR_LINE 200:To ensure success
     // LCOV_EXCL_START 200:To ensure success
     AGL_ASSERT_NOT_TESTED();  // LCOV_EXCL_LINE 200: test assert

diff --git a/service/system/power_service/server/src/ss_power.cpp b/service/system/power_service/server/src/ss_power.cpp
index 26e8881..62ab629 100755 (executable)
--- a/service/system/power_service/server/src/ss_power.cpp
+++ b/service/system/power_service/server/src/ss_power.cpp
@@ -135,7 +135,7 @@ EFrameworkunifiedStatus Power::Initialize(HANDLE h_app) {
   pthread_mutex_init(&pwr_hist_mutex, NULL);
 
   /// Open and parse the configuration data for Power
-  const CHAR configFileName[] = "/usr/agl/conf/BS/ss/power_service/rodata/gpf_ss_ps_config.cfg";
+  const CHAR configFileName[] = "/etc/basesystem/BS/ss/power_service/rodata/gpf_ss_ps_config.cfg";
 
   PowerConfiguration config(configFileName);
   l_SpecifiedCfgLoaded = config.LoadParameters(m_tConfigData);

diff --git a/service/system/system_manager/server/Makefile b/service/system/system_manager/server/Makefile
index 6d13bb7..9f50e80 100755 (executable)
--- a/service/system/system_manager/server/Makefile
+++ b/service/system/system_manager/server/Makefile
@@ -108,8 +108,8 @@ install-data: install_data
 install_data:
        cpp -P -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_thread.h ./sm_launch__CWORD84_.xml ./sm_launch.tmp.xml
        $(SDKTARGETSYSROOT)/usr/share/basesystem/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg
-       install -d -m 755 $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata
-       install -m 644 ./sm_launch.cfg $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata
+       install -d -m 755 $(DESTDIR)/etc/basesystem/BS/ss/system_manager/rwdata
+       install -m 644 ./sm_launch.cfg $(DESTDIR)/etc/basesystem/BS/ss/system_manager/rwdata
        install -d -m 755 $(DESTDIR)/nv/BS/ss/system_manager/rwdata
        install -d -m 755 $(DESTDIR)/usr/share/basesystem/BS/ss/system_manager/rodata
        install -m 644 ./version.txt $(DESTDIR)/usr/share/basesystem/BS/ss/system_manager/rodata

diff --git a/service/system/system_manager/server/include/ss_sm_default_paths.h b/service/system/system_manager/server/include/ss_sm_default_paths.h
index 8ffafd9..286aa21 100755 (executable)
--- a/service/system/system_manager/server/include/ss_sm_default_paths.h
+++ b/service/system/system_manager/server/include/ss_sm_default_paths.h
@@ -34,7 +34,7 @@ const CHAR UsingVMPlayerVariable[]              = "USING_VM_PLAYER";
  */
 const CHAR DefaultBasePath[]                = "";
 const CHAR DefaultBinaryPath[]              = "/agl/bin/";
-const CHAR DefaultConfigFilesPath[]         = "/usr/agl/conf/BS/ss/system_manager/rwdata/";
+const CHAR DefaultConfigFilesPath[]         = "/etc/basesystem/BS/ss/system_manager/rwdata/";
 const CHAR DefaultLaunchConfigFileName[]    = "sm_launch.cfg";
 const CHAR DefaultSMConfigFileName[]        = "gpf_ss_sm_config_data.cfg";
 

diff --git a/service/system/task_manager/client/libtskmcfg/Makefile b/service/system/task_manager/client/libtskmcfg/Makefile
index a7e4a9e..1f3d279 100755 (executable)
--- a/service/system/task_manager/client/libtskmcfg/Makefile
+++ b/service/system/task_manager/client/libtskmcfg/Makefile
@@ -45,8 +45,8 @@ install:install-pre install-pre-header
 build-lib:install-pre install-pre-header
 install-lib:install-pre install-pre-header
 install-pre:
-       install -d -m 775  $(DESTDIR)/usr/agl/conf/BS/ss/task_manager/rodata;\
-       install -m 644 -t  $(DESTDIR)/usr/agl/conf/BS/ss/task_manager/rodata $(WAKESHUTCONF_DIR)/tskm_launch.xml;\
+       install -d -m 775  $(DESTDIR)/etc/basesystem/BS/ss/task_manager/rodata;\
+       install -m 644 -t  $(DESTDIR)/etc/basesystem/BS/ss/task_manager/rodata $(WAKESHUTCONF_DIR)/tskm_launch.xml;\
 
 CONFIG_FILES:=tskm_wakeup.xml tskm_shutdown.xml tskm_wakeup_vup.xml tskm_shutdown_vup.xml tskm_launch.xml tskm_svcid.h agl_thread.h