[meta-fsl-demos][PATCH 5/6] fsl-image-{test, gui}: Disable tools-testapps image feature for iMX6


Otavio Salvador
 

The tools-testapps includes mesa-demos which is currently broken for
Vivant GPU libraries.

For now, we skip the feature when building for iMX6 SoCs.

Change-Id: Ib37fbd2bc7401d60611ffd2a2457e2dac7d5ac57
Signed-off-by: Otavio Salvador <otavio@...>
---
recipes-fsl/images/fsl-image-gui.bb | 8 +++++++-
recipes-fsl/images/fsl-image-test.bb | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/recipes-fsl/images/fsl-image-gui.bb b/recipes-fsl/images/fsl-image-gui.bb
index 57d3b0b..038151b 100644
--- a/recipes-fsl/images/fsl-image-gui.bb
+++ b/recipes-fsl/images/fsl-image-gui.bb
@@ -4,12 +4,18 @@ IMAGE_FEATURES += "debug-tweaks"
DISTRO_FEATURES += "pulseaudio"
WEB = "web-webkit"

+SOC_EXTRA_IMAGE_FEATURES ?= "tools-testapps"
+
+# mesa-demos is currently broken when building with other GL library
+# so we avoid it by now and tools-testapps includes it.
+SOC_EXTRA_IMAGE_FEATURES_mx6 = ""
+
# Add extra image features
EXTRA_IMAGE_FEATURES += " \
+ ${SOC_EXTRA_IMAGE_FEATURES} \
nfs-server \
tools-debug \
tools-profile \
- tools-testapps \
qt4-pkgs \
"

diff --git a/recipes-fsl/images/fsl-image-test.bb b/recipes-fsl/images/fsl-image-test.bb
index 69ecfa5..e43723b 100644
--- a/recipes-fsl/images/fsl-image-test.bb
+++ b/recipes-fsl/images/fsl-image-test.bb
@@ -2,12 +2,18 @@ include recipes-core/images/core-image-base.bb

IMAGE_FEATURES += "debug-tweaks"

+SOC_EXTRA_IMAGE_FEATURES ?= "tools-testapps"
+
+# mesa-demos is currently broken when building with other GL library
+# so we avoid it by now and tools-testapps includes it.
+SOC_EXTRA_IMAGE_FEATURES_mx6 = ""
+
# Add extra image features
EXTRA_IMAGE_FEATURES += " \
+ ${SOC_EXTRA_IMAGE_FEATURES} \
nfs-server \
tools-debug \
tools-profile \
- tools-testapps \
"

IMAGE_INSTALL += " \
--
1.7.10.4

Join meta-freescale@lists.yoctoproject.org to automatically receive all group messages.