Strip unneeded stuff from image and toolchain

- imx6 viv_samples removed
- libgles files for other SGX versions removed
- unneeded python modules removed

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

5 files changed, 21 insertions, 4 deletions

diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend
index 782b206..9e260be 100644
--- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend
@@ -1 +1,3 @@
 PROVIDES += "virtual/libgl"
+
+FILES_libegl-mx6-dev += "${includedir}/KHR ${includedir}/EGL"
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index 077b219..de86a34 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -21,7 +21,9 @@ MACHINE_EXTRA_INSTALL_mx5 += "\
         "
 
 MACHINE_EXTRA_INSTALL_mx6 += "\
-        gpu-viv-bin-mx6q \
+        libgal-mx6 \
+        libegl-mx6 \
+        libgles2-mx6 \
         gst-fsl-plugin \
         "
 
@@ -55,6 +57,8 @@ GSTREAMER_EXTRA_INSTALL = "\
 TOOLS_EXTRA_INSTALL = "\
         adbd \
         ldd \
+        binutils \
+        binutils-symlinks \
         "
 
 IMAGE_INSTALL += "\
diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
index 8292768..7770c39 100644
--- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
@@ -8,7 +8,16 @@ do_install_append() {
         echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini
 }
 
+# Inhibit warnings about files being stripped.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
 pkg_postinst_${PN}_append() {
 ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
 echo ${ESREV} > $D${sysconfdir}/powervr-esrev
 }
+
+RRECOMMENDS_${PN} = "omap3-sgx-modules"
+RRECOMMENDS_${PN}-blitwsegl = ""
+RRECOMMENDS_${PN}-flipwsegl = ""
+RRECOMMENDS_${PN}-frontwsegl = ""
+RRECOMMENDS_${PN}-linuxfbwsegl = ""
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 28cc4d2..8458ffb 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -7,7 +7,8 @@ require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
 
 RDEPENDS_${PN} = "\
     mkcard-nativesdk \
-    python-modules-nativesdk \
+    python-nativesdk \
+    python-subprocess-nativesdk \
     "
 
 
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
index 32b3ab4..474d566 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
@@ -8,9 +8,10 @@ PACKAGES = "${PN}"
 MACHINE_EXTRA_INSTALL = ""
 
 MACHINE_EXTRA_INSTALL_mx6 = " \
-    gpu-viv-bin-mx6q-dev \
     libgal-mx6 \
-    libgles-mx6-dev \
+    libegl-mx6 \
+    libegl-mx6-dev \
+    libgles2-mx6 \
     libgles2-mx6-dev \
     "