diff options
| -rw-r--r-- | agl-basefiles/include/aglpath.h | 2 | ||||
| -rw-r--r-- | agl-basefiles/share/agl.mk | 3 | ||||
| -rwxr-xr-x | agl-systemd/tool_9E_SI/setup_refhw.sh | 2 | ||||
| -rwxr-xr-x | hal/can_hal/can_hal.mk | 2 | ||||
| -rwxr-xr-x | service/native/native_service.mk | 2 | ||||
| -rwxr-xr-x | service/other/other_service.mk | 2 | ||||
| -rwxr-xr-x | service/peripheral/peripheral_service.mk | 2 | ||||
| -rwxr-xr-x | service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp | 4 | ||||
| -rwxr-xr-x | service/system/system_manager/server/Makefile | 8 | ||||
| -rwxr-xr-x | service/system/system_service.mk | 2 | ||||
| -rwxr-xr-x | service/vehicle/vehicle_service.mk | 2 | ||||
| -rwxr-xr-x | stub/stub.mk | 2 |
12 files changed, 17 insertions, 16 deletions
diff --git a/agl-basefiles/include/aglpath.h b/agl-basefiles/include/aglpath.h index e278fbf..de32991 100644 --- a/agl-basefiles/include/aglpath.h +++ b/agl-basefiles/include/aglpath.h @@ -39,7 +39,7 @@ #define PF_SHM PF_TMP"shm/" #define PF_SHARE PF_USR"share/" -#define PF_P_SHARE PF_USR"agl/share/" +#define PF_P_SHARE PF_USR"share/basesystem" #define PF_SYS_BS PF_NVSYSTEM"sys_bs/" diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk index d8de618..fa1e8d5 100644 --- a/agl-basefiles/share/agl.mk +++ b/agl-basefiles/share/agl.mk @@ -444,7 +444,8 @@ ifneq ($(strip $(INST_HEADERS)),) endif -HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/agl/share/launch_xml2cfg.sh + +HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/share/basesystem/launch_xml2cfg.sh CONF_H = $(SYSROOT)/usr/include/basesystem/sm_launch_conf.h %.cfg: %.xml diff --git a/agl-systemd/tool_9E_SI/setup_refhw.sh b/agl-systemd/tool_9E_SI/setup_refhw.sh index e3f33a4..00abc93 100755 --- a/agl-systemd/tool_9E_SI/setup_refhw.sh +++ b/agl-systemd/tool_9E_SI/setup_refhw.sh @@ -40,7 +40,7 @@ restorecon -R /ramd ## Sprint 29 communication #chmod -R 777 /home/root/.app_can_d # TODO:for bluetooth_service -#chmod 777 /usr/agl/share +#chmod 777 /usr/share/basesystem #if `df -T / | grep nfs > /dev/null`; then #cp /sbin/insmod.kmod /tmp/insmod.kmod diff --git a/hal/can_hal/can_hal.mk b/hal/can_hal/can_hal.mk index 19a824d..546d6ad 100755 --- a/hal/can_hal/can_hal.mk +++ b/hal/can_hal/can_hal.mk @@ -36,4 +36,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk diff --git a/service/native/native_service.mk b/service/native/native_service.mk index 729362c..74daaf0 100755 --- a/service/native/native_service.mk +++ b/service/native/native_service.mk @@ -41,4 +41,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk diff --git a/service/other/other_service.mk b/service/other/other_service.mk index 85a2f2c..63a03ab 100755 --- a/service/other/other_service.mk +++ b/service/other/other_service.mk @@ -39,4 +39,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk diff --git a/service/peripheral/peripheral_service.mk b/service/peripheral/peripheral_service.mk index c054722..561c241 100755 --- a/service/peripheral/peripheral_service.mk +++ b/service/peripheral/peripheral_service.mk @@ -41,4 +41,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk diff --git a/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp b/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp index 16ec02a..0459af1 100755 --- a/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp +++ b/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp @@ -301,7 +301,7 @@ static EFrameworkunifiedStatus setVersionInfo(void) { SS_ASERT(configRet == eFrameworkunifiedStatusOK); // Set PRODUCT version information - const char prdVersion[] = "/usr/agl/share/BS/ss/system_manager/rodata/version.txt"; + const char prdVersion[] = "/usr/share/basesystem/BS/ss/system_manager/rodata/version.txt"; { std::string line; std::ifstream prdFin(prdVersion); @@ -327,7 +327,7 @@ static EFrameworkunifiedStatus setVersionInfo(void) { } // PHASE_INFO - const char phaseVersion[] = "/usr/agl/share/BS/ss/system_manager/rodata/PhaseInfo.txt"; + const char phaseVersion[] = "/usr/share/basesystem/BS/ss/system_manager/rodata/PhaseInfo.txt"; { configRet = setVerInfo_version_date(phaseVersion); } diff --git a/service/system/system_manager/server/Makefile b/service/system/system_manager/server/Makefile index b518c2e..6d13bb7 100755 --- a/service/system/system_manager/server/Makefile +++ b/service/system/system_manager/server/Makefile @@ -107,12 +107,12 @@ 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/agl/share/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg + $(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)/nv/BS/ss/system_manager/rwdata - install -d -m 755 $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata - install -m 644 ./version.txt $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata - install -m 644 ./PhaseInfo.txt $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata + 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 include ../../system_service.mk diff --git a/service/system/system_service.mk b/service/system/system_service.mk index 5444eb4..c1aa32c 100755 --- a/service/system/system_service.mk +++ b/service/system/system_service.mk @@ -41,4 +41,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk diff --git a/service/vehicle/vehicle_service.mk b/service/vehicle/vehicle_service.mk index 40d337f..8e753fb 100755 --- a/service/vehicle/vehicle_service.mk +++ b/service/vehicle/vehicle_service.mk @@ -39,4 +39,4 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk diff --git a/stub/stub.mk b/stub/stub.mk index 44fb1e3..b938c6d 100755 --- a/stub/stub.mk +++ b/stub/stub.mk @@ -38,5 +38,5 @@ COMPONENT_LDFLAGS := ############################################################## -include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk +include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk |