[meta-freescale] [distro][PATCH 4/6] packagegroup-fsl-tools-testapps: Use the new i.MX feature overrides

[Fabio Berton]

Configure SOC_TOOLS_TEST variable using new i.MX overrides and install
packages based on existence of 2D and/or 3D hardware.
Remove clutter-1.0-examples from RDEPENDS for GPU 2D-only SoCs.

Signed-off-by: Fabio Berton <fabio.berton at ossystems.com.br>
---
 .../packagegroups/packagegroup-fsl-tools-testapps.bb     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
index 4f8eb31..91965a8 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
@@ -11,14 +11,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 SOC_TOOLS_TEST = ""
-SOC_TOOLS_TEST_vf  = "imx-test"
-SOC_TOOLS_TEST_mx6 = "imx-test"
-SOC_TOOLS_TEST_mx6ul = "imx-test"
-SOC_TOOLS_TEST_mx7   = "imx-test"
-SOC_TOOLS_TEST_append_mx6q  = " imx-gpu-viv-demos"
-SOC_TOOLS_TEST_append_mx6dl = " imx-gpu-viv-demos"
-SOC_TOOLS_TEST_append_mx6sx = " imx-gpu-viv-demos"
-SOC_TOOLS_TEST_append_mx6sl = " imx-gpu-viv-demos"
+SOC_TOOLS_TEST_imxpxp  = "imx-test"
+SOC_TOOLS_TEST_imxgpu2d  = "imx-test imx-gpu-viv-demos"
 
 RDEPENDS_${PN} = " \
     alsa-utils \
@@ -46,4 +40,8 @@ RDEPENDS_${PN} = " \
 
 # FIXME: i.MX6SL cannot use mesa for Graphics and it lacks GL support,
 #        so for now we skip it.
-RDEPENDS_${PN}_remove_mx6sl = "clutter-1.0-examples"
+RDEPENDS_IMX_TO_REMOVE = ""
+RDEPENDS_IMX_TO_REMOVE_imxgpu2d = "clutter-1.0-examples"
+RDEPENDS_IMX_TO_REMOVE_imxgpu3d = ""
+
+RDEPENDS_${PN}_remove = "${RDEPENDS_IMX_TO_REMOVE}"
-- 
2.1.4