Skip to contentSkip to conversation

imx-base: provide right package for amd-gpu-bin if x11 is disabled

PATCH Applied Eric Bénard 2 participants 2 messages Oct 4, 2013 – Oct 5, 2013 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 imx-base: provide right package for amd-gpu-bin if x11 is disabled

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.

---
 conf/machine/include/imx-base.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
conf/machine/include/imx-base.inc +4 -3
index f5fa6ce..bea3970 100644
@@ -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"
Signature · 1 line
1.8.4.rc3
#1 lore raw
Quoted 10 lines · Eric Bénard

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.

Applied to dora and master.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750