summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86.conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-06 20:57:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-07 00:30:04 +0000
commitdc51e4a982fc03884b0810e14103490848220823 (patch)
tree716d52c2b4011b1f74d7f1a2a4e8314320577a01 /meta/conf/machine/qemux86.conf
parentd22daf5c067c57ab1e253b789486aba36e727ed0 (diff)
downloadpoky-dc51e4a982fc03884b0810e14103490848220823.tar.gz
conf/machine: Don't poke around providers which aren't machine specific/safe
Machines shouldn't be poking around PREFERRED_PROVIDERS which aren't machine specific or at least machine safe. Kernels are machine specific and the xserver is selectable. libx11 and mesa are now really a distro choice and machine configurations shouldn't be poking around them as it just leads to corruption, conflicts and confusion. (From OE-Core rev: 97a57aca12437c24b628071bb189c9f3b94e27ca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/qemux86.conf')
-rw-r--r--meta/conf/machine/qemux86.conf3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 75c9042eb5..3edfe290a6 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -2,10 +2,7 @@
2#@NAME: common_pc 2#@NAME: common_pc
3#@DESCRIPTION: Machine configuration for running a common x86 3#@DESCRIPTION: Machine configuration for running a common x86
4 4
5PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
6PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
8PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
9 6
10require conf/machine/include/tune-i586.inc 7require conf/machine/include/tune-i586.inc
11require conf/machine/include/qemu.inc 8require conf/machine/include/qemu.inc