Merge branch 'mrfrank/pi4-support' into 'kirkstone'

openharmony-standard: raspberrypi4-64 support

See merge request eclipse/oniro-oh/meta-openharmony!116

conf/local.conf.sample

@@ -118,3 +118,7 @@ MIRRORS:prepend = "git://gitee.com/openharmony/ git://github.com/openharmony/ \n
 #OPENHARMONY_VERSION = "3.1"
 
 USER_CLASSES += "buildstats buildstats-summary"
+
+# Uncomment if would like to use the Waveshare "C" 1024×600, 7 inch Capacitive 
+# Touch Screen LCD
+# WAVESHARE_1024X600_C_2_1 = "1"

recipes-openharmony/openharmony/files/accesstoken.service

@@ -8,6 +8,9 @@ Type=exec
 ExecStartPre=install -m 755 -d /data/service/e10/access_token
 # should run as system:system
 ExecStart=/usr/bin/sa_main /system/profile/accesstoken_service.xml
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/accountmgr.service

@@ -15,6 +15,9 @@ Group=system
 SupplementaryGroups=shell
 LimitNICE=40
 ExecStart=/usr/bin/sa_main /system/profile/accountmgr.xml
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/appspawn.service

@@ -18,6 +18,9 @@ Environment="XKB_CONFIG_EXTRA_PATH=/etc/openharmony/xkb"
 ExecStartPre=install -m 0755 -d /run/openharmony/appspawn
 LimitNICE=40
 ExecStart=/usr/bin/appspawn
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/deviceauth.service

@@ -15,6 +15,9 @@ Group=system
 SupplementaryGroups=shell
 LimitNICE=40
 ExecStart=/usr/bin/deviceauth_service
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/distributed_data.service

@@ -16,6 +16,9 @@ SupplementaryGroups=shell readproc
 CapabilityBoundingSet=CAP_DAC_READ_SEARCH
 LimitNICE=40
 ExecStart=/usr/bin/sa_main /system/profile/distributeddata.xml
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/distributedsched.service

@@ -17,6 +17,9 @@ Group=system
 SupplementaryGroups=shell
 LimitNICE=40
 ExecStart=/usr/bin/sa_main /system/profile/distributedsched.xml
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/dsoftbus.service

@@ -11,6 +11,8 @@ Wants=foundation.service
 Wants=huks.service
 # Requires SA: 4701
 Wants=deviceauth.service
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=notify
@@ -19,6 +21,9 @@ Group=system
 SupplementaryGroups=shell
 LimitNICE=40
 ExecStart=/usr/bin/sa_main /system/profile/softbus_server.xml
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/faultloggerd.service

@@ -11,6 +11,9 @@ User=root
 Group=system
 SupplementaryGroups=log
 ExecStart=/usr/bin/faultloggerd
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/foundation.service

@@ -18,6 +18,8 @@ Wants=distributed_data.service
 # Requires SA: 3202 5001 -- but from where?
 Requires=dev-dri-card0.device
 After=dev-dri-card0.device
+After=weston.service
+Wants=weston.service
 
 [Service]
 Type=notify
@@ -29,6 +31,9 @@ Group=system
 CapabilityBoundingSet=CAP_SYS_PTRACE CAP_KILL
 LimitNICE=40
 ExecStart=/usr/bin/sa_main /system/profile/foundation.xml
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/hdcd.service

@@ -8,6 +8,9 @@ After=param.service
 [Service]
 Type=exec
 ExecStart=/usr/bin/hdcd -t -l 3
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/hilogd.service

@@ -11,6 +11,9 @@ User=logd
 Group=log
 ExecStart=/usr/bin/hilogd
 ExecStartPost=hilog -G 16M
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/hiview.service

@@ -15,6 +15,9 @@ Group=system
 SupplementaryGroups=log
 LimitNICE=40
 ExecStart=/usr/bin/hiview
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 #[Install]
 #WantedBy=multi-user.target

recipes-openharmony/openharmony/files/huks.service

@@ -13,6 +13,9 @@ Group=system
 SupplementaryGroups=shell
 LimitNICE=40
 ExecStart=/usr/bin/sa_main /system/profile/huks_service.xml
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/inputmethod.service

@@ -14,6 +14,9 @@ SupplementaryGroups=shell
 CapabilityBoundingSet=CAP_SYS_TIME
 LimitNICE=40
 ExecStart=/usr/bin/sa_main /system/profile/inputmethod_service.xml
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/installs.service

@@ -9,6 +9,9 @@ After=hilogd.service
 [Service]
 Type=notify
 ExecStart=/usr/bin/installs
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/media.service

@@ -13,6 +13,9 @@ User=system
 Group=media_rw
 SupplementaryGroups=system
 LimitNICE=40
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/mmi-uinput.service

@@ -12,6 +12,9 @@ Group=system
 SupplementaryGroups=shell uhid
 LimitNICE=40
 ExecStart=/usr/bin/uinput_inject
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/multimodalinput.service

@@ -12,6 +12,9 @@ Group=system
 SupplementaryGroups=shell uhid
 LimitNICE=40
 ExecStart=/usr/bin/sa_main /system/profile/multimodalinputservice.xml
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/files/param.service

@@ -7,6 +7,9 @@ ExecStartPre=install -m 755 -d /run/openharmony/param
 ExecStartPre=install -m 755 -d /data/param
 StandardError=journal
 ExecStart=/usr/bin/param_service
+Restart=on-failure
+StartLimitInterval=300
+StartLimitBurst=5
 
 [Install]
 WantedBy=multi-user.target