From 9834232a8cbeb85c71fab0cb72cf32d43bc2400f Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Wed, 18 Mar 2026 09:49:46 +0100 Subject: [PATCH] weston: allow overriding the weston background from Yocto https://onedigi.atlassian.net/browse/DEL-9816 Signed-off-by: Francisco Gil --- .../recipes-graphics/wayland/weston-init.bbappend | 7 +++++-- .../{digi_background.png => background.png} | Bin .../recipes-graphics/wayland/weston-init/weston.ini | 2 +- .../recipes-graphics/wayland/weston-init.bbappend | 10 ++++++---- .../{digi_background.png => background.png} | Bin .../wayland/weston-init/imx-nxp-bsp/weston.ini | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) rename meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/{digi_background.png => background.png} (100%) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/{digi_background.png => background.png} (100%) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init.bbappend index 66d559b92..a03080fa4 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init.bbappend @@ -1,10 +1,13 @@ +# Copyright (C) 2026, Digi International Inc. + FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +WESTON_BACKGROUND_PNG ?= "${WORKDIR}/background.png" DEPENDS += "${@oe.utils.conditional('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" SRC_URI += " \ file://weston.ini \ - file://digi_background.png \ + file://background.png \ file://weston-launch.service \ file://weston-checkgpu.service \ file://weston_profile.sh \ @@ -42,7 +45,7 @@ do_install() { install -m 0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston - install -m 0644 ${WORKDIR}/digi_background.png ${D}${datadir}/weston/backgrounds/digi_background.png + install -m 0644 "${WESTON_BACKGROUND_PNG}" ${D}${datadir}/weston/backgrounds/background.png printf "\n[launcher]\nicon=${datadir}/weston/terminal.png\npath=${bindir}/weston-terminal\n" >> ${D}${sysconfdir}/xdg/weston/weston.ini install -d ${D}${systemd_system_unitdir} ${D}${sbindir} diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/digi_background.png b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/background.png similarity index 100% rename from meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/digi_background.png rename to meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/background.png diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/weston.ini b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/weston.ini index 09906118e..fd763963f 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/weston.ini +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/weston.ini @@ -13,7 +13,7 @@ remoting=remoting-plugin.so keymap_layout=us [shell] -background-image=/usr/share/weston/backgrounds/digi_background.png +background-image=/usr/share/weston/backgrounds/background.png background-type=scale-crop # HDMI connector diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend index 3a0c2b6ad..9613af937 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init.bbappend @@ -1,9 +1,10 @@ -# Copyright (C) 2019-2024, Digi International Inc. +# Copyright (C) 2019-2026, Digi International Inc. FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +WESTON_BACKGROUND_PNG ?= "${WORKDIR}/background.png" SRC_URI += " \ - file://digi_background.png \ + file://background.png \ file://profile \ " @@ -30,8 +31,9 @@ do_install:append() { # DEY customizations do_install:append() { + install -d ${D}${datadir}/weston/backgrounds install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh - install -Dm0644 ${WORKDIR}/digi_background.png ${D}${datadir}/weston/digi_background.png + install -Dm0644 "${WESTON_BACKGROUND_PNG}" ${D}${datadir}/weston/backgrounds/background.png printf "\n[launcher]\nicon=${datadir}/weston/terminal.png\npath=${bindir}/weston-terminal\n" >> ${D}${sysconfdir}/xdg/weston/weston.ini } @@ -41,4 +43,4 @@ do_install:append:ccimx93() { echo "QMLSCENE_DEVICE=softwarecontext" >> ${D}${sysconfdir}/default/weston } -FILES:${PN} += "${datadir}/weston/digi_background.png" +FILES:${PN} += "${datadir}/weston/backgrounds/background.png" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/digi_background.png b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/background.png similarity index 100% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/digi_background.png rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/background.png diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini index 53c84697e..db40e9c06 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini @@ -28,5 +28,5 @@ command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --n # Digi: Set custom background [shell] -background-image=/usr/share/weston/digi_background.png +background-image=/usr/share/weston/backgrounds/background.png background-type=scale-crop