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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 9ef242f38605b868d036250726f5f82e172b1e7c..3cebfab669ca6f8ccda22a2929da6f911ff5abc2 100644 (file)
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -12,6 +12,5 @@ RDEPENDS_kernel-base = ""
 
 # Use a common kernel recipe for all QEMU machines
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 
 EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"

diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index dacc802ef03d58916e99285d10291f9e3f68fc23..bcc408f4de4b999f698bbca9ec333064558f3ba5 100644 (file)
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -2,8 +2,6 @@
 #@NAME: qemu PPC Emulator setup
 #@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation
 
-PREFERRED_PROVIDER_virtual/libgl  = "mesa-xlib"
-
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-ppc603e.inc
 

diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index f28cf0819b5ba5bd7eb9a2ecd282442c448667bb..73a404398ba9614ea0f8b8fcc1f5e6d846d84501 100644 (file)
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -2,10 +2,7 @@
 #@NAME: common_pc
 #@DESCRIPTION: Machine configuration for running a common x86
 
-PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 
 require conf/machine/include/tune-x86_64.inc
 require conf/machine/include/qemu.inc

diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 75c9042eb50c9a53fb48d990a767453bb5c61318..3edfe290a68a09a9770e9f62001597625b0bc4ef 100644 (file)
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -2,10 +2,7 @@
 #@NAME: common_pc
 #@DESCRIPTION: Machine configuration for running a common x86
 
-PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 
 require conf/machine/include/tune-i586.inc
 require conf/machine/include/qemu.inc