From 35f98e0c428ea1b858c8edb942d7d2d9d8b69a43 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 29 May 2019 20:08:20 +0200 Subject: console-tdx-image: rework starting a graphical app Include a launcher for the weston-terminal if built for wayland/xwayland. Rework that the X11 launcher is only used if not using xwayland. Signed-off-by: Max Krummenacher --- recipes-images/images/console-tdx-image.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-images/images/console-tdx-image.bb b/recipes-images/images/console-tdx-image.bb index 90c35ca..c8fc120 100644 --- a/recipes-images/images/console-tdx-image.bb +++ b/recipes-images/images/console-tdx-image.bb @@ -35,10 +35,11 @@ IMAGE_INSTALL += " \ ${ROOTFS_PKGMANAGE_PKGS} \ timestamp-service \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ - 'weston weston-examples', '', d)} \ + 'weston weston-init wayland-terminal-launch', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \ - 'weston-xwayland xterm', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x-window-xterm', '', d)} \ + 'weston-xwayland xterm', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', \ + 'x-window-xterm', '', d), d)} \ " require recipes-images/images/tdx-extra.inc -- cgit v1.2.3