summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-06 20:59:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-07 00:30:15 (GMT)
commitb9d3a5224c7f76f273d5919a88b7460d35ad2574 (patch)
treec68c42093cf097cad9681b333df7bd49f17e7940
parentdc51e4a982fc03884b0810e14103490848220823 (diff)
downloadpoky-b9d3a5224c7f76f273d5919a88b7460d35ad2574.tar.gz
conf/machine: Don't poke around providers which aren't machine specific/safe1.2_M1.rc1
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>
-rw-r--r--meta-yocto/conf/machine/atom-pc.conf4
-rw-r--r--meta-yocto/conf/machine/beagleboard.conf1
-rw-r--r--meta-yocto/conf/machine/mpc8315e-rdb.conf1
-rw-r--r--meta-yocto/conf/machine/routerstationpro.conf1
4 files changed, 0 insertions, 7 deletions
diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index 5b51799..7cbe157 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -12,11 +12,7 @@ KERNEL_IMAGETYPE = "bzImage"
12 12
13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
14PREFERRED_VERSION_linux-yocto ?= "3.0%" 14PREFERRED_VERSION_linux-yocto ?= "3.0%"
15#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
16PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
17PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
18PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 15PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
19PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
20XSERVER ?= "xserver-xorg \ 16XSERVER ?= "xserver-xorg \
21 xserver-xorg-extension-dri2 \ 17 xserver-xorg-extension-dri2 \
22 xserver-xorg-extension-glx \ 18 xserver-xorg-extension-glx \
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 03e6e39..4d21388 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -32,7 +32,6 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
32SERIAL_CONSOLE = "115200 ttyO2" 32SERIAL_CONSOLE = "115200 ttyO2"
33 33
34PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 34PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
35#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
36 35
37KERNEL_IMAGETYPE = "uImage" 36KERNEL_IMAGETYPE = "uImage"
38 37
diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf
index d67dc18..d3a5b1c 100644
--- a/meta-yocto/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf
@@ -14,7 +14,6 @@ MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
14PREFERRED_VERSION_linux-yocto ?= "3.0%" 14PREFERRED_VERSION_linux-yocto ?= "3.0%"
15PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 15PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
16 16
17#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
18PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" 17PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
19XSERVER = "xserver-kdrive-fbdev" 18XSERVER = "xserver-kdrive-fbdev"
20 19
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
index a0afd5d..9338ca1 100644
--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ b/meta-yocto/conf/machine/routerstationpro.conf
@@ -11,7 +11,6 @@ KERNEL_IMAGETYPE = "vmlinux"
11KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 11KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
12 12
13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
14#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
15PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" 14PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
16XSERVER = "xserver-kdrive-fbdev" 15XSERVER = "xserver-kdrive-fbdev"
17 16