2025 09 30 master next improvements (#277)

Author: tro

meta-aws-demos/recipes-core/images/aws-iot-greengrass-lite-demo-image/README.md

@@ -267,7 +267,6 @@ Manifests:
           echo Bootstrap
           BUCKET=rauc-adaptive-test
           UPDATEFILE=aws-iot-greengrass-lite-demo-bundle-raspberrypi-armv8.raucb
-
           REGION=$(aws s3api get-bucket-location --bucket "$BUCKET" --query LocationConstraint --output text)
           echo $REGION
           BUNDLE_URL=$(aws s3 presign "s3://$BUCKET/$UPDATEFILE" --expires-in 3600 --endpoint-url "https://s3.$REGION.amazonaws.com")

meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-config-init.bb

@@ -7,11 +7,13 @@ SRC_URI = "\
     file://greengrass-config-init.service \
     file://greengrass-config-init.sh \
     file://wlan.network \
+    file://systemd-networkd-wait-online.service.d-override.conf \
 "
 
 FILES:${PN} += "\
     ${systemd_unitdir}/system/greengrass-config-init.service \
     ${sysconfdir}/systemd/network/wlan.network \
+    ${systemd_unitdir}/system/systemd-networkd-wait-online.service.d/override.conf \
 "
 
 RDEPENDS:${PN} += "\
@@ -39,5 +41,9 @@ do_install() {
     install -d -m 0755 ${D}${sysconfdir}/systemd/network
     install -m 0644 ${WORKDIR}/wlan.network ${D}${sysconfdir}/systemd/network/
 
+    # Install systemd override for networkd-wait-online
+    install -d ${D}${systemd_unitdir}/system/systemd-networkd-wait-online.service.d/
+    install -m 0644 ${WORKDIR}/systemd-networkd-wait-online.service.d-override.conf ${D}${systemd_unitdir}/system/systemd-networkd-wait-online.service.d/override.conf
+
     install -d ${D}${sysconfdir}/wpa_supplicant
 }

meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-config-init/systemd-networkd-wait-online.service.d-override.conf

@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=/lib/systemd/systemd-networkd-wait-online --any

meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl.aws.greengrass.TokenExchangeService.service.d-fleet-provisioning.conf

@@ -0,0 +1,2 @@
+[Unit]
+After=ggl.gg_fleetprovisioning.service

meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl.core.tesd.service.d-fleet-provisioning.conf

@@ -0,0 +1,2 @@
+[Unit]
+After=ggl.gg_fleetprovisioning.service

meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl.gg_fleetprovisioning.service

@@ -5,7 +5,6 @@ Before=ggl.core.iotcored.service
 After=systemd-time-wait-sync.service
 # Only run if device is not already provisioned
 ConditionPathExists=!/var/lib/greengrass/provisioned-cert/certificate.pem.crt
-StartLimitBurst=3
 
 [Service]
 Type=oneshot
@@ -15,7 +14,8 @@ ExecStartPre=/bin/sh -c '\
 ExecStart=/usr/bin/fleet-provisioning
 Restart=on-failure
 RestartSec=10s
-TimeoutSec=300
+# try forever
+TimeoutSec=0
 # Consider exit codes 0, 1 as successful completion
 SuccessExitStatus=0 1
 User=root

meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite/ggl.gg_pre-fleetprovisioning.service

@@ -10,7 +10,7 @@ ConditionPathExists=!/var/lib/greengrass/provisioned-cert
 [Service]
 Type=oneshot
 ExecStart=/bin/sh -c '\
-    default_iface=$(ip route | grep default | awk "{print \$5}" | head -n1); \
+    default_iface=$(ip route | grep default | cut -d" " -f5 | head -n1); \
     mac_address=$(cat /sys/class/net/"$default_iface"/address | tr ":" "_"); \
     sed -i "s/<unique>/$mac_address/g" "/etc/greengrass/config.d/fleetprovisioning.yaml";'
 Restart=on-failure

meta-aws-demos/recipes-iot/aws-iot-greengrass/greengrass-lite_git.bb

@@ -44,6 +44,8 @@ SRC_URI = "\
     ${@bb.utils.contains('PACKAGECONFIG','localdeployment','file://ggl-deploy-image-components','',d)} \
     ${@bb.utils.contains('PACKAGECONFIG','fleetprovisioning','file://ggl.gg_pre-fleetprovisioning.service','',d)} \
     ${@bb.utils.contains('PACKAGECONFIG','fleetprovisioning','file://ggl.gg_fleetprovisioning.service','',d)} \
+    ${@bb.utils.contains('PACKAGECONFIG','fleetprovisioning','file://ggl.core.tesd.service.d-fleet-provisioning.conf','',d)} \
+    ${@bb.utils.contains('PACKAGECONFIG','fleetprovisioning','file://ggl.aws.greengrass.TokenExchangeService.service.d-fleet-provisioning.conf','',d)} \
 "
 
 SRCREV_ggl = "c116286afaee26736dbcf3ed0a7a897c3bb2f921"
@@ -89,6 +91,8 @@ FILES:${PN}:append = " \
     ${@bb.utils.contains('PACKAGECONFIG','localdeployment','${bindir}/ggl-deploy-image-components','',d)} \
     ${@bb.utils.contains('PACKAGECONFIG','fleetprovisioning','${systemd_unitdir}/system/ggl.gg_fleetprovisioning.service','',d)} \
     ${@bb.utils.contains('PACKAGECONFIG','fleetprovisioning','${systemd_unitdir}/system/ggl.gg_pre-fleetprovisioning.service','',d)} \
+    ${@bb.utils.contains('PACKAGECONFIG','fleetprovisioning','${systemd_unitdir}/system/ggl.core.tesd.service.d/fleet-provisioning.conf','',d)} \
+    ${@bb.utils.contains('PACKAGECONFIG','fleetprovisioning','${systemd_unitdir}/system/ggl.aws.greengrass.TokenExchangeService.service.d/fleet-provisioning.conf','',d)} \
     /usr/components/* \
     /usr/share/greengrass-image-components/* \
     ${sysconfdir}/sudoers.d/${BPN} \
@@ -123,6 +127,10 @@ EXTRA_OECMAKE:append = " -DGGL_LOG_LEVEL=INFO"
 # No warnings should be in commited code, not enabled yet
 # CFLAGS:append = " -Werror"
 
+# Disable -D_FORTIFY_SOURCE=2 as we set it to -D_FORTIFY_SOURCE=3
+TARGET_CFLAGS:remove = "-D_FORTIFY_SOURCE=2"
+OECMAKE_C_FLAGS:remove = "-D_FORTIFY_SOURCE=2"
+
 SYSTEMD_SERVICE:${PN} = "\
     ggl.aws_iot_mqtt.socket \
     ggl.aws_iot_tes.socket \
@@ -191,6 +199,14 @@ do_install:append() {
         install -m 0644 ${WORKDIR}/ggl.gg_pre-fleetprovisioning.service ${D}${systemd_unitdir}/system/
         install -m 0644 ${WORKDIR}/ggl.gg_fleetprovisioning.service ${D}${systemd_unitdir}/system/
 
+        # Install systemd override for tesd service
+        install -d ${D}${systemd_unitdir}/system/ggl.core.tesd.service.d/
+        install -m 0644 ${WORKDIR}/ggl.core.tesd.service.d-fleet-provisioning.conf ${D}${systemd_unitdir}/system/ggl.core.tesd.service.d/fleet-provisioning.conf
+
+        # Install systemd override for TokenExchangeService
+        install -d ${D}${systemd_unitdir}/system/ggl.aws.greengrass.TokenExchangeService.service.d/
+        install -m 0644 ${WORKDIR}/ggl.aws.greengrass.TokenExchangeService.service.d-fleet-provisioning.conf ${D}${systemd_unitdir}/system/ggl.aws.greengrass.TokenExchangeService.service.d/fleet-provisioning.conf
+
         # Replace variables in the config file using a temporary file to ensure proper expansion
         cat > ${D}/${sysconfdir}/greengrass/config.d/fleetprovisioning.yaml << EOF
 ---