diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-06 20:57:45 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-06 22:46:39 +0000 |
| commit | 97a57aca12437c24b628071bb189c9f3b94e27ca (patch) | |
| tree | a84e3a215b8dc468ad7240a6e14e2445a4555384 /meta | |
| parent | 0b803ac3627c238aa7d19a23b7621f55779f2557 (diff) | |
| download | openembedded-core-97a57aca12437c24b628071bb189c9f3b94e27ca.tar.gz openembedded-core-97a57aca12437c24b628071bb189c9f3b94e27ca.tar.bz2 openembedded-core-97a57aca12437c24b628071bb189c9f3b94e27ca.tar.xz openembedded-core-97a57aca12437c24b628071bb189c9f3b94e27ca.zip | |
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 1 | ||||
| -rw-r--r-- | meta/conf/machine/qemuppc.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86-64.conf | 3 | ||||
| -rw-r--r-- | 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 9ef242f38..3cebfab66 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 dacc802ef..bcc408f4d 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 f28cf0819..73a404398 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 75c9042eb..3edfe290a 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 |