Patchwork [meta-fsl-arm] imx-base: provide right package for amd-gpu-bin if x11 is disabled

login
register
mail settings
Submitter Eric BENARD
Date Oct. 4, 2013, 8:58 p.m.
Message ID <1380920339-32294-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/59281/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Eric BENARD - Oct. 4, 2013, 8:58 p.m.
so that users don't have to customize it outside,
else we get very stranges errors like :
ERROR: Multiple versions of mesa are due to be built
(/scratch/openembedded-core/meta/recipes-graphics/mesa/mesa_git.bb
/scratch/openembedded-core/meta/recipes-graphics/mesa/mesa_9.1.6.bb).
Only one version of a given PN should be built in any given build.
You likely need to set PREFERRED_VERSION_mesa to select the correct
version or don't depend on multiple versions.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 conf/machine/include/imx-base.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
Otavio Salvador - Oct. 5, 2013, 9:18 p.m.
On Fri, Oct 4, 2013 at 5:58 PM, Eric Bénard <eric@eukrea.com> wrote:
> so that users don't have to customize it outside,
> else we get very stranges errors like :
> ERROR: Multiple versions of mesa are due to be built
> (/scratch/openembedded-core/meta/recipes-graphics/mesa/mesa_git.bb
> /scratch/openembedded-core/meta/recipes-graphics/mesa/mesa_9.1.6.bb).
> Only one version of a given PN should be built in any given build.
> You likely need to set PREFERRED_VERSION_mesa to select the correct
> version or don't depend on multiple versions.
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>

Applied to dora and master.

Patch

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index f5fa6ce..bea3970 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -78,9 +78,10 @@  MACHINE_GSTREAMER_PLUGIN_mx3 ?= ""
 MACHINE_GSTREAMER_PLUGIN_vf60 ?= ""
 
 # mx5 GPU libraries
-PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-x11-bin-mx51"
-PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-x11-bin-mx51"
-PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-x11-bin-mx51"
+GPU_FLAVOUR = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11-', '', d)}"
+PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
+PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
+PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 
 # mx6 GPU libraries
 PREFERRED_PROVIDER_virtual/egl_mx6 ?= "gpu-viv-bin-mx6q"