diff options
Diffstat (limited to 'service/system/config/library')
4 files changed, 14 insertions, 14 deletions
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 --- 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 --- 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 --- 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 --- 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 ;\ |