Return-Path: Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 89A3DE0163D for ; Fri, 4 Oct 2013 13:59:00 -0700 (PDT) Received: from buildor.local.eukrea.com (unknown [88.170.243.169]) by smtp3-g21.free.fr (Postfix) with ESMTP id B9237A6266 for ; Fri, 4 Oct 2013 22:58:55 +0200 (CEST) From: =?UTF-8?q?Eric=20B=C3=A9nard?= To: meta-freescale@yoctoproject.org Date: Fri, 4 Oct 2013 22:58:59 +0200 Message-Id: <1380920339-32294-1-git-send-email-eric@eukrea.com> X-Mailer: git-send-email 1.8.4.rc3 MIME-Version: 1.0 Subject: [meta-fsl-arm][PATCH] imx-base: provide right package for amd-gpu-bin if x11 is disabled X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2013 20:59:02 -0000 Content-Type: text/plain; charset=UTF-8 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 --- conf/machine/include/imx-base.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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" -- 1.8.4.rc3