diff options
| author |   Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2020-11-22 01:54:33 +0000 |
|---|---|---|
| committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2020-11-23 13:54:59 +0000 |
| commit | 761d3a409fb8ddb3e01e1eded4aaab17bb4a155f (patch) | |
| tree | 6797033ec08f907699824c2662a9bfd36f616be8 /service/system/system_manager | |
| parent | 23d40b490b2e6735d70d413e6a147d78b1898c8b (diff) | |
Fix path to various non-standard directories
Fix path to non-standard directories,
- /nv to /var/local/lib/basesystem/nv
- /ramd to /var/local/lib/basesystem/ramd
- /tool_9E_SI to /etc/basesystem
- /usr/target to /etc/basesystem/target
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Change-Id: I42a54624230cb0ec0271f8cdbacb0b178c9f3e8e
Diffstat (limited to 'service/system/system_manager')
3 files changed, 3 insertions, 3 deletions
diff --git a/service/system/system_manager/server/Makefile b/service/system/system_manager/server/Makefile index 9f50e80..d4cff62 100755 --- a/service/system/system_manager/server/Makefile +++ b/service/system/system_manager/server/Makefile @@ -110,7 +110,7 @@ install_data: $(SDKTARGETSYSROOT)/usr/share/basesystem/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg 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)/var/local/lib/basesystem/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 install -m 644 ./PhaseInfo.txt $(DESTDIR)/usr/share/basesystem/BS/ss/system_manager/rodata diff --git a/service/system/system_manager/server/src/ss_system_manager.cpp b/service/system/system_manager/server/src/ss_system_manager.cpp index 8e26f23..0b5d07a 100755 --- a/service/system/system_manager/server/src/ss_system_manager.cpp +++ b/service/system/system_manager/server/src/ss_system_manager.cpp @@ -95,7 +95,7 @@ using namespace std; // NOLINT static CSystemManager g_oSystemManger; -#define SS_SM_TEMP_FILE_FOR_STORE_LOGS "/nv/BS/ss/system_manager/rwdata/sm_tempStoreLogs" +#define SS_SM_TEMP_FILE_FOR_STORE_LOGS "/var/local/lib/basesystem/nv/BS/ss/system_manager/rwdata/sm_tempStoreLogs" #define TR_USB_PATH "/usr/agl/bin/realtimeUsbLog" // \brief: public structure that is used for logging by NSLogger. diff --git a/service/system/system_manager/server/src/ss_system_manager_callbacks.cpp b/service/system/system_manager/server/src/ss_system_manager_callbacks.cpp index 2e597ce..2e32fc8 100755 --- a/service/system/system_manager/server/src/ss_system_manager_callbacks.cpp +++ b/service/system/system_manager/server/src/ss_system_manager_callbacks.cpp @@ -2000,7 +2000,7 @@ EFrameworkunifiedStatus CSystemManager::perform_force_reset(HANDLE hApp) { "NO NAVIDET!! but SendShutdownComp for FactReset"); CALL_AND_LOG_STATUS(send_shutdown_complete_response(hApp)); // LCOV_EXCL_BR_LINE 15: marco defined in ss_templates.h // NOLINT(whitespace/line_length) sleep(60); - } else if (access("/nv/BS/ss/system_manager/rwdata/ss_debug", F_OK) == 0) { + } else if (access("/var/local/lib/basesystem/nv/BS/ss/system_manager/rwdata/ss_debug", F_OK) == 0) { fprintf(stderr, "SS_SysManager/%s/NO NAVIDET!! but SendShutdownComp\n", __FUNCTION__); FRAMEWORKUNIFIEDLOG(ZONE_ERR, __FUNCTION__, "NO NAVIDET!! but SendShutdownComp"); CALL_AND_LOG_STATUS(send_shutdown_complete_response(hApp)); // LCOV_EXCL_BR_LINE 15: marco defined in ss_templates.h // NOLINT(whitespace/line_length) |