From 761d3a409fb8ddb3e01e1eded4aaab17bb4a155f Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Sun, 22 Nov 2020 01:54:33 +0000 Subject: 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 Change-Id: I42a54624230cb0ec0271f8cdbacb0b178c9f3e8e --- .../include/system_service/ss_logger_store_logs.h | 2 +- service/system/interface_unified/scfg/ss_logger.cfg | 16 ++++++++-------- service/system/logger_service/server/Makefile | 2 +- .../logger_service/server/include/ss_logger_common.h | 4 ++-- .../logger_service/server/include/ss_logger_scrshot.h | 6 +++--- .../server/src/ss_logger_error_event_cfg.cpp | 8 ++++---- .../server/src/ss_logger_error_event_responses.cpp | 4 ++-- .../system/logger_service/server/src/ss_logger_util.cpp | 4 ++-- .../library/include/system_service/ss_sm_ram_access.h | 8 ++++---- .../library/rom/src/ss_sm_ram_access.cpp | 2 +- .../library/rom/src/ss_sm_rom_access.cpp | 2 +- service/system/system_manager/server/Makefile | 2 +- .../system_manager/server/src/ss_system_manager.cpp | 2 +- .../server/src/ss_system_manager_callbacks.cpp | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) (limited to 'service/system') diff --git a/service/system/interface_unified/library/include/system_service/ss_logger_store_logs.h b/service/system/interface_unified/library/include/system_service/ss_logger_store_logs.h index 7c68fd9..b0211d6 100755 --- a/service/system/interface_unified/library/include/system_service/ss_logger_store_logs.h +++ b/service/system/interface_unified/library/include/system_service/ss_logger_store_logs.h @@ -42,7 +42,7 @@ #ifdef _cplusplus extern "C" { #endif -#define SS_LOGGER_SAVE_INTERFACEUNIFIEDLOG_FLAG "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/SS_LOGGER_SAVE_INTERFACEUNIFIEDLOG_FLAG" +#define SS_LOGGER_SAVE_INTERFACEUNIFIEDLOG_FLAG "/var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/SS_LOGGER_SAVE_INTERFACEUNIFIEDLOG_FLAG" typedef enum { SS_STORELOGS_INTERFACEUNIFIEDLOG = 0, diff --git a/service/system/interface_unified/scfg/ss_logger.cfg b/service/system/interface_unified/scfg/ss_logger.cfg index ffb4c50..3aa8cee 100755 --- a/service/system/interface_unified/scfg/ss_logger.cfg +++ b/service/system/interface_unified/scfg/ss_logger.cfg @@ -1,8 +1,8 @@ [LOGGING] LogMaxFileSize=5242880 PerformanceLogSize=262144 -EmmcOutputPath=/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog -EmmcOutputNaviLogPath=/nv/BS/ss/logger_service/rwdata/log2/awlog +EmmcOutputPath=/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog +EmmcOutputNaviLogPath=/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/log2/awlog Usb0MountPath=/mnt/sda1 Usb1MountPath=/mnt/sdb1 SdMountPath=/fs/sd0 @@ -24,32 +24,32 @@ ExternalLogMax=20 # "Remove" is removed or not after it is archived [EXTERNAL_1] -ExtLogPath=/ramd/log/frameworkunifiedlog/radio +ExtLogPath=/var/local/lib/basesystem/ramd/log/frameworkunifiedlog/radio OutputPath=radio Remove=false [EXTERNAL_2] -ExtLogPath=/ramd/log/frameworkunifiedlog/connectivity +ExtLogPath=/var/local/lib/basesystem/ramd/log/frameworkunifiedlog/connectivity OutputPath=connectivity Remove=false [EXTERNAL_3] -ExtLogPath=/ramd/log/frameworkunifiedlog/graphics.log +ExtLogPath=/var/local/lib/basesystem/ramd/log/frameworkunifiedlog/graphics.log OutputPath=graphics.log Remove=false [EXTERNAL_4] -ExtLogPath=/ramd/log/frameworkunifiedlog/winsys.log +ExtLogPath=/var/local/lib/basesystem/ramd/log/frameworkunifiedlog/winsys.log OutputPath=winsys.log Remove=false [EXTERNAL_5] -ExtLogPath=/ramd/log/frameworkunifiedlog/appfw +ExtLogPath=/var/local/lib/basesystem/ramd/log/frameworkunifiedlog/appfw OutputPath=appfw Remove=false [EXTERNAL_6] -ExtLogPath=/nv/ptdata/sec/tomoyo +ExtLogPath=/var/local/lib/basesystem/nv/ptdata/sec/tomoyo OutputPath=tomoyo Remove=true diff --git a/service/system/logger_service/server/Makefile b/service/system/logger_service/server/Makefile index 5292a18..7f8f59b 100755 --- a/service/system/logger_service/server/Makefile +++ b/service/system/logger_service/server/Makefile @@ -23,6 +23,6 @@ all: install-data:install_data install_data: - install -d -m 755 $(DESTDIR)/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog + install -d -m 755 $(DESTDIR)/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog include ../../system_service.mk diff --git a/service/system/logger_service/server/include/ss_logger_common.h b/service/system/logger_service/server/include/ss_logger_common.h index 80a56af..758b62a 100755 --- a/service/system/logger_service/server/include/ss_logger_common.h +++ b/service/system/logger_service/server/include/ss_logger_common.h @@ -45,11 +45,11 @@ const CHAR PERFORMANCE_LOG_PATH_FN[] = "/tmp/frameworkunified_performance.log"; const CHAR DRINITIAL_LOG_PATH_FN[] = "/tmp/loggerservice_drinitial.log"; const CHAR DRLOCATION_LOG_PATH_FN[] = "/tmp/loggerservice_drlocation.log"; const CHAR KERNEL_LOG_PATH_FN[] = "/tmp/kernel.log"; -const CHAR KERNEL_BOOT_LOG_PATH_FN[] = "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/kernelboot.log"; +const CHAR KERNEL_BOOT_LOG_PATH_FN[] = "/var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/kernelboot.log"; const UI_32 PERFORMANCELOG_FILE_SZ = 256 * 1024; -#define CLEAR_LOG_PATH_FN "/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog/" +#define CLEAR_LOG_PATH_FN "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog/" #define NULLCHAR '\0' #define DEBUG_USB_PATH "/mnt/sda1" diff --git a/service/system/logger_service/server/include/ss_logger_scrshot.h b/service/system/logger_service/server/include/ss_logger_scrshot.h index 5cc9dd9..4ac1fb6 100755 --- a/service/system/logger_service/server/include/ss_logger_scrshot.h +++ b/service/system/logger_service/server/include/ss_logger_scrshot.h @@ -22,9 +22,9 @@ #ifndef LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_ #define LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_ -#define JPEG_PATH_CH0 "/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch0.jpeg" -#define JPEG_PATH_CH1 "/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch1.jpeg" +#define JPEG_PATH_CH0 "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch0.jpeg" +#define JPEG_PATH_CH1 "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch1.jpeg" #define SCRSHOT_EXE_PATH "/usr/agl/bin/SS_ScrShot" -#define SCREEN_SHOT_PATH "/nv/BS/ss/logger_service/rwdata/screenShot" +#define SCREEN_SHOT_PATH "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/screenShot" #endif // LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_ diff --git a/service/system/logger_service/server/src/ss_logger_error_event_cfg.cpp b/service/system/logger_service/server/src/ss_logger_error_event_cfg.cpp index fcd733e..8c1e6cb 100755 --- a/service/system/logger_service/server/src/ss_logger_error_event_cfg.cpp +++ b/service/system/logger_service/server/src/ss_logger_error_event_cfg.cpp @@ -60,14 +60,14 @@ enum ARTIFACT_BIT { ////////////////////////////////////////////////////////////////////////////////////////// ///// Definition for Logging Artifact Filepaths ////////////////////////////////////////////////////////////////////////////////////////// -const char LAF_DEBUG_FOLDER[] = "/nv/BS/ss/logger_service/rwdata"; -const char LAF_DEBUG_FOLDER2[] = "/nv/BS/ss/logger_service/rwdata/log2"; +const char LAF_DEBUG_FOLDER[] = "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata"; +const char LAF_DEBUG_FOLDER2[] = "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/log2"; const char LAF_MONTECARLO_FN[] = "/tmp/MonteCarlo"; const char LAF_METACORE_FN[] = "/tmp/MetaCore"; const char LAF_CMS_FN[] = "/tmp/cms"; const char LAF_INT_DTC_FN[] = "/tmp/dtc_error.log"; -const char LAF_LOGGERSERVICELOG_COM[] = "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/communication"; -const char LAF_KERNEL_BOOT_FN[] = "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/kernelboot.log"; +const char LAF_LOGGERSERVICELOG_COM[] = "/var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/communication"; +const char LAF_KERNEL_BOOT_FN[] = "/var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/kernelboot.log"; const char LAF_PSTORELOG[] = "/dev/pstore"; #define ARTIFACT_BIT_ALL_OUTPUT_LOG (ARTIFACT_BIT_LOGGERSERVICE_DEBUG_LOG | \ diff --git a/service/system/logger_service/server/src/ss_logger_error_event_responses.cpp b/service/system/logger_service/server/src/ss_logger_error_event_responses.cpp index dc23d8b..34f3d11 100755 --- a/service/system/logger_service/server/src/ss_logger_error_event_responses.cpp +++ b/service/system/logger_service/server/src/ss_logger_error_event_responses.cpp @@ -429,7 +429,7 @@ EFrameworkunifiedStatus CErrorEvent::OnClearAllLogRequest(HANDLE f_hApp) { clear_file_path.c_str()); } - clear_file_path = "/nv/BS/ss/logger_service/rwdata/log2/awlog/"; + clear_file_path = "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/log2/awlog/"; if (CFSDirectory::RemoveSubDirectory(clear_file_path)) { FRAMEWORKUNIFIEDLOG(ZONE_INFO, __FUNCTION__, "SS_Logger Clear %s directory delete successful.", @@ -440,7 +440,7 @@ EFrameworkunifiedStatus CErrorEvent::OnClearAllLogRequest(HANDLE f_hApp) { clear_file_path.c_str()); } - clear_file_path = "/nv/BS/ss/logger_service/rwdata/log2/core/"; + clear_file_path = "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/log2/core/"; if (CFSDirectory::RemoveSubDirectory(clear_file_path)) { FRAMEWORKUNIFIEDLOG(ZONE_INFO, __FUNCTION__, "SS_Logger Clear %s directory delete successful.", diff --git a/service/system/logger_service/server/src/ss_logger_util.cpp b/service/system/logger_service/server/src/ss_logger_util.cpp index 6ac7225..0de6022 100755 --- a/service/system/logger_service/server/src/ss_logger_util.cpp +++ b/service/system/logger_service/server/src/ss_logger_util.cpp @@ -1019,8 +1019,8 @@ EFrameworkunifiedStatus CLoggerUtil::CopyUntyped(std::string f_source, } else if (0 != S_ISDIR(l_stat.st_mode)) { l_eStatus = CopyDirectory(f_source, f_destination); } else if (0 != S_ISLNK(l_stat.st_mode)) { - // avoid duplicate copy for eErrorEventTypeInterfaceunifiedEmmcLogs: /nv/log/awlog -> /nv/BS/ss/logger_service/rwdata/log2/awlog - if (f_source.find("/nv/BS/ss/logger_service/rwdata/awlog") == std::string::npos) { + // avoid duplicate copy for eErrorEventTypeInterfaceunifiedEmmcLogs: /var/local/lib/basesystem/nv/log/awlog -> /nv/BS/ss/logger_service/rwdata/log2/awlog + if (f_source.find("/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/awlog") == std::string::npos) { l_eStatus = CopyDirectory(f_source, f_destination); } } else if (0 != S_ISREG(l_stat.st_mode)) { diff --git a/service/system/rom_access_library/library/include/system_service/ss_sm_ram_access.h b/service/system/rom_access_library/library/include/system_service/ss_sm_ram_access.h index f96966b..7a59bfc 100755 --- a/service/system/rom_access_library/library/include/system_service/ss_sm_ram_access.h +++ b/service/system/rom_access_library/library/include/system_service/ss_sm_ram_access.h @@ -171,7 +171,7 @@ explicit RAM_AccessIf(RAM_WAKEUP_STATE wup_state = RAM_WAKEUP_STATE_DONT_CARE); * - The change in the internal status does not occur by this API. * \~english @par Conditions of processing failure * - If p_boot_info is NULL [eFrameworkunifiedStatusFail] - * - If read data from secondary storage area or /nv/BS/ss/rom_access_library/rwdata/ramdata.dat + * - If read data from secondary storage area or /var/local/lib/basesystem/nv/BS/ss/rom_access_library/rwdata/ramdata.dat * failed [eFrameworkunifiedStatusFail] * \~english @par Classification: * Public @@ -179,7 +179,7 @@ explicit RAM_AccessIf(RAM_WAKEUP_STATE wup_state = RAM_WAKEUP_STATE_DONT_CARE); * Sync only(None communication) * \~english @par Detail: * Copy the system information stored in the secondary storage area or - * in /nv/BS/ss/rom_access_library/rwdata/ramdata.dat to p_boot_info. \n + * in /var/local/lib/basesystem/nv/BS/ss/rom_access_library/rwdata/ramdata.dat to p_boot_info. \n * \~english @see setRamInfo */ EFrameworkunifiedStatus getRamInfo(RAM_SM_INFO_t* p_boot_info); @@ -214,7 +214,7 @@ explicit RAM_AccessIf(RAM_WAKEUP_STATE wup_state = RAM_WAKEUP_STATE_DONT_CARE); * - The change in the internal status does not occur by this API. * \~english @par Conditions of processing failure * - If p_boot_info is NULL [eFrameworkunifiedStatusFail] - * - If write data to secondary storage area or /nv/BS/ss/rom_access_library/rwdata/ramdata.dat + * - If write data to secondary storage area or /var/local/lib/basesystem/nv/BS/ss/rom_access_library/rwdata/ramdata.dat * failed [eFrameworkunifiedStatusFail] * \~english @par Classification: * Public @@ -222,7 +222,7 @@ explicit RAM_AccessIf(RAM_WAKEUP_STATE wup_state = RAM_WAKEUP_STATE_DONT_CARE); * Sync only(None communication) * \~english @par Detail: * Write the system manegement information stored in p_boot_info to the - * secondary storage area or /nv/BS/ss/rom_access_library/rwdata/ramdata.dat. \n + * secondary storage area or /var/local/lib/basesystem/nv/BS/ss/rom_access_library/rwdata/ramdata.dat. \n * \~english @see getRamInfo */ EFrameworkunifiedStatus setRamInfo(RAM_SM_INFO_t* p_boot_info); diff --git a/service/system/rom_access_library/library/rom/src/ss_sm_ram_access.cpp b/service/system/rom_access_library/library/rom/src/ss_sm_ram_access.cpp index b5cf244..d95a648 100755 --- a/service/system/rom_access_library/library/rom/src/ss_sm_ram_access.cpp +++ b/service/system/rom_access_library/library/rom/src/ss_sm_ram_access.cpp @@ -29,7 +29,7 @@ -#define RAM_PATH "/nv/BS/ss/rom_access_library/rwdata/ramdata.dat" +#define RAM_PATH "/var/local/lib/basesystem/nv/BS/ss/rom_access_library/rwdata/ramdata.dat" #define RAM_OLD_PATH RAM_PATH".old" static const uint8_t kSigNature[] = { 0xDE, 0xAD, 0xBE, 0xEF }; static const uint8_t kMagic[] = { 0xDE, 0xAD, 0xBE, 0xEF }; diff --git a/service/system/rom_access_library/library/rom/src/ss_sm_rom_access.cpp b/service/system/rom_access_library/library/rom/src/ss_sm_rom_access.cpp index 53589c2..9994602 100755 --- a/service/system/rom_access_library/library/rom/src/ss_sm_rom_access.cpp +++ b/service/system/rom_access_library/library/rom/src/ss_sm_rom_access.cpp @@ -38,7 +38,7 @@ #include "ss_sm_checksum.h" #include "ss_rom_access_define.h" -#define ROM_ACCESS_DIR "/nv/BS/ss/rom_access_library/rwdata" +#define ROM_ACCESS_DIR "/var/local/lib/basesystem/nv/BS/ss/rom_access_library/rwdata" #define ROM_ACCESS_FILE "romdata.dat" const CHAR kDefaultRomDevice[] = ROM_ACCESS_DIR"/"ROM_ACCESS_FILE; const CHAR kRecoveryRomDevice[] = ROM_ACCESS_DIR"/"ROM_ACCESS_FILE".old"; 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) -- cgit 1.2.3-korg