Use emulator specific packages in image and toolchain

Change-Id: Icaaaa8a54062945c3f296a351348d8dac1839137
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>

2 files changed, 19 insertions, 4 deletions

diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index 3ea50c7..077b219 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -30,6 +30,14 @@ MACHINE_EXTRA_INSTALL_beagleboard += "\
         libgles-omap3-rawdemos \
         "
 
+MACHINE_EXTRA_INSTALL_emulator = "\
+        llvm3.2 \
+        libegl-mesa \
+        libegl-gallium \
+        libgles2-mesa \
+        mount-vboxsf \
+        "
+
 GSTREAMER_EXTRA_INSTALL = "\
         gst-meta-video \
         gst-meta-audio \
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
index 1a56190..32b3ab4 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
@@ -5,23 +5,30 @@ LICENSE = "CLOSED"
 
 PACKAGES = "${PN}"
 
-SGX_mx6 = " \
+MACHINE_EXTRA_INSTALL = ""
+
+MACHINE_EXTRA_INSTALL_mx6 = " \
     gpu-viv-bin-mx6q-dev \
     libgal-mx6 \
     libgles-mx6-dev \
     libgles2-mx6-dev \
     "
 
-SGX_mx5 = " \
+MACHINE_EXTRA_INSTALL_mx5 = " \
     libgsl-fsl-mx51-dev \
     libegl-mx51-dev \
     libgles2-mx51-dev \
     "
 
-SGX_beagleboard = "\
+MACHINE_EXTRA_INSTALL_beagleboard = "\
     libgles-omap3-dev \
     "
 
+MACHINE_EXTRA_INSTALL_emulator = "\
+    libegl-mesa-dev \
+    libgles2-mesa-dev \
+    "
+
 RDEPENDS_${PN} += "\
     task-core-standalone-sdk-target \
     task-core-standalone-sdk-target-dbg \
@@ -38,5 +45,5 @@ RDEPENDS_${PN} += "\
     icu-dev \
     libxslt-dev \
     libudev-dev \
-    ${SGX} \
+    ${MACHINE_EXTRA_INSTALL} \
     "