[oe-commits] Richard Purdie : conf/machine: Don't poke around providers which aren' t machine specific/safe
git at git.openembedded.org
git at git.openembedded.org
Tue Dec 6 22:51:14 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 97a57aca12437c24b628071bb189c9f3b94e27ca
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=97a57aca12437c24b628071bb189c9f3b94e27ca
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Tue Dec 6 20:57:45 2011 +0000
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 at linuxfoundation.org>
---
meta/conf/machine/include/qemu.inc | 1 -
meta/conf/machine/qemuppc.conf | 2 --
meta/conf/machine/qemux86-64.conf | 3 ---
meta/conf/machine/qemux86.conf | 3 ---
4 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 9ef242f..3cebfab 100644
--- 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 dacc802..bcc408f 100644
--- 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 f28cf08..73a4043 100644
--- 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 75c9042..3edfe29 100644
--- 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
More information about the Openembedded-commits
mailing list