[meta-freescale] [meta-fsl-demos][PATCH 1/4] fsl-image-machine-test: Add XWayland support.

[Tom Hochstein]

If DISTRO_FEATURES contains x11 and wayland, configure the image
with an XWayland backend.

Signed-off-by: Tom Hochstein <tom.hochstein at nxp.com>
---
 recipes-fsl/images/fsl-image-machine-test.bb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/recipes-fsl/images/fsl-image-machine-test.bb b/recipes-fsl/images/fsl-image-machine-test.bb
index def19ee..c0ae7fa 100644
--- a/recipes-fsl/images/fsl-image-machine-test.bb
+++ b/recipes-fsl/images/fsl-image-machine-test.bb
@@ -3,7 +3,9 @@ Freescale's multimedia packages (VPU and GPU) when available, and \
 test and benchmark applications."
 
 IMAGE_FEATURES += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'x11-base', \
+                                                       '', d), d)} \
     debug-tweaks \
     tools-testapps \
     tools-profile \
@@ -20,7 +22,8 @@ CORE_IMAGE_EXTRA_INSTALL += " \
     packagegroup-fsl-tools-gpu-external \
     packagegroup-fsl-tools-testapps \
     packagegroup-fsl-tools-benchmark \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-                      bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init', \
-                                    '', d), d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
+                         'weston weston-init', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \
+                         'weston-xwayland xterm', '', d)} \
 "
-- 
1.9.1