diff options
author | Ross Burton <ross.burton@intel.com> | 2012-08-30 15:19:09 +0100 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-08-30 09:48:18 -0500 |
commit | 1ef6cd26cabe46d9ceaa0d257bf7d690a0592e7c (patch) | |
tree | d385d839ffbccc4bfaabfb6cf58b1652ba674d05 /meta-emenlow/conf | |
parent | d98714abb2218691d96ca6931b96cbb7d8f1ef32 (diff) | |
download | meta-intel-1ef6cd26cabe46d9ceaa0d257bf7d690a0592e7c.tar.gz |
meta-emenlow: unset preferred providers for virtual/libgles[12]
The recent changes to enable GLES/EGL in mesa-dri have caused emenlow to fail:
ERROR: Trying to resolve runtime dependency libglu resulted in conflicting PREFERRED_PROVIDER entries being found.
The providers found were: ['/srv/home/pokybuild/yocto-autobuilder/yocto-slave/emenlow/build/yocto/meta-intel/meta-emenlow/recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb', '/srv/home/pokybuild/yocto-autobuilder/yocto-slave/emenlow/build/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb']
The PREFERRED_PROVIDER entries resulting in this conflict were: ['PREFERRED_PROVIDER_mesa-dri = xpsb-glx', 'PREFERRED_PROVIDER_virtual/libgles1 = mesa-dri']
Because emenlow's xpsb-glx contains mesa, it needs to entirely replace
mesa-dri. We'd normally set virtual/libgles1 and virtual/libgles2 to xpsb-glx
but these drivers don't build the GLES libraries so that would be a lie.
So, unset the preferred provider entries so that bitbake doesn't look at
mesa-dri at all.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-emenlow/conf')
-rw-r--r-- | meta-emenlow/conf/machine/emenlow.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf index afb38660..65dcd5ab 100644 --- a/meta-emenlow/conf/machine/emenlow.conf +++ b/meta-emenlow/conf/machine/emenlow.conf | |||
@@ -13,6 +13,8 @@ PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo" | |||
13 | PREFERRED_PROVIDER_drm = "libdrm-poulsbo" | 13 | PREFERRED_PROVIDER_drm = "libdrm-poulsbo" |
14 | PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" | 14 | PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" |
15 | PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx" | 15 | PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx" |
16 | PREFERRED_PROVIDER_virtual/libgles1 = "" | ||
17 | PREFERRED_PROVIDER_virtual/libgles2 = "" | ||
16 | PREFERRED_PROVIDER_virtual/xserver = "xserver-psb" | 18 | PREFERRED_PROVIDER_virtual/xserver = "xserver-psb" |
17 | PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb" | 19 | PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb" |
18 | PREFERRED_PROVIDER_mesa-dri = "xpsb-glx" | 20 | PREFERRED_PROVIDER_mesa-dri = "xpsb-glx" |