From 59743abeb588bad56f405f823ccfb73293ab0d8d Mon Sep 17 00:00:00 2001
From: Thomas Roos <throos@amazon.de>
Date: Wed, 18 Dec 2024 15:40:30 +0000
Subject: [PATCH] greengrass-lite: fix ptest for greengrass-bin

Disable automatic startup of gg-lite, cause this will use the same
port as greengrass-bin, conflicting.

(cherry picked from commit c5c85826be75903a085870131c009eb9b7357a3b)
---
 recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest | 7 +++++++
 recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb  | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest b/recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest
index 027c9867b..cd98b2750 100644
--- a/recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest
+++ b/recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest
@@ -1,6 +1,13 @@
 #!/bin/sh
 set -euxo pipefail
 
+# this has been disabled cause this has issues with greengrass-bin
+systemctl enable ggl.gg-ipc.socket.socket
+systemctl start greengrass-lite.target
+
+# settle time
+sleep 10
+
 /usr/bin/configtest
 
 RETVAL=$?
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 89bffac20..22d9ed8d9 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
@@ -122,6 +122,10 @@ do_install:append() {
     chown ${gg_user}:${gg_group} ${D}/${gg_workingdir}
 }
 
+# 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"
+
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM:${PN} = "-r ${gg_group}; -r ${ggc_group}"
 USERADD_PARAM:${PN} = "-r -M -N -g  ${gg_group} -s /bin/false ${gg_user}; -r -M -N -g  ${ggc_group} -s /bin/false ${ggc_user}"