From 2c988adcae0ebb28887f5956719498c88e4ded5d Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Fri, 4 Oct 2013 20:58:59 +0000 Subject: [PATCH] imx-base: provide right package for amd-gpu-bin if x11 is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- meta-fsl-arm/conf/machine/include/imx-base.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc index f5fa6ce0..bea39701 100644 --- a/meta-fsl-arm/conf/machine/include/imx-base.inc +++ b/meta-fsl-arm/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" -- 2.40.1