summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-03-19 18:23:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-22 17:07:16 +0000
commite66deb015674f2a95845b6f6722c460dc3ce0a1a (patch)
tree16a3ea83eb060f41bdf3717e303ca3f8138d392c /meta/conf/machine/include
parentc2f60b6ee7cb70dea2f229de69cce2773de3e59d (diff)
downloadpoky-e66deb015674f2a95845b6f6722c460dc3ce0a1a.tar.gz
mesa: rename mesa-dri recipe to just mesa
Rename mesa-dri recipes to just mesa. Also, replace all references to mesa-dri in all recipes/configs. The reason for this renaming (quote from bugzilla): "mesa-dri is a artefact of mesa-xlib existing, which doesn't anymore. mesa-dri should be renamed to mesa." [YOCTO #3385] (From OE-Core rev: c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include')
-rw-r--r--meta/conf/machine/include/ia32-base.inc4
-rw-r--r--meta/conf/machine/include/qemu.inc8
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc
index 0798bf88c1..921c740772 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/ia32-base.inc
@@ -39,11 +39,11 @@ XSERVER_IA32_EXT = " \
39 " 39 "
40 40
41XSERVER_IA32_I915 = "xf86-video-intel \ 41XSERVER_IA32_I915 = "xf86-video-intel \
42 mesa-dri-driver-i915 \ 42 mesa-driver-i915 \
43 " 43 "
44 44
45XSERVER_IA32_I965 = "xf86-video-intel \ 45XSERVER_IA32_I965 = "xf86-video-intel \
46 mesa-dri-driver-i965 \ 46 mesa-driver-i965 \
47 " 47 "
48 48
49XSERVER_IA32_VESA = "xf86-video-vesa" 49XSERVER_IA32_VESA = "xf86-video-vesa"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 52215b3930..29caec9559 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,10 +1,10 @@
1PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 1PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
2PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 2PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
3PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" 3PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
4PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri" 4PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
5 5
6XSERVER ?= "xserver-xorg \ 6XSERVER ?= "xserver-xorg \
7 mesa-dri-driver-swrast \ 7 mesa-driver-swrast \
8 xf86-input-evdev \ 8 xf86-input-evdev \
9 xf86-input-mouse \ 9 xf86-input-mouse \
10 xf86-video-fbdev \ 10 xf86-video-fbdev \