diff --git a/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init b/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init index cfb3319d3..f0b3f5b41 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init +++ b/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init @@ -16,8 +16,8 @@ readonly DEMO_NAME="lvgl_demo" readonly DEMO_PATH="/usr/bin/${DEMO_NAME}" readonly DEMO_TITLE="LVGL Demo Application" -readonly DEMO_DISPLAY="##DEMO_DISPLAY##" -readonly DEMO_ENV="##DEMO_ENV##" +readonly DEMO_DISPLAY="##LVGL_DEMO_DISPLAY##" +readonly DEMO_ENV="##LVGL_DEMO_ENV##" readonly PID_FILE="/run/${DEMO_NAME}.pid" log() { diff --git a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb index 9ab53ad14..6b3f95e0b 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb +++ b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb @@ -64,10 +64,12 @@ do_configure:prepend() { WESTON_SERVICE ?= "weston.service" WESTON_SERVICE:ccmp15 ?= "weston-launch.service" -DEMO_DISPLAY ?= "wayland-0" -DEMO_DISPLAY:ccmp15 ?= "wayland-1" -DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\${DEMO_DISPLAY}" -DEMO_ENV:ccimx6ul ?= "" + +LVGL_DEMO_DISPLAY ?= "wayland-0" +LVGL_DEMO_DISPLAY:ccmp15 ?= "wayland-1" +LVGL_DEMO_DISPLAY:ccimx93 ?= "wayland-1" +LVGL_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\${DEMO_DISPLAY}" +LVGL_DEMO_ENV:ccimx6ul ?= "" do_install:append() { install -d ${D}${bindir} @@ -85,8 +87,8 @@ do_install:append() { # Install wrapper bootscript to launch LVGL demo on boot install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/lvgl-demo-init ${D}${sysconfdir}/lvgl-demo-init - sed -i -e "s@##DEMO_DISPLAY##@${DEMO_DISPLAY}@g" \ - -e "s@##DEMO_ENV##@${DEMO_ENV}@g" \ + sed -i -e "s@##LVGL_DEMO_DISPLAY##@${LVGL_DEMO_DISPLAY}@g" \ + -e "s@##LVGL_DEMO_ENV##@${LVGL_DEMO_ENV}@g" \ "${D}${sysconfdir}/lvgl-demo-init" ln -sf ${sysconfdir}/lvgl-demo-init ${D}${sysconfdir}/init.d/lvgl-demo-init }