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

lvgl-demo: rename bitbake variables by adding LVGL_ prefix 

This is to avoid duplicating names with variable DEMO_DISPLAY inside
the lvgl-demo-init script itself.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2024-01-29 18:27:25 +01:00
parent 26dc437a25
commit cc295eabe0
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init
View File

@ -16,8 +16,8 @@
readonly DEMO_NAME="lvgl_demo" readonly DEMO_NAME="lvgl_demo"
readonly DEMO_PATH="/usr/bin/${DEMO_NAME}" readonly DEMO_PATH="/usr/bin/${DEMO_NAME}"
readonly DEMO_TITLE="LVGL Demo Application" readonly DEMO_TITLE="LVGL Demo Application"
readonly DEMO_DISPLAY="##DEMO_DISPLAY##" readonly DEMO_DISPLAY="##LVGL_DEMO_DISPLAY##"
readonly DEMO_ENV="##DEMO_ENV##" readonly DEMO_ENV="##LVGL_DEMO_ENV##"
readonly PID_FILE="/run/${DEMO_NAME}.pid" readonly PID_FILE="/run/${DEMO_NAME}.pid"
log() { log() {

14
meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb
View File

@ -64,10 +64,12 @@ do_configure:prepend() {
WESTON_SERVICE ?= "weston.service" WESTON_SERVICE ?= "weston.service"
WESTON_SERVICE:ccmp15 ?= "weston-launch.service" WESTON_SERVICE:ccmp15 ?= "weston-launch.service"
DEMO_DISPLAY ?= "wayland-0"
DEMO_DISPLAY:ccmp15 ?= "wayland-1" LVGL_DEMO_DISPLAY ?= "wayland-0"
DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\${DEMO_DISPLAY}" LVGL_DEMO_DISPLAY:ccmp15 ?= "wayland-1"
DEMO_ENV:ccimx6ul ?= "" 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() { do_install:append() {
install -d ${D}${bindir} install -d ${D}${bindir}
@ -85,8 +87,8 @@ do_install:append() {
# Install wrapper bootscript to launch LVGL demo on boot # Install wrapper bootscript to launch LVGL demo on boot
install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/lvgl-demo-init ${D}${sysconfdir}/lvgl-demo-init install -m 0755 ${WORKDIR}/lvgl-demo-init ${D}${sysconfdir}/lvgl-demo-init
sed -i -e "s@##DEMO_DISPLAY##@${DEMO_DISPLAY}@g" \ sed -i -e "s@##LVGL_DEMO_DISPLAY##@${LVGL_DEMO_DISPLAY}@g" \
-e "s@##DEMO_ENV##@${DEMO_ENV}@g" \ -e "s@##LVGL_DEMO_ENV##@${LVGL_DEMO_ENV}@g" \
"${D}${sysconfdir}/lvgl-demo-init" "${D}${sysconfdir}/lvgl-demo-init"
ln -sf ${sysconfdir}/lvgl-demo-init ${D}${sysconfdir}/init.d/lvgl-demo-init ln -sf ${sysconfdir}/lvgl-demo-init ${D}${sysconfdir}/init.d/lvgl-demo-init
} }