diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-04-24 13:35:28 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-04-24 13:35:28 +0200 |
commit | ecf48d885f605f6422081b80bb743980527b03ac (patch) | |
tree | 2fe9df14e609284d2a54720b279ba0cc81066a1a | |
parent | 35301c8466a7edae6f9b9c4ab915673f3028e3a4 (diff) |
qt5-x11-image: cope with xwayland or native x11
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r-- | recipes-images/images/qt5-x11-image.bb | 9 |
1 files 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 |