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>

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"

meta/conf/machine/qemuarm.conf

@@ -13,4 +13,3 @@ KERNEL_IMAGETYPE = "zImage"
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"

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"

meta/conf/machine/qemuppc.conf

@@ -11,4 +11,3 @@ KERNEL_IMAGETYPE = "uImage"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"

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"

meta/packages/linux/linux_2.6.33.bb

@@ -3,10 +3,8 @@ require linux.inc
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_mpc8313erdb = "1"
-DEFAULT_PREFERENCE_qemuppc = "1"
-DEFAULT_PREFERENCE_qemux86 = "1"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig \