summaryrefslogtreecommitdiffstats
path: root/service/system/system_manager
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2020-11-22 09:58:42 +0900
committerTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2020-11-23 13:38:54 +0000
commit23d40b490b2e6735d70d413e6a147d78b1898c8b (patch)
treebba5789f6b5d6a1771677ead07129e43c6df857f /service/system/system_manager
parentf375d527c775582f4229a94d96177f18d80f0008 (diff)
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
Diffstat (limited to 'service/system/system_manager')
-rwxr-xr-xservice/system/system_manager/server/Makefile4
-rwxr-xr-xservice/system/system_manager/server/include/ss_sm_default_paths.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/service/system/system_manager/server/Makefile b/service/system/system_manager/server/Makefile
index 6d13bb7..9f50e80 100755
--- 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
--- 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";