diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2012-03-30 11:43:10 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-30 17:20:24 +0100 |
commit | 5cdb58f683d76e4008eae2f8afa2314824a74966 (patch) | |
tree | 4ecad019e633841595d7d6e39a515e253b59587c /meta/conf/machine | |
parent | 899aa3f2161ed72ab294e0be5e734771c1886ffd (diff) | |
download | poky-5cdb58f683d76e4008eae2f8afa2314824a74966.tar.gz |
virtual/libgl: use mesa-xlib for qemuarm/qemumips/qemuppc
Still need mesa-xlib for emulation of GLX interface on qemuarm/mips/ppc, where
mesa-dri doesn't work for pure qemu emulator.
[YOCTO #2066] fixed.
(From OE-Core rev: 22775b5f1d9c6d9860a579245bf7a48a982ab62f)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r-- | meta/conf/machine/include/qemu.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 66b0caa5a9..421a14925b 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
@@ -1,5 +1,6 @@ | |||
1 | PCMCIA_MANAGER = "pcmciautils" | 1 | PCMCIA_MANAGER = "pcmciautils" |
2 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" | 2 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" |
3 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" | ||
3 | 4 | ||
4 | MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen" | 5 | MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen" |
5 | 6 | ||
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 73a404398b..129fe9f282 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
@@ -3,6 +3,7 @@ | |||
3 | #@DESCRIPTION: Machine configuration for running a common x86 | 3 | #@DESCRIPTION: Machine configuration for running a common x86 |
4 | 4 | ||
5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
6 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" | ||
6 | 7 | ||
7 | require conf/machine/include/tune-x86_64.inc | 8 | require conf/machine/include/tune-x86_64.inc |
8 | require conf/machine/include/qemu.inc | 9 | require conf/machine/include/qemu.inc |
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 3edfe290a6..246d5a0c85 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
@@ -3,6 +3,7 @@ | |||
3 | #@DESCRIPTION: Machine configuration for running a common x86 | 3 | #@DESCRIPTION: Machine configuration for running a common x86 |
4 | 4 | ||
5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
6 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" | ||
6 | 7 | ||
7 | require conf/machine/include/tune-i586.inc | 8 | require conf/machine/include/tune-i586.inc |
8 | require conf/machine/include/qemu.inc | 9 | require conf/machine/include/qemu.inc |