From 31d9863feabcfb00356c2d697da51c3431738c47 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Wed, 18 Jan 2023 14:50:39 +0100
Subject: [PATCH] crank-demo: fix autostarting app on top of weston

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../crank-demos/crank-demos/crank-demo-init      | 16 ----------------
 .../crank-demos/crank-demos/crank-demo.service   |  1 +
 .../recipes-crank/crank-demos/crank-demos_7.2.bb |  2 +-
 .../crank-sbengine/crank-sbengine/sb-launcher    |  2 +-
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo-init b/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo-init
index c2319c736..a9eeb67f3 100644
--- a/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo-init
+++ b/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo-init
@@ -58,21 +58,6 @@ check_is_running() {
 	return 1
 }
 
-wait_for_wayland() {
-	local count=20
-	local wayland_socket="/run/user/0/${DEMO_DISPLAY}"
-
-	[ -S "${wayland_socket}" -o ! -d "/usr/share/wayland/" ] && return 0
-	while [ ! -S "${wayland_socket}" ]; do
-		sleep 1
-		count=$((count-1))
-		if [ "${count}" = 0 ]; then
-			return 1
-		fi
-	done
-	return 0
-}
-
 stop() {
 	check_is_running || return
 
@@ -93,7 +78,6 @@ stop() {
 start() {
 	check_is_running && { log warning "start: ${CRANK_DEMO} ALREADY running"; exit 0; }
 
-	wait_for_wayland
 	env ${DEMO_ENV} ${SB_LAUNCHER_SCRIPT} ${DEMO_OPTS} ${DEMO} >/dev/null 2>&1 &
 	if [ $? -eq 0 ]; then
 		echo $! > ${PID_FILE}
diff --git a/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo.service b/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo.service
index 7d4144c69..f33491cfa 100644
--- a/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo.service
+++ b/meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo.service
@@ -4,6 +4,7 @@ Documentation=https://www.cranksoftware.com/
 
 # Make sure we are started after graphic service is available
 After=##WESTON_SERVICE##
+Requires=##WESTON_SERVICE##
 
 [Service]
 Type=forking
diff --git a/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb b/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb
index 28d49b20e..add670e35 100644
--- a/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb
+++ b/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb
@@ -13,7 +13,7 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "90a7fc258cdaa5f9afcf57224da8bbc5a330b957db88335f555369123a1432ab"
 
-WESTON_SERVICE ?= "weston@root.service"
+WESTON_SERVICE ?= "weston.service"
 WESTON_SERVICE:ccmp15 ?= "weston-launch.service"
 
 CRANK_DEMOS_TARBALL_PATH ?= ""
diff --git a/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine/sb-launcher b/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine/sb-launcher
index 5024aeafb..29a9b8a0e 100644
--- a/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine/sb-launcher
+++ b/meta-digi-dey/recipes-crank/crank-sbengine/crank-sbengine/sb-launcher
@@ -2,4 +2,4 @@
 
 ENGINE="/usr/share/crank/sbengine"
 
-exec "env LD_LIBRARY_PATH=${ENGINE}/lib SB_PLUGINS=${ENGINE}/plugins ${ENGINE}/bin/sbengine $*"
+exec env LD_LIBRARY_PATH=${ENGINE}/lib SB_PLUGINS=${ENGINE}/plugins ${ENGINE}/bin/sbengine "$@"