diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-06 20:59:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-06 22:47:09 +0000 |
commit | f17e0ae38b2e6c4cbe7f0f9d76c3e1a386335fd1 (patch) | |
tree | 561798d3abe0478d8699a5c3438610e85c122d62 /meta-yocto | |
parent | edc546797da9f1b1611698c3bae0dc532bcb577a (diff) | |
download | openembedded-core-contrib-f17e0ae38b2e6c4cbe7f0f9d76c3e1a386335fd1.tar.gz |
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-yocto')
-rw-r--r-- | meta-yocto/conf/machine/atom-pc.conf | 4 | ||||
-rw-r--r-- | meta-yocto/conf/machine/beagleboard.conf | 1 | ||||
-rw-r--r-- | meta-yocto/conf/machine/mpc8315e-rdb.conf | 1 | ||||
-rw-r--r-- | meta-yocto/conf/machine/routerstationpro.conf | 1 |
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 5b517996e3..7cbe157b2c 100644 --- a/meta-yocto/conf/machine/atom-pc.conf +++ b/meta-yocto/conf/machine/atom-pc.conf @@ -12,11 +12,7 @@ KERNEL_IMAGETYPE = "bzImage" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "3.0%" -#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri2 \ xserver-xorg-extension-glx \ diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf index 03e6e394a5..4d21388e07 100644 --- a/meta-yocto/conf/machine/beagleboard.conf +++ b/meta-yocto/conf/machine/beagleboard.conf @@ -32,7 +32,6 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " SERIAL_CONSOLE = "115200 ttyO2" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" KERNEL_IMAGETYPE = "uImage" diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf index d67dc18cf0..d3a5b1cb01 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" PREFERRED_VERSION_linux-yocto ?= "3.0%" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" -#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" XSERVER = "xserver-kdrive-fbdev" diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf index a0afd5d16a..9338ca1062 100644 --- a/meta-yocto/conf/machine/routerstationpro.conf +++ b/meta-yocto/conf/machine/routerstationpro.conf @@ -11,7 +11,6 @@ KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" XSERVER = "xserver-kdrive-fbdev" |