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 --- service/native/backup_manager/server/Makefile | 2 +- service/native/framework_unified/client/Makefile | 2 +- service/native/framework_unified/client/NS_Logger/src/ns_logger.cpp | 2 +- .../framework_unified/client/include/native_service/ns_logger_if.h | 6 +++--- .../framework_unified/client/include/native_service/ns_np_types.h | 4 ++-- .../log_library/client/include/native_service/loglibrarylog_if.h | 4 ++-- .../notification_persistent_service/server/include/ns_npp_types.h | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'service/native') diff --git a/service/native/backup_manager/server/Makefile b/service/native/backup_manager/server/Makefile index 7f9fa39..6e1149f 100755 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 { -- cgit 1.2.3-korg