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

diff --git a/agl-basefiles/include/aglpath.h b/agl-basefiles/include/aglpath.h
index de32991..0f51753 100644 (file)
--- a/agl-basefiles/include/aglpath.h
+++ b/agl-basefiles/include/aglpath.h
@@ -28,8 +28,8 @@
 /* Common path */
 
 #define PF_ROOT                        "/"
-#define PF_NV                  PF_ROOT"nv/"
 #define PF_VAR                 PF_ROOT"var/"
+#define PF_NV                  PF_VAR"local/lib/nv/"
 #define PF_TMP                 PF_ROOT"tmp/"
 #define PF_USR                 PF_ROOT"usr/"
 #define PF_MNT                 PF_ROOT"mnt/"

diff --git a/agl-systemd/agl-trigger.service b/agl-systemd/agl-trigger.service
index 8cb752f..ea4d528 100755 (executable)
--- a/agl-systemd/agl-trigger.service
+++ b/agl-systemd/agl-trigger.service
@@ -11,8 +11,8 @@
 [Service]
 Type=oneshot
 #RemainAfterExit=yes
-EnvironmentFile=/tool_9E_SI/env.txt
-ExecStart=/tool_9E_SI/agl_set_capability.sh
+EnvironmentFile=/etc/basesystem/env.txt
+ExecStart=/usr/bin/agl_set_capability.sh
 
 [Install]
 WantedBy=multi-user.target

diff --git a/agl-systemd/launch_sm.service b/agl-systemd/launch_sm.service
index 8edc914..0a8d591 100755 (executable)
--- a/agl-systemd/launch_sm.service
+++ b/agl-systemd/launch_sm.service
@@ -4,9 +4,9 @@ After=setup_refhw.service agl-trigger.service
  
 [Service]
 PermissionsStartOnly=yes
-EnvironmentFile=/tool_9E_SI/env.txt
-ExecStartPre=/tool_9E_SI/set_cgroup_rt_runtime_us.sh 950000
-ExecStart=/tool_9E_SI/launch_sm.sh
+EnvironmentFile=/etc/basesystem/env.txt
+ExecStartPre=/usr/bin/set_cgroup_rt_runtime_us.sh 950000
+ExecStart=/usr/bin/launch_sm.sh
 Type=oneshot
 User=root
 StandardOutput=inherit

diff --git a/agl-systemd/setup_refhw.service b/agl-systemd/setup_refhw.service
index 427dfed..fe6b073 100755 (executable)
--- a/agl-systemd/setup_refhw.service
+++ b/agl-systemd/setup_refhw.service
@@ -3,8 +3,8 @@ Description=Initialize Reference Hardware Settings
 #After=weston.service
 
 [Service]
-EnvironmentFile=/tool_9E_SI/env.txt
-ExecStart=/tool_9E_SI/setup_refhw.sh
+EnvironmentFile=/etc/basesystem/env.txt
+ExecStart=/usr/bin/setup_refhw.sh
 Type=oneshot
 #StandardInput=tty
 #TTYPath=/dev/tty1

diff --git a/agl-systemd/systemd-udev-trigger.service b/agl-systemd/systemd-udev-trigger.service
index 07a3f30..e6431e7 100755 (executable)
--- a/agl-systemd/systemd-udev-trigger.service
+++ b/agl-systemd/systemd-udev-trigger.service
@@ -17,6 +17,6 @@ ConditionPathIsReadWrite=/sys
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-EnvironmentFile=/tool_9E_SI/env.txt
-ExecStartPre=/tool_9E_SI/set_capability.sh
+EnvironmentFile=/etc/basesystem/env.txt
+ExecStartPre=/usr/bin/set_capability.sh
 ExecStart=/bin/udevadm trigger --type=subsystems --action=add ; /bin/udevadm trigger --type=devices --action=add

diff --git a/agl-systemd/tool_9E_SI/agl_set_capability.sh b/agl-systemd/tool_9E_SI/agl_set_capability.sh
index 6b108ae..43c9dd2 100755 (executable)
--- a/agl-systemd/tool_9E_SI/agl_set_capability.sh
+++ b/agl-systemd/tool_9E_SI/agl_set_capability.sh
@@ -16,7 +16,7 @@
 #
 
 ROMFILESTOP=/
-CAP_LST=${ROMFILESTOP}/usr/target/agl_cap.lst
+CAP_LST=${ROMFILESTOP}/etc/basesystem/target/agl_cap.lst
 echo `cat ${CAP_LST}`
 #-----------------------------------------------------------------------
 # Capability
@@ -33,7 +33,7 @@ SKIPWARN=n
 #-----------------------------------------------------------------------
 # Set Capability for NFS or Set DummyLink for ROM
 #CAP_LST="/usr/debug/share/target/cap.lst"
-CAP_LST="/usr/target/agl_cap.lst"
+CAP_LST="/etc/basesystem/target/agl_cap.lst"
 
 if [ $IS_EMMC_BOOT -eq 0 ]; then
 if [ -f "${CAP_LST}" ];then

diff --git a/agl-systemd/tool_9E_SI/launch_sm.sh b/agl-systemd/tool_9E_SI/launch_sm.sh
index ed1e8d1..2fdec6f 100755 (executable)
--- a/agl-systemd/tool_9E_SI/launch_sm.sh
+++ b/agl-systemd/tool_9E_SI/launch_sm.sh
@@ -20,7 +20,7 @@ export APPS_CONFIG_FILENAME=sm_launch.cfg
 export SM_CONFIG_DATA_FILENAME=gpf_ss_sm_config_data.cfg
 export XDG_RUNTIME_DIR=/run/user/0
 cd /usr/agl/bin/
-rm -rf /nv/romaccess
+rm -rf /var/local/lib/basesystem/nv/romaccess
 rm /dev/shm/lockfile
 
 /usr/agl/bin/SS_SystemManager &

diff --git a/agl-systemd/tool_9E_SI/set_capability.sh b/agl-systemd/tool_9E_SI/set_capability.sh
index c16ab4a..3f8ab43 100755 (executable)
--- a/agl-systemd/tool_9E_SI/set_capability.sh
+++ b/agl-systemd/tool_9E_SI/set_capability.sh
@@ -16,7 +16,7 @@
 #
 
 ROMFILESTOP=/
-CAP_LST=${ROMFILESTOP}/usr/target/cap.lst
+CAP_LST=${ROMFILESTOP}/etc/basesystem/target/cap.lst
 echo `cat ${CAP_LST}`
 #-----------------------------------------------------------------------
 # Capability
@@ -33,7 +33,7 @@ SKIPWARN=n
 #-----------------------------------------------------------------------
 # Set Capability for NFS or Set DummyLink for ROM
 #CAP_LST="/usr/debug/share/target/cap.lst"
-CAP_LST="/usr/target/cap.lst"
+CAP_LST="/etc/basesystem/target/cap.lst"
 
 if [ $IS_EMMC_BOOT -eq 0 ]; then
 if [ -f "${CAP_LST}" ];then

diff --git a/agl-systemd/tool_9E_SI/setup_refhw.sh b/agl-systemd/tool_9E_SI/setup_refhw.sh
index 00abc93..9c20cb6 100755 (executable)
--- a/agl-systemd/tool_9E_SI/setup_refhw.sh
+++ b/agl-systemd/tool_9E_SI/setup_refhw.sh
@@ -31,12 +31,12 @@ echo "AREA=$VEHICLEPARAMETERLIBRARY_AREA" >> /tmp/udev_device.env
 ## Sprint 29 To make WebService can update contents.
 #chown -R agl:agl /usr/agl/data/electronicom
 ## For btservice initial data.
-#chown -R agl:agl /nv/backup/D_BK_CA_BT_MANAGEMENT 
+#chown -R agl:agl /var/local/lib/basesystem/nv/backup/D_BK_CA_BT_MANAGEMENT
 ## Sprint 29 PFDRECThread
-mkdir -p /ramd/BS/ns/backup_manager/rwdata
-mkdir -p /ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/diag
-restorecon -R /ramd
-#chmod 777 /ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/diag
+mkdir -p /var/local/lib/basesystem/ramd/BS/ns/backup_manager/rwdata
+mkdir -p /var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/diag
+restorecon -R /var/local/lib/basesystem/ramd
+#chmod 777 /var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/diag
 ## Sprint 29 communication
 #chmod -R 777 /home/root/.app_can_d
 # TODO:for bluetooth_service
@@ -73,7 +73,7 @@ chmod 666 /dev/mqueue/IccSnd
 #chmod 777 /dev/mqueue/NS_NPPService
 #chmod 777 /run/user/0
 
-rm -rf /nv/romaccess
+rm -rf /var/local/lib/basesystem/nv/romaccess
 rm /dev/shm/lockfile
 
 

diff --git a/hal/can_hal/src/driver_can__CWORD31_.c b/hal/can_hal/src/driver_can__CWORD31_.c
index bd9cb29..2086c07 100755 (executable)
--- a/hal/can_hal/src/driver_can__CWORD31_.c
+++ b/hal/can_hal/src/driver_can__CWORD31_.c
@@ -33,8 +33,8 @@
 #include <net/if.h>
 
 
-#define DUMP_DIR       "/nv/driver-can"
-#define DUMP_RCVID     "/nv/driver-can/dump_rcvid"
+#define DUMP_DIR       "/var/local/lib/basesystem/nv/driver-can"
+#define DUMP_RCVID     "/var/local/lib/basesystem/nv/driver-can/dump_rcvid"
 #define CAN_DATA_SIZE (sizeof(CanData))
 
 static int fd_can = -1;

diff --git a/hal/nv_hal/src/nv_hal.cpp b/hal/nv_hal/src/nv_hal.cpp
index d746ea0..6c16fea 100755 (executable)
--- a/hal/nv_hal/src/nv_hal.cpp
+++ b/hal/nv_hal/src/nv_hal.cpp
@@ -30,8 +30,8 @@
  */
 const char *kMediaType[NVHALMEDIA_MAX] = {
   "/tmp/bkup/",
-  "/ramd/BS/ns/backup_manager/rwdata/",
-  "/nv/BS/ns/backup_manager/rwdata/",
+  "/var/local/lib/basesystem/ramd/BS/ns/backup_manager/rwdata/",
+  "/var/local/lib/basesystem/nv/BS/ns/backup_manager/rwdata/",
 };
 
 const int kMaxPath = 127;    // Max length of path

diff --git a/service/native/backup_manager/server/Makefile b/service/native/backup_manager/server/Makefile
index 7f9fa39..6e1149f 100755 (executable)
--- a/service/native/backup_manager/server/Makefile
+++ b/service/native/backup_manager/server/Makefile
@@ -62,6 +62,6 @@ CPPFLAGS += -DIMPL_AGL_APPLICATION_CALLBACKS_PRE_BACKGROUND
 install-data: install_data
 
 install_data:
-       install -d -m 755 $(DESTDIR)/nv/BS/ns/backup_manager/rwdata
+       install -d -m 755 $(DESTDIR)/var/local/lib/basesystem/nv/BS/ns/backup_manager/rwdata
 
 include ../../native_service.mk

diff --git a/service/native/framework_unified/client/Makefile b/service/native/framework_unified/client/Makefile
index b97ef4a..ce4b2dd 100755 (executable)
--- a/service/native/framework_unified/client/Makefile
+++ b/service/native/framework_unified/client/Makefile
@@ -260,7 +260,7 @@ SUBDIRS := NS_XMLConfigeParser NS_Utility
 all:
 
 install-data:install_cfg
-       install -d -m 775 $(DESTDIR)/nv/BS/ns/framework_unified/rwdata
+       install -d -m 775 $(DESTDIR)/var/local/lib/basesystem/nv/BS/ns/framework_unified/rwdata
 
 install_cfg:
        install -d -m 775 $(DESTDIR)/etc/basesystem/BS/ns/framework_unified/rodata

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 3d09650..941e6ef 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
@@ -110,7 +110,7 @@ FRAMEWORKUNIFIEDLOGSYSEVENTPARAM g_FrameworkunifiedLogSysEventParams = {FALSE};
 #define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__TMP "ns_logger_frameworkunifiedlog__CWORD84_.tmp"
 #define FRAMEWORKUNIFIEDLOG_CONFIG__CWORD84__NV "ns_logger_frameworkunifiedlog__CWORD84_.cfg"
 
-#define FRAMEWORKUNIFIEDLOG_CONFIG_NV "/nv/BS/ns/framework_unified/rwdata/"
+#define FRAMEWORKUNIFIEDLOG_CONFIG_NV "/var/local/lib/basesystem/nv/BS/ns/framework_unified/rwdata/"
 
 #define FRAMEWORKUNIFIEDLOG_CONFIG_TMP_NV "ns_logger_frameworkunifiedlog_tmp.cfg"
 #ifndef TN_LOGGERRTIME

diff --git a/service/native/framework_unified/client/include/native_service/ns_logger_if.h b/service/native/framework_unified/client/include/native_service/ns_logger_if.h
index a1ca9ef..e8eece6 100755 (executable)
--- a/service/native/framework_unified/client/include/native_service/ns_logger_if.h
+++ b/service/native/framework_unified/client/include/native_service/ns_logger_if.h
@@ -761,9 +761,9 @@ EFrameworkunifiedStatus NsLogGetFrameworkunifiedLogFlag(UI_8 flag_id, UI_8 *mode
 /// \~english @par Detail
 ///        set the real-time log output using the setting value.\n
 ///        need to reboot during ROM start in order to switch to Ethernet output\n
-///        /nv/BS/ns/framework_unified/rwdata/frameworkunifiedlog.ether file will be generated
-///        when mode FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_ETHER /nv/BS/ns/framework_unified/rwdata/frameworkunifiedlog.ether\n
-///        and /nv/BS/ns/framework_unified/rwdata/frameworkunifiedlog.ether file will be delated when mode is not FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_ETHER
+///        /var/local/lib/basesystem/nv/BS/ns/framework_unified/rwdata/frameworkunifiedlog.ether file will be generated
+///        when mode FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_ETHER /var/local/lib/basesystem/nv/BS/ns/framework_unified/rwdata/frameworkunifiedlog.ether\n
+///        and /var/local/lib/basesystem/nv/BS/ns/framework_unified/rwdata/frameworkunifiedlog.ether file will be delated when mode is not FRAMEWORKUNIFIEDLOG_REALTIMELOG_MODE_ETHER
 /// \~english @par Classification
 ///        Public
 /// \~english @par Type

diff --git a/service/native/framework_unified/client/include/native_service/ns_np_types.h b/service/native/framework_unified/client/include/native_service/ns_np_types.h
index 01559d9..d99a9ac 100755 (executable)
--- a/service/native/framework_unified/client/include/native_service/ns_np_types.h
+++ b/service/native/framework_unified/client/include/native_service/ns_np_types.h
@@ -25,10 +25,10 @@
 #define FRAMEWORK_UNIFIED_CLIENT_NS_NPSERVICEIF_INCLUDE_NS_NP_TYPES_H_
 
 // Path of immediate notification data in NS_NPS version 1
-#define IMMEDIATE_PERSISTENCE_STORAGE_V1        "/nv/BS/ns/npp/rwdata/NPSNOR/"
+#define IMMEDIATE_PERSISTENCE_STORAGE_V1        "/var/local/lib/basesystem/nv/BS/ns/npp/rwdata/NPSNOR/"
 
 // Path of immediate notification data in NS_NPS version 2
-#define IMMEDIATE_PERSISTENCE_STORAGE_V2        "/nv/BS/ns/npp/rwdata/"
+#define IMMEDIATE_PERSISTENCE_STORAGE_V2        "/var/local/lib/basesystem/nv/BS/ns/npp/rwdata/"
 
 // name of persistence folder for persistent type categorization
 #define USERDATADIR     "UserData/"   // stores all the user data (all user common data as well as user specific data)

diff --git a/service/native/log_library/client/include/native_service/loglibrarylog_if.h b/service/native/log_library/client/include/native_service/loglibrarylog_if.h
index 5bf90c3..a774fce 100755 (executable)
--- a/service/native/log_library/client/include/native_service/loglibrarylog_if.h
+++ b/service/native/log_library/client/include/native_service/loglibrarylog_if.h
@@ -34,8 +34,8 @@
 #define __LOGLIBRARYLOG_IF_H__
 
 #define FRAMEWORKUNIFIEDLOG_SHARED_MEM_NAME "loglibrarylogconfig.cfg"
-#define FRAMEWORKUNIFIEDLOG_RAMDISC_NAME "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/frameworkunified_debug.log"
-#define FRAMEWORKUNIFIEDLOG_RAMDISC_PATH "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog"
+#define FRAMEWORKUNIFIEDLOG_RAMDISC_NAME "/var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/frameworkunified_debug.log"
+#define FRAMEWORKUNIFIEDLOG_RAMDISC_PATH "/var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog"
 
 // Out put mode
 #define FRAMEWORKUNIFIEDLOG_FLAG_MODE_DEBUG    1  // Debug

diff --git a/service/native/notification_persistent_service/server/include/ns_npp_types.h b/service/native/notification_persistent_service/server/include/ns_npp_types.h
index 79a44d7..ae9fdcf 100755 (executable)
--- a/service/native/notification_persistent_service/server/include/ns_npp_types.h
+++ b/service/native/notification_persistent_service/server/include/ns_npp_types.h
@@ -55,7 +55,7 @@
 // name of NSNPS version file
 #define VERSION_TXT             "version.txt"
 
-#define STORAGE_PATH             "/nv/BS/ns/npp/rwdata/"
+#define STORAGE_PATH             "/var/local/lib/basesystem/nv/BS/ns/npp/rwdata/"
 
 
 typedef enum ENPSLoadType {

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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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)

diff --git a/service/vehicle/positioning/server/src/Sensor/Makefile b/service/vehicle/positioning/server/src/Sensor/Makefile
index 59e8c1f..5c0c525 100755 (executable)
--- a/service/vehicle/positioning/server/src/Sensor/Makefile
+++ b/service/vehicle/positioning/server/src/Sensor/Makefile
@@ -173,7 +173,7 @@ CPPFLAGS += -Wformat
 LDFLAGS +=
 
 INSTALL = install
-CREATE_DIR = $(DESTDIR)/nv/BS/vs/positioning/rwdata
+CREATE_DIR = $(DESTDIR)/var/local/lib/basesystem/nv/BS/vs/positioning/rwdata
 install-data:
        $(INSTALL) -d -m 775 $(CREATE_DIR)
 

diff --git a/service/vehicle/positioning/server/src/Sensor/SensorLog.cpp b/service/vehicle/positioning/server/src/Sensor/SensorLog.cpp
index eed514f..9dd22a4 100755 (executable)
--- a/service/vehicle/positioning/server/src/Sensor/SensorLog.cpp
+++ b/service/vehicle/positioning/server/src/Sensor/SensorLog.cpp
@@ -78,7 +78,7 @@ typedef enum {
 
 #define SENSLOG_SEMAPHO_NAME            ("SENSLOG_SEMAPHO")   /* Semaphore name(MAX 32Byte) */
 
-#define SENSLOG_CONFIG_FILE_PATH_1      "/nv/BS/vs/positioning/rwdata/"  /* Sensor log-Config filepath-1      */
+#define SENSLOG_CONFIG_FILE_PATH_1      "/var/local/lib/basesystem/nv/BS/vs/positioning/rwdata/"  /* Sensor log-Config filepath-1      */
 #define SENSLOG_CONFIG_FILE_PATH_2      "/mnt/sda1/"       /* Sensor log-Config filepath-2      */
 #define SENSLOG_CONFIG_FILE_NAME_SYS    "POS_sys_log.cfg"  /* Sensor log-Config filename-SYS      */
 #define SENSLOG_CONFIG_FILE_NAME_GPS    "POS_gps_log.cfg"  /* Sensor log-Config filename-GPS      */

diff --git a/service/vehicle/positioning_base_library/library/Makefile b/service/vehicle/positioning_base_library/library/Makefile
index c0aec5b..9265faa 100755 (executable)
--- a/service/vehicle/positioning_base_library/library/Makefile
+++ b/service/vehicle/positioning_base_library/library/Makefile
@@ -80,7 +80,7 @@ LDLIBS += -Wl,-Bdynamic -lev
 LDFLAGS += -shared
 
 INSTALL = install
-CREATE_DIR = $(DESTDIR)/nv/BS/vs/positioning_base_library/rwdata
+CREATE_DIR = $(DESTDIR)/var/local/lib/basesystem/nv/BS/vs/positioning_base_library/rwdata
 install-data:
        $(INSTALL) -d -m 775 $(CREATE_DIR)
 

diff --git a/service/vehicle/positioning_base_library/library/src/_pbOSCtrl.cpp b/service/vehicle/positioning_base_library/library/src/_pbOSCtrl.cpp
index c38016a..0e71930 100755 (executable)
--- a/service/vehicle/positioning_base_library/library/src/_pbOSCtrl.cpp
+++ b/service/vehicle/positioning_base_library/library/src/_pbOSCtrl.cpp
@@ -44,8 +44,8 @@ static u_int8    file_buf[FILE_OUT_LINE][1024];
 static u_int16    line_size_buf[FILE_OUT_LINE];
 
 /* Log destination selection (Activate the one you want to output.) */
-#define POS_GPS_R_LOGFILE_PATH "/nv/BS/vs/positioning_base_library/rwdata/Test_Pos_gps_read_data.txt"
-#define POS_GPS_W_LOGFILE_PATH "/nv/BS/vs/positioning_base_library/rwdata/Test_Pos_gps_write_data.txt"
+#define POS_GPS_R_LOGFILE_PATH "/var/local/lib/basesystem/nv/BS/vs/positioning_base_library/rwdata/Test_Pos_gps_read_data.txt"
+#define POS_GPS_W_LOGFILE_PATH "/var/local/lib/basesystem/nv/BS/vs/positioning_base_library/rwdata/Test_Pos_gps_write_data.txt"
 
 #endif /* GPS_FUNC_DEBUG_MSG__CWORD71__FILE */