[meta-freescale] [meta-fsl-arm][PATCH v3 7/7] imx-base.inc: Remove X11 display server packages for XWayland

[Tom Hochstein]

From: Neena Busireddy <neena.busireddy at freescale.com>

Do not install X11 display server packages when both X11 and Wayland DISTRO_FEATURES are
selected (XWayland).

Signed-off-by: Tom Hochstein <tom.hochstein at freescale.com>
---
 conf/machine/include/imx-base.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index bd64bc5..37affbc 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -28,10 +28,10 @@ UBOOT_ENTRYPOINT_vf = "0x80008000"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER_DRIVER = "xf86-video-fbdev"
-XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante"
-XSERVER_DRIVER_mx6ul = "xf86-video-fbdev"
+XSERVER_DRIVER_mx6 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', '', 'xf86-video-imxfb-vivante', d)}"
+XSERVER_DRIVER_mx6ul = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', '', 'xf86-video-fbdev', d)}"
 XSERVER = "xserver-xorg \
-           xf86-input-evdev \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', '', 'xf86-input-evdev', d)} \
            ${XSERVER_DRIVER}"
 
 # Ship kernel modules
-- 
2.1.4