From ecf48d885f605f6422081b80bb743980527b03ac Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 24 Apr 2019 13:35:28 +0200 Subject: qt5-x11-image: cope with xwayland or native x11 Signed-off-by: Max Krummenacher --- recipes-images/images/qt5-x11-image.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes-images/images/qt5-x11-image.bb b/recipes-images/images/qt5-x11-image.bb index 66925ed..18ba3b7 100644 --- a/recipes-images/images/qt5-x11-image.bb +++ b/recipes-images/images/qt5-x11-image.bb @@ -184,8 +184,6 @@ IMAGE_INSTALL += " \ xset \ setxkbmap \ \ - xserver-nodm-init \ - \ xrdb \ xorg-minimal-fonts xserver-xorg-utils \ scrot \ @@ -202,6 +200,13 @@ IMAGE_INSTALL += " \ libpcreposix \ libxcomposite \ alsa-states \ + \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ + 'weston weston-init weston-examples libdrm-tests', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', \ + 'xserver-nodm-init', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \ + 'weston-xwayland xterm', '', d)} \ " require recipes-images/images/tdx-extra.inc -- cgit v1.2.3