From 830c9ff629daa24908a769d794393a69235dc1f9 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 11 Jan 2022 13:04:18 +0100 Subject: [PATCH] weston-init: add customization directly in weston.ini instead of do_install() We already have a copy of NXP's weston.ini, so there's no need to manuallly append to it in our do_install_append(). Simply add our changes for our custom desktop background directly in the source file. Signed-off-by: Gabriel Valcazar --- .../recipes-graphics/wayland/weston-init.bbappend | 8 -------- .../recipes-graphics/wayland/weston-init/imx/weston.ini | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend index f6c2c72c3..33b8984ee 100644 --- a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend @@ -47,14 +47,6 @@ do_install_append() { # Add custom background image install -d ${D}${datadir}/weston install ${WORKDIR}/digi_background.png ${D}${datadir}/weston - - # Customize weston ini file - cat <>${D}${sysconfdir}/xdg/weston/weston.ini - -[shell] -background-image=/usr/share/weston/digi_background.png -background-type=scale-crop -EOF } FILES_${PN} += "${datadir}/weston/digi_background.png" diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init/imx/weston.ini b/meta-digi-dey/recipes-graphics/wayland/weston-init/imx/weston.ini index eccc633a9..76ec836ea 100644 --- a/meta-digi-dey/recipes-graphics/wayland/weston-init/imx/weston.ini +++ b/meta-digi-dey/recipes-graphics/wayland/weston-init/imx/weston.ini @@ -30,3 +30,8 @@ touchscreen_calibrator=true [screen-share] command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize --rdp-tls-cert=/etc/freerdp/keys/server.crt --rdp-tls-key=/etc/freerdp/keys/server.key + +# Digi: Set custom background +[shell] +background-image=/usr/share/weston/digi_background.png +background-type=scale-crop