summaryrefslogtreecommitdiff
path: root/meta/conf/machine
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:03:09 +0000
commitc8bbb9983bcc7cfc5332e89c3e8148505b4ca83f (patch)
tree96f11f62ffd7c749010a40ecb1204b56f835f085 /meta/conf/machine
parentcfa3b112f94a462c454315326c76fd5bf7f3cd3c (diff)
downloadopenembedded-core-c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f.tar.gz
openembedded-core-c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f.tar.bz2
openembedded-core-c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f.zip
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] Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/ia32-base.inc4
-rw-r--r--meta/conf/machine/include/qemu.inc8
-rw-r--r--meta/conf/machine/qemux86-64.conf8
-rw-r--r--meta/conf/machine/qemux86.conf8
4 files changed, 14 insertions, 14 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 = " \
"
XSERVER_IA32_I915 = "xf86-video-intel \
- mesa-dri-driver-i915 \
+ mesa-driver-i915 \
"
XSERVER_IA32_I965 = "xf86-video-intel \
- mesa-dri-driver-i965 \
+ mesa-driver-i965 \
"
XSERVER_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 @@
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
XSERVER ?= "xserver-xorg \
- mesa-dri-driver-swrast \
+ mesa-driver-swrast \
xf86-input-evdev \
xf86-input-mouse \
xf86-video-fbdev \
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 3852b89932..23a710848e 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -3,9 +3,9 @@
#@DESCRIPTION: Machine configuration for running a common x86
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
require conf/machine/include/tune-x86_64.inc
@@ -14,7 +14,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
XSERVER ?= "xserver-xorg \
- mesa-dri-driver-swrast \
+ mesa-driver-swrast \
xf86-input-vmmouse \
xf86-input-keyboard \
xf86-input-evdev \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index ee14bec974..d13dc847f0 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -3,9 +3,9 @@
#@DESCRIPTION: Machine configuration for running a common x86
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
require conf/machine/include/tune-i586.inc
@@ -14,7 +14,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
XSERVER ?= "xserver-xorg \
- mesa-dri-driver-swrast \
+ mesa-driver-swrast \
xf86-input-vmmouse \
xf86-input-keyboard \
xf86-input-evdev \