Move all QEMU machines to use a common kernel recipe set and version

The different kernel recipes encapsulate functionality groups for machines,
therefore it makes sense to have all the QEMU machines using the same kernel
recipe.

Switch the QEMU machines to default to the "linux" recipes for their kernel
and bump the latest recipe from linux-2.6.32 to 2.6.33.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

5 files changed, 3 insertions, 4 deletions

diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index cba8576612..fc34c87fb0 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -13,3 +13,6 @@ IMAGE_ROOTFS_SIZE_ext3 ?= "280000"
 
 # Don't include kernels in standard images
 RDEPENDS_kernel-base = ""
+
+# Use a common kernel recipe for all QEMU machines
+PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 4ea8371efb..b3fff3e8da 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -13,4 +13,3 @@ KERNEL_IMAGETYPE = "zImage"
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf
index d0040dede9..4cba267884 100644
--- a/meta/conf/machine/qemumips.conf
+++ b/meta/conf/machine/qemumips.conf
@@ -11,5 +11,4 @@ KERNEL_IMAGETYPE = "vmlinux.bin"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index 9baa893cf8..91abb0792a 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -11,4 +11,3 @@ KERNEL_IMAGETYPE = "uImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 7f982b2ce6..462743a639 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -5,7 +5,6 @@
 TARGET_ARCH = "i586"
 PACKAGE_EXTRA_ARCHS = "x86"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"