summaryrefslogtreecommitdiffstats
path: root/meta-emenlow
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-11-10 14:08:41 -0600
committerTom Zanussi <tom.zanussi@intel.com>2011-11-10 14:08:41 -0600
commiteb5b35766f8c3438a65a6ad8b856092f7090090b (patch)
tree3b4bfbe3d7eb6e6305d77f9b54ad050e53188992 /meta-emenlow
parent63253211b4ca30c3a5fa2b4dd9a393247217816e (diff)
downloadmeta-intel-eb5b35766f8c3438a65a6ad8b856092f7090090b.tar.gz
meta-emenlow: fix mesa-dri multiple-providers warning
commit 8e14cee (xserver-xorg: Add mesa-dri to depends instead of virtual/libgl) caused meta-emenlow to start failing with: NOTE: multiple providers are available for mesa-dri (mesa-dri, xpsb-glx) NOTE: consider defining a PREFERRED_PROVIDER entry to match mesa-dri This adds a PREFERRED_PROVIDER for mesa-dri and fixes the problem. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-emenlow')
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index 57a96c3e..774ef08f 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -21,6 +21,7 @@ PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
21PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx" 21PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx"
22PREFERRED_PROVIDER_virtual/xserver = "xserver-psb" 22PREFERRED_PROVIDER_virtual/xserver = "xserver-psb"
23PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb" 23PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb"
24PREFERRED_PROVIDER_mesa-dri = "xpsb-glx"
24XSERVER ?= "xserver-psb \ 25XSERVER ?= "xserver-psb \
25 xserver-psb-extension-dri \ 26 xserver-psb-extension-dri \
26 xserver-psb-extension-dri2 \ 27 xserver-psb-extension-dri2 \