Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ccmp15: crank-demo: fix autostart of crank app on top of weston 

NXP and ST platforms launches weston in a different way. In ccmp15 we must wait
for the socket at '/run/user/0/wayland-1' after weston is initialized, while
that is not required on NXP platforms.

This commit reverts part of the changes in commit
31d9863fea.

Signed-off-by: Tatiana Leon <Tatiana.Leon@digi.com>
This commit is contained in:
Tatiana Leon 2023-02-02 09:44:22 +01:00
parent 747dbddf3b
commit 1214a094b6
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meta-digi-dey/recipes-crank/crank-demos/crank-demos/crank-demo-init
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
#=============================================================================== #===============================================================================
# #
# Copyright (C) 2022 by Digi International Inc. # Copyright (C) 2022, 2023 by Digi International Inc.
# All rights reserved. # All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify it # This program is free software; you can redistribute it and/or modify it
@ -58,6 +58,20 @@ check_is_running() {
return 1 return 1
} }
wait_for_wayland() {
local count=20
local wayland_socket="/run/user/0/${DEMO_DISPLAY}"
while [ ! -S "${wayland_socket}" ]; do
sleep 1
count=$((count-1))
if [ "${count}" = 0 ]; then
return 1
fi
done
return 0
}
stop() { stop() {
check_is_running || return check_is_running || return
@ -78,6 +92,7 @@ stop() {
start() { start() {
check_is_running && { log warning "start: ${CRANK_DEMO} ALREADY running"; exit 0; } check_is_running && { log warning "start: ${CRANK_DEMO} ALREADY running"; exit 0; }
[ -d "/usr/share/wayland" ] && wait_for_wayland
env ${DEMO_ENV} ${SB_LAUNCHER_SCRIPT} ${DEMO_OPTS} ${DEMO} >/dev/null 2>&1 & env ${DEMO_ENV} ${SB_LAUNCHER_SCRIPT} ${DEMO_OPTS} ${DEMO} >/dev/null 2>&1 &
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo $! > ${PID_FILE} echo $! > ${PID_FILE}