Move wayland related packages to packagegroups

Install all wayland related packages from common packagegroups,
when wayland DISTRO_FEATURES is enabled.

Include DRM and GBM dev packages to toolchain, libraries are already
included in the image as dependency from weston.

Change-Id: I88f3ded7c2bb5ca85318a7945f4739b968b9d97b
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

3 files changed, 3 insertions, 2 deletions

diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index d767fcc..971cc01 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -33,5 +33,6 @@ RDEPENDS_${PN} = "\
     nativesdk-perl-modules \
     nativesdk-bison \
     nativesdk-gperf \
+    ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland", "", d)} \
     ${MACHINE_EXTRA_INSTALL_SDK_HOST} \
     "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index d30573e..a038b86 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -53,5 +53,6 @@ RDEPENDS_${PN} = "\
         dbus-session-init \
         libmysqlclient \
         libpq \
+        ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \
         ${MACHINE_EXTRA_INSTALL} \
         "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
index ba56a5c..4d24c1e 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
@@ -26,8 +26,6 @@ LICENSE = "CLOSED"
 
 inherit packagegroup
 
-MACHINE_EXTRA_INSTALL_SDK ?= ""
-
 RDEPENDS_${PN} += "\
     packagegroup-core-standalone-sdk-target \
     base-files \
@@ -50,6 +48,7 @@ RDEPENDS_${PN} += "\
     wpa-supplicant-dev \
     libmysqlclient-dev \
     libpq-dev \
+    ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
     ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \
     ${MACHINE_EXTRA_INSTALL_SDK} \
     "