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

crank: remove weston user from demo configuration 

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
This commit is contained in:
Mike Engel 2023-01-10 16:41:26 +01:00
parent afc0bc6ef5
commit f20e127a82
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,6 @@ readonly DEMO="##CRANK_DEMO_PATH##"
readonly DEMO_DISPLAY="##CRANK_DEMO_DISPLAY##"
readonly DEMO_OPTS="##CRANK_DEMO_OPTIONS##"
readonly DEMO_ENV="##CRANK_DEMO_ENV##"
readonly DEMO_USER="##CRANK_DEMO_USER##"
readonly SB_LAUNCHER="sb-launcher"
readonly SB_LAUNCHER_SCRIPT="/usr/bin/${SB_LAUNCHER}"
readonly CRANK_DEMO="crank-demo"
@ -61,7 +60,7 @@ check_is_running() {
wait_for_wayland() {
local count=20
local wayland_socket="/run/user/$(id -u ${DEMO_USER})/${DEMO_DISPLAY}"
local wayland_socket="/run/user/0/${DEMO_DISPLAY}"
[ -S "${wayland_socket}" -o ! -d "/usr/share/wayland/" ] && return 0
while [ ! -S "${wayland_socket}" ]; do
@ -95,7 +94,7 @@ start() {
check_is_running && { log warning "start: ${CRANK_DEMO} ALREADY running"; exit 0; }
wait_for_wayland
env ${DEMO_ENV} ${SB_LAUNCHER_SCRIPT} ${DEMO_USER} ${DEMO_OPTS} ${DEMO} >/dev/null 2>&1 &
env ${DEMO_ENV} ${SB_LAUNCHER_SCRIPT} ${DEMO_OPTS} ${DEMO} >/dev/null 2>&1 &
if [ $? -eq 0 ]; then
echo $! > ${PID_FILE}
log info "$(cat ${PID_FILE})"

4
meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb
View File

@ -21,12 +21,9 @@ CRANK_DEMO_DISPLAY ?= "wayland-0"
CRANK_DEMO_DISPLAY:ccmp15 ?= "wayland-1"
CRANK_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\${DEMO_DISPLAY}"
CRANK_DEMO_ENV:ccimx6ul ?= ""
CRANK_DEMO_ENV:ccmp15 ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/1000 WAYLAND_DISPLAY=\${DEMO_DISPLAY}"
CRANK_DEMO_OPTIONS ?= "-orender_mgr,multisample=0"
CRANK_DEMO_OPTIONS:ccimx6ul ?= "-orender_mgr,multisample=0 -odev-input,mouse=/dev/input/mouse0 -oscreen_mgr,swcursor"
CRANK_DEMO_PATH ?= "${datadir}/crank/apps/OpenGL_WideScreen/1280x720.gapp"
CRANK_DEMO_USER ?= "root"
CRANK_DEMO_USER:ccmp15 ?= "weston"
# The tarball is only available for downloading after registration, so provide
# a PREMIRROR to a local directory that can be configured in the project's
@ -83,7 +80,6 @@ do_install () {
sed -i -e "s@##CRANK_DEMO_PATH##@${CRANK_DEMO_PATH}@g" \
-e "s@##CRANK_DEMO_OPTIONS##@${CRANK_DEMO_OPTIONS}@g" \
-e "s@##CRANK_DEMO_ENV##@${CRANK_DEMO_ENV}@g" \
-e "s@##CRANK_DEMO_USER##@${CRANK_DEMO_USER}@g" \
-e "s@##CRANK_DEMO_DISPLAY##@${CRANK_DEMO_DISPLAY}@g" \
"${D}${sysconfdir}/crank-demo"
ln -sf ${sysconfdir}/crank-demo ${D}${sysconfdir}/init.d/crank-demo