From 9f1b9d0bae53383f1abe99c63543c8af7ba20998 Mon Sep 17 00:00:00 2001
From: Thomas Roos <throos@amazon.de>
Date: Fri, 20 Dec 2024 09:12:44 +0000
Subject: [PATCH] greengrass-bin: fix ptest, 3rd try

Stopping of autostarted greengrass-bin from systemd.
---
 recipes-iot/aws-iot-greengrass/files/run-ptest           | 5 +++++
 recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest | 1 -
 recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb  | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/recipes-iot/aws-iot-greengrass/files/run-ptest b/recipes-iot/aws-iot-greengrass/files/run-ptest
index 257216d83..17848f03b 100644
--- a/recipes-iot/aws-iot-greengrass/files/run-ptest
+++ b/recipes-iot/aws-iot-greengrass/files/run-ptest
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -euxo pipefail
 
+# Cause we starting this in the ptest separate.
+systemctl stop greengrass
+# some settle time
+sleep 10
+
 cd /greengrass/v2/alts/current/distro/bin
 chmod 755 loader
 ./loader  2>&1 > test.log &
diff --git a/recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest b/recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest
index f04a290cf..cd98b2750 100644
--- a/recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest
+++ b/recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest
@@ -3,7 +3,6 @@ set -euxo pipefail
 
 # this has been disabled cause this has issues with greengrass-bin
 systemctl enable ggl.gg-ipc.socket.socket
-systemctl enable ggl.ipc_component.socket
 systemctl start greengrass-lite.target
 
 # settle time
diff --git a/recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb b/recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb
index 25b04c993..1d7933c35 100644
--- a/recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb
+++ b/recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb
@@ -125,7 +125,6 @@ do_install:append() {
 # disable automatic startup of gg-lite, cause this will use the same port as greengrass-bin, conflicting.
 SYSTEMD_SERVICE:${PN}-ptest:remove = "greengrass-lite.target"
 SYSTEMD_SERVICE:${PN}-ptest:remove = "ggl.gg-ipc.socket.socket"
-SYSTEMD_SERVICE:${PN}-ptest:remove = "ggl.ipc_component.socket"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM:${PN} = "-r ${gg_group}; -r ${ggc_group}"