summaryrefslogtreecommitdiffstats
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-06 22:47:03 +0000
commitedc546797da9f1b1611698c3bae0dc532bcb577a (patch)
tree95e56d8e30d98c7c7d66afef3045758fb7ec7a35
parente6bbe41347ae7e3f91fe0e9cf383a4d364f0cc9e (diff)
downloadpoky-edc546797da9f1b1611698c3bae0dc532bcb577a.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>
-rw-r--r--meta/conf/machine/include/qemu.inc1
-rw-r--r--meta/conf/machine/qemuppc.conf2
-rw-r--r--meta/conf/machine/qemux86-64.conf3
-rw-r--r--meta/conf/machine/qemux86.conf3
4 files changed, 0 insertions, 9 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 9ef242f386..3cebfab669 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -12,6 +12,5 @@ RDEPENDS_kernel-base = ""
12 12
13# Use a common kernel recipe for all QEMU machines 13# Use a common kernel recipe for all QEMU machines
14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
15#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
16 15
17EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" 16EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index dacc802ef0..bcc408f4de 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -2,8 +2,6 @@
2#@NAME: qemu PPC Emulator setup 2#@NAME: qemu PPC Emulator setup
3#@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation 3#@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation
4 4
5PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib"
6
7require conf/machine/include/qemu.inc 5require conf/machine/include/qemu.inc
8require conf/machine/include/tune-ppc603e.inc 6require conf/machine/include/tune-ppc603e.inc
9 7
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index f28cf0819b..73a404398b 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.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-x86_64.inc 7require conf/machine/include/tune-x86_64.inc
11require conf/machine/include/qemu.inc 8require conf/machine/include/qemu.inc
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