From 9f7ed3e2b193151e9f2ad5dd1c66cc78df2d2f91 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 31 Jan 2023 19:28:33 +0100
Subject: [PATCH] dey-image-graphical: add 'weston' image feature

For 'wayland' enabled distro features, 'weston' is added as image
feature. This is later used in poky to change the SYSTEMD_DEFAULT_TARGET
to 'graphical.target' which is the correct systemd default target for
graphical images.

This allows to delete the workaround we have in 'weston-init'
recipe to start weston automatically on boot.

Also delete some packages from CORE_IMAGE_EXTRA_INSTALL:

- weston-init and weston-examples are included as part of the 'weston'
  image feature.
- gtk+3-demo: removed from the default images, as it is a graphic framework
  we are not promoting.
- xterm: removed as weston does already provide a terminal (weston-terminal).

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../recipes-graphics/wayland/weston-init.bbappend            | 3 ---
 meta-digi-dey/recipes-core/images/dey-image-graphical.inc    | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

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 1deaca1b9..d83553614 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
@@ -34,9 +34,6 @@ do_install:append() {
 do_install:append() {
     install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh
     install -Dm0644 ${WORKDIR}/digi_background.png ${D}${datadir}/weston/digi_background.png
-
-    update_file "Before=graphical.target" "Before=multi-user.target" ${D}${systemd_system_unitdir}/weston.service
-    update_file "WantedBy=graphical.target" "WantedBy=multi-user.target" ${D}${systemd_system_unitdir}/weston.service
 }
 
 FILES:${PN} += "${datadir}/weston/digi_background.png"
diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc
index 3449c613c..c80ff800d 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc
+++ b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc
@@ -21,7 +21,7 @@ IMAGE_FEATURES += " \
     eclipse-debug \
     package-management \
     ssh-server-dropbear \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \
        bb.utils.contains('DISTRO_FEATURES',     'x11', 'x11-base x11-sato', \
                                                        '', d), d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'accel-video', 'dey-gstreamer', '', d)} \
@@ -60,7 +60,6 @@ BAD_RECOMMENDATIONS += "eudev-hwdb"
 export IMAGE_BASENAME = "dey-image-${GRAPHICAL_CORE}-${GRAPHICAL_BACKEND}"
 
 CORE_IMAGE_EXTRA_INSTALL += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init weston-examples gtk+3-demo', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland xterm', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland', '', d)} \
     dey-examples-digiapix \
 "