summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-05-29 20:08:20 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2019-05-29 20:09:54 +0200
commit35f98e0c428ea1b858c8edb942d7d2d9d8b69a43 (patch)
treec8e1e5c69c836b80be87202007a5b27591eb5671
parentbe5b0af7fa7fa341363e0ccfe0c7f8a85213d37f (diff)
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 <max.krummenacher@toradex.com>
-rw-r--r--recipes-images/images/console-tdx-image.bb7
1 files 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