Skip to content

Commit

Permalink
greengrass-lite: fix ptest for greengrass-bin
Browse files Browse the repository at this point in the history
Disable automatic startup of gg-lite, cause this will use the same
port as greengrass-bin, conflicting.

(cherry picked from commit c5c8582)
  • Loading branch information
thomas-roos committed Dec 18, 2024
1 parent 502a8f2 commit 5a27dac
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
7 changes: 7 additions & 0 deletions recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest
Original file line number Diff line number Diff line change
@@ -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=$?
Expand Down
4 changes: 4 additions & 0 deletions recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

0 comments on commit 5a27dac

Please sign in to comment.