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>

6 files changed, 3 insertions, 22 deletions

diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 401dc64..dffbe94 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -33,10 +33,8 @@ MACHINE_EXTRA_INSTALL = "\
         libgles-omap3 \
         libgles-omap3-rawdemos \
         lighttpd \
-        wayland \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = "\
         libgles-omap3-dev \
-        wayland-dev \
         "
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index f3605a5..83fc812 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -39,9 +39,6 @@ MACHINE_EXTRA_INSTALL = "\
         libegl-mx6 \
         libgles2-mx6 \
         gst-fsl-plugin \
-        wayland \
-        weston \
-        weston-examples \
         libopencv-core \
         libopencv-imgproc \
         libopencv-objdetect \
@@ -53,15 +50,9 @@ MACHINE_EXTRA_INSTALL_SDK = " \
         libegl-mx6-dev \
         libgles2-mx6 \
         libgles2-mx6-dev \
-        libwayland-egl-mx6-dev \
-        libxkbcommon-dev \
         opencv-dev \
         "
 
-MACHINE_EXTRA_INSTALL_SDK_HOST = "\
-        wayland-nativesdk \
-        "
-
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
 
 # add support for both imx6qsabresd and imx6dlsabresd
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 1c7624d..0a9d388 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -52,9 +52,6 @@ MACHINE_EXTRA_INSTALL = "\
         libegl-mx6 \
         libgles2-mx6 \
         gst-fsl-plugin \
-        wayland \
-        weston \
-        weston-examples \
         bcm4330-nvram-config \
         libopencv-core \
         libopencv-imgproc \
@@ -67,15 +64,9 @@ MACHINE_EXTRA_INSTALL_SDK = " \
         libegl-mx6-dev \
         libgles2-mx6 \
         libgles2-mx6-dev \
-        libwayland-egl-mx6-dev \
-        libxkbcommon-dev \
         opencv-dev \
         "
 
-MACHINE_EXTRA_INSTALL_SDK_HOST = "\
-        wayland-nativesdk \
-        "
-
 B2QT_PLATFORM = "iMX6-eLinux"
 
 ADB_PRODUCTID = "0x0d02"
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} \
     "