agl-basesystem 0.1sandbox/ToshikazuOhiwa/master

8 files changed, 14 insertions, 140 deletions

diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/setup_refhw.service b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/setup_refhw.service
index 10875b28..427dfeda 100644
--- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/setup_refhw.service
+++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/setup_refhw.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Initialize Reference Hardware Settings
-After=weston.service
+#After=weston.service
 
 [Service]
 EnvironmentFile=/tool_9E_SI/env.txt
diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/agl_set_capability.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/agl_set_capability.sh
index ac827d04..6b108ae4 100755..100644
--- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/agl_set_capability.sh
+++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/agl_set_capability.sh
@@ -21,7 +21,7 @@ echo `cat ${CAP_LST}`
 #-----------------------------------------------------------------------
 # Capability
 
-df / --exclude-type=nfs > /dev/null
+df -T / | grep nfs > /dev/null
 IS_EMMC_BOOT=$?
 
 #*********************from init_nfs_cap.sh**************************
@@ -35,7 +35,7 @@ SKIPWARN=n
 #CAP_LST="/usr/debug/share/target/cap.lst"
 CAP_LST="/usr/target/agl_cap.lst"
 
-if [ $IS_EMMC_BOOT -ne 0 ]; then
+if [ $IS_EMMC_BOOT -eq 0 ]; then
 if [ -f "${CAP_LST}" ];then
     echo "*** set capability for NFS environment ***"
   CAPPATH=/tmp/
diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/launch_sm.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/launch_sm.sh
index ed1e8d12..ed1e8d12 100755..100644
--- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/launch_sm.sh
+++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/launch_sm.sh
diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_capability.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_capability.sh
index aa9b78de..c16ab4af 100755..100644
--- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_capability.sh
+++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_capability.sh
@@ -21,7 +21,7 @@ echo `cat ${CAP_LST}`
 #-----------------------------------------------------------------------
 # Capability
 
-df / --exclude-type=nfs > /dev/null
+df -T / | grep nfs > /dev/null
 IS_EMMC_BOOT=$?
 
 #*********************from init_nfs_cap.sh**************************
@@ -35,7 +35,7 @@ SKIPWARN=n
 #CAP_LST="/usr/debug/share/target/cap.lst"
 CAP_LST="/usr/target/cap.lst"
 
-if [ $IS_EMMC_BOOT -ne 0 ]; then
+if [ $IS_EMMC_BOOT -eq 0 ]; then
 if [ -f "${CAP_LST}" ];then
     echo "*** set capability for NFS environment ***"
   CAPPATH=/tmp/
diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_cgroup_rt_runtime_us.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_cgroup_rt_runtime_us.sh
index 41536f2c..41536f2c 100755..100644
--- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_cgroup_rt_runtime_us.sh
+++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/set_cgroup_rt_runtime_us.sh
diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/setup_refhw.sh b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/setup_refhw.sh
index 1f9501cb..e3f33a40 100755..100644
--- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/setup_refhw.sh
+++ b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/tool_9E_SI/setup_refhw.sh
@@ -33,20 +33,20 @@ echo "AREA=$VEHICLEPARAMETERLIBRARY_AREA" >> /tmp/udev_device.env
 ## For btservice initial data.
 #chown -R agl:agl /nv/backup/D_BK_CA_BT_MANAGEMENT 
 ## Sprint 29 PFDRECThread
-mkdir -p /ramd/log/frameworkunifiedlog/diag
-#chmod 777 /ramd/log/frameworkunifiedlog/diag
-touch /dev/mmcblk0p9
-chmod 660 /dev/mmcblk0p9
+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
 ## Sprint 29 communication
 #chmod -R 777 /home/root/.app_can_d
 # TODO:for bluetooth_service
 #chmod 777 /usr/agl/share
 
-if ! `df / --exclude-type=nfs > /dev/null`; then
-cp /sbin/insmod.kmod /tmp/insmod.kmod
-ln -s -f /tmp/insmod.kmod /sbin/insmod
-setcap cap_sys_module+ep /tmp/insmod.kmod
-fi
+#if `df -T / | grep nfs > /dev/null`; then
+#cp /sbin/insmod.kmod /tmp/insmod.kmod
+#ln -s -f /tmp/insmod.kmod /sbin/insmod
+#setcap cap_sys_module+ep /tmp/insmod.kmod
+#fi
 
 ## Sprint 32 Positioning
 #chmod 777 /dev/ttySC3
diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch.cfg b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch.cfg
deleted file mode 100644
index 50a18c9a..00000000
--- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-#  This file is created from ./sm_launch.tmp.xml.
-[ModulesLaunchConfig]
-Launch1=CoreModules|1|0|False|NS_NPPService|/usr/agl/bin/NS_NPPService|0|True|0|-a SS_SysManager -r output=0x2|NULL|NULL|False|True|20|1000||||||0x0
-Launch2=CoreModules|1|0|False|NS_BackupMgr|/usr/agl/bin/NS_BackupMgr|0|True|0|-l console|NULL|NULL|True|True|15|1000||||||0x0
-Launch3=SS_Logger|2|0|False|SS_LoggerSrv|/usr/agl/bin/SS_LoggerService|0|True|0|-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10|NULL|NULL|True|True|10|1000||||||0x0
-Launch4=ShadowModules|3|0|False|Communication|/usr/agl/bin/communication|0|True|0|-l console|NULL|NULL|True|False|20|1000||||||0x0
-Launch5=VehicleModules|4|0|False|Positioning|/usr/agl/bin/Positioning|0|True|0|NULL|NULL|NULL|True|False|0|1000||||||0x0
-Launch6=SystemModules|5|0|False|SS_PowerService|/usr/agl/bin/SS_PowerService|0|True|0|-l console|NULL|NULL|True|False|0|1000||||||0x0
-Launch7=SystemModules|5|0|False|SS_TaskManager|/usr/agl/bin/tskmgr|0|True|0|-l console|NULL|NULL|True|True|0|1000||||||0x0
-Launch8=SystemModules|5|0|False|SS_ResourceMgr|/usr/agl/bin/resm|0|True|0|-l console|NULL|NULL|True|False|0|1000||||||0x0
diff --git a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch__CWORD84_.xml b/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch__CWORD84_.xml
deleted file mode 100755
index 8dd14bb7..00000000
--- a/meta-agl/meta-agl-basesystem/recipes-core/agl-systemd/files/usr/agl/conf/systemmanager/sm_launch__CWORD84_.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!-- group_id=1 -->
-<group name="CoreModules" wait_time="0" trigger="False" >
-  <launch 
-    name=MN_NS_NPPSERVICE path="/usr/agl/bin/NS_NPPService" priority=PR_NS_NPPSERVICE_S
-    critical="True" retry_cnt="0" arguments="-a SS_SysManager -r output=0x2"
-    restart="NULL" is_start_required="False"
-    shutdown_critical="True" shutdown_wait_time="20" fast_shutdown_wait_time="1000"
-    user_name=""
-  />
-  <launch 
-    name=MN_NS_BACKUPMGR path="/usr/agl/bin/NS_BackupMgr" priority=PR_NS_BACKUPMGR_S
-    critical="True" retry_cnt="0" arguments="-l console"
-    restart="NULL" is_start_required="True"
-    shutdown_critical="True" shutdown_wait_time="15" fast_shutdown_wait_time="1000"
-    user_name=""
-  />
-</group>
-<!-- group_id=2 -->
-<group name="SS_Logger" wait_time="0" trigger="False" >
-  <launch 
-    name=MN_SS_LOGGERSRV path="/usr/agl/bin/SS_LoggerService" priority=PR_SS_LOGGERSRV_S
-    critical="True" retry_cnt="0" arguments="-l console -p thrd=pdg.LogQueReader:30,thrd=pdg.TransmitQueReader:30,thrd=pdg.DumpQueReader:11,thrd=pdg.PerformanceQueReader:11,thrd=pdg.LogQueWriter:30,thrd=pdg.TransmitQueWriter:30,thrd=pdg.EvntLogQue:8,thrd=pdg.UdpQueWriter:10"
-    restart="NULL" is_start_required="True"
-    shutdown_critical="True" shutdown_wait_time="10" fast_shutdown_wait_time="1000"
-    user_name=""
-  />
-</group>
-<!-- group_id=3 -->
-<group name="ShadowModules" wait_time="0" trigger="False" >
-  <!--
-   In order to excute the termination process promptly, the shutdown_wait_time of GROUP4~ sha be a;; set tp 0,
-   and FrameworkunifiedOnStop shall be issued to the servies of GROUP~ at almost the same time upon termination.
-   Setting shutdown_wait_time in the COMMUNICATION of GROUP3 makes GROUP3 wait for GROUP4~ to terminate service (wait for FrameworkunifiedOnStop responses) all at once.
-   The reason for batch wait by GROUP3 is to save the LOG of tge ternubatuib processing at the time of ACC-OFF of services
-   because the LOG save processing is performed by the GROUP2 termination processing of SS_LoggerService.
-  -->
-  <launch 
-    name=MN_COMMUNICATION path="/usr/agl/bin/communication" priority=PR_COMMUNICATION_S
-    critical="True" retry_cnt="0" arguments="-l console"
-    restart="NULL" is_start_required="True"
-    shutdown_critical="False" shutdown_wait_time="20" fast_shutdown_wait_time="1000"
-    user_name=""
-  />
-</group>
-
-<!-- group_id=4 -->
-<group name="VehicleModules" wait_time="0" trigger="False" >
-  <launch
-    name=MN_POSITIONING path="/usr/agl/bin/Positioning" priority=PR_POSITIONING_S
-    critical="True" retry_cnt="0" arguments="NULL"
-    restart="NULL" is_start_required="True"
-    shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
-    user_name=""
-  />
-</group>
-
-<!-- group_id=5 -->
-<group name="SystemModules" wait_time="0" trigger="False" >
-  <launch 
-    name=MN_SS_POWERSERVICE path="/usr/agl/bin/SS_PowerService" priority=PR_SS_POWERSERVICE_S
-    critical="True" retry_cnt="0" arguments="-l console"
-    restart="NULL" is_start_required="True"
-    shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
-    user_name=""
-  />
-  <launch 
-    name=MN_SS_TASKMANAGER path="/usr/agl/bin/tskmgr" priority=PR_SS_TASKMANAGER_S
-    critical="True" retry_cnt="0" arguments="-l console"
-    restart="NULL" is_start_required="True"
-    shutdown_critical="True" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
-    user_name=""
-  />
-  <launch 
-    name=MN_SS_RESOURCEMGR path="/usr/agl/bin/resm" priority=PR_SS_RESOURCEMGR_S
-    critical="True" retry_cnt="0" arguments="-l console"
-    restart="NULL" is_start_required="True"
-    shutdown_critical="False" shutdown_wait_time="0" fast_shutdown_wait_time="1000"
-    user_name=""
-  />
-</group>
-<!-- group_id=6 -->
-<!-- group_id=7 -->
-<!-- group_id=8 -->
-<!-- group_id=9 -->
-<!-- group_id=10 -->
-<!-- group_id=11 -->
-<!-- group_id=12 -->
-<!-- group_id=13 -->
-<!-- group_id=14 -->
-<!-- group_id=15 -->
-<!-- group_id=16 -->
-<!-- group_id=17 -->
-<!-- group_id=18 -->
-<!-- group_id=19 -->
-<!-- group_id=20 -->
-<!-- group_id=21 -->
-<!-- group_id=22 -->
-<!-- group_id=23 -->
-<!-- group_id=24 -->
-<!-- group_id=25 -->
-<!-- group_id=26 -->
-<!-- group_id=28 -->
-<!-- group_id=29 -->
-<!-- group_id=30 -->
-<!-- group_id=31 -->
-<!-- group_id=32 -->
-<!-- group_id=33 -->
-<!-- group_id=34 -->
-<!-- group_id=35 -->
-<!-- group_id=36 -->
-<!-- group_id=37 -->
-<!-- group_id=38 -->
-<!-- group_id=39 -->
-<!-- group_id=40 -->
-<!-- group_id=41 -->
-<!-- group_id=42 -->