From 68b4da3d30e567f6c26bc6fcde67e88181deaabf Mon Sep 17 00:00:00 2001 From: Christian Kohn Date: Wed, 21 Dec 2022 16:27:08 -0800 Subject: weston-init: Don't replace weston.ini Instead of replacing the template weston.ini from the original recipe, augment it as needed: 1. There is a PACKAGECONFIG option to set idle-time=0. Use it. 2. For zynqmp device enablement, set gbm-format=rgb565. This keeps the template weston.ini intact so the user can easily uncomment the desired options while running on the target. Signed-off-by: Christian Kohn Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-graphics/wayland/files/weston.ini | 6 ------ meta-xilinx-core/recipes-graphics/wayland/weston-init.bbappend | 6 ++---- 2 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 meta-xilinx-core/recipes-graphics/wayland/files/weston.ini (limited to 'meta-xilinx-core') diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/weston.ini b/meta-xilinx-core/recipes-graphics/wayland/files/weston.ini deleted file mode 100644 index 2ff81795..00000000 --- a/meta-xilinx-core/recipes-graphics/wayland/files/weston.ini +++ /dev/null @@ -1,6 +0,0 @@ -[core] -idle-time=0 - -gbm-format=rgb565 - -require-input=false diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston-init.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston-init.bbappend index 3b2b17fd..f0d64e27 100644 --- a/meta-xilinx-core/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-xilinx-core/recipes-graphics/wayland/weston-init.bbappend @@ -1,7 +1,5 @@ -FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:" - -SRC_URI:append:zynqmp = " file://weston.ini" +PACKAGECONFIG += "no-idle-timeout" do_install:append:zynqmp() { - install -D -p -m0644 ${WORKDIR}/weston.ini ${D}/${sysconfdir}/xdg/weston/weston.ini + sed -i -e "/^\[core\]/a gbm-format=rgb565" ${D}${sysconfdir}/xdg/weston/weston.ini } -- cgit v1.2.3-54-g00ecf