From dc51e4a982fc03884b0810e14103490848220823 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 6 Dec 2011 20:57:45 +0000 Subject: 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 --- 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, 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 = "" # 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 dacc802ef0..bcc408f4de 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 f28cf0819b..73a404398b 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 75c9042eb5..3edfe290a6 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 -- cgit v1.2.3-54-g00ecf