merge of '0cf9456fa245ff793e08982af57529321f4f6576'

     and 'b86de5a43eb6fcad150e08dba726bb82d641f5f2'

80 files changed, 68 insertions, 84 deletions

diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass
index 8a34594a70..c07a9911cd 100644
--- a/classes/distutils.bbclass
+++ b/classes/distutils.bbclass
@@ -13,7 +13,8 @@ distutils_stage_headers() {
 }
 
 distutils_stage_all() {
-	PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \
+        install -d ${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages
+        PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_INCDIR}/.. --install-data=${STAGING_INCDIR}/../share || \
         oefatal "python setup.py install (stage) execution failed."
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 248ccab60b..91e63262cd 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -69,9 +69,9 @@ do_build[nostamp] = "1"
 fakeroot do_rootfs () {
 	set -x
 	rm -rf ${IMAGE_ROOTFS}
+	mkdir -p ${IMAGE_ROOTFS}
 
 	if [ "${USE_DEVFS}" != "1" ]; then
-		mkdir -p ${IMAGE_ROOTFS}/dev
 		for devtable in ${@get_devtable_list(d)}; do
 			makedevs -r ${IMAGE_ROOTFS} -D $devtable
 		done
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 75c85e8f3d..53b0162eac 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -37,7 +37,6 @@ fakeroot rootfs_ipk_do_rootfs () {
 
 	rootfs_ipk_do_indexes
 
-	mkdir -p ${IMAGE_ROOTFS}/dev
 	mkdir -p ${T}
 
 	#Add deploy/ipk as well for backward compat
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index dcf224f798..655d435994 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -29,8 +29,8 @@ PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12"
 PREFERRED_VERSION_linux-libc-headers = "2.6.22"
 
 #Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc = "2.6"
-PREFERRED_VERSION_glibc-intermediate = "2.6"
-PREFERRED_VERSION_glibc-initial = "2.6"
+PREFERRED_VERSION_glibc = "2.6.1"
+PREFERRED_VERSION_glibc-intermediate = "2.6.1"
+PREFERRED_VERSION_glibc-initial = "2.6.1"
 
 
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index adb8f23fa3..77312791dc 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -22,3 +22,5 @@ IMAGE_FSTYPES += "tar.gz"
 MACHINE_EXTRA_RRECOMMENDS = "\
 	kernel-modules \
 	"
+
+KERNEL_IMAGETYPE = "bzImage"
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index faa4785fb4..2231f80ed2 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -19,3 +19,5 @@ SERIAL_CONSOLE = "115200"
 # used by some images
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
+
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index ad94420196..4f3ae577a9 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -19,3 +19,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-arm926ejs.conf
+
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index b725831321..4df1030570 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -18,3 +18,4 @@ SERIAL_CONSOLE = "115200"
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index ebe74c7801..c82c2500d1 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -38,11 +38,10 @@ MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
 # a small rootfs that can fit in NOR flash using the following config:
 #   - Angstrom distro
 #   - uclibc
-#   - angstrom-minimal-image bitbake target
+#   - angstrom-minimal-image-with-mtd-utils bitbake target
 #   - put the following in your local.conf
-#     - MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "mtd-utils"
 #     - IMAGE_FSTYPES = "jffs2 tar cpio.gz"
-# now, when you build the angstrom-minimal-image, a cpio.gz will be generated
+# now, when you build the image, a cpio.gz will be generated
 # that can be used as an initramfs.  You can boot into this image and then
 # program the main rootfs jffs2 image in NAND flash using mtd-utils
 
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 5a3b5875a3..ea4b568338 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -5,6 +5,7 @@ PACKAGE_EXTRA_ARCHS = "i386 i486"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
 OLDEST_KERNEL = "2.6.5"
+KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf
index 7f9c35cbc5..d1ea1b311e 100644
--- a/conf/machine/geodegx.conf
+++ b/conf/machine/geodegx.conf
@@ -8,3 +8,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 
 udevdir = "/dev"
+
+KERNEL_IMAGETYPE = "bzImage"
diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf
index 841f4a8418..835a581801 100644
--- a/conf/machine/geodelx.conf
+++ b/conf/machine/geodelx.conf
@@ -5,3 +5,5 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 PREFERRED_PROVIDER_virtual/kernel="linux-geodelx"
 
 SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"
+
+KERNEL_IMAGETYPE = "bzImage"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index 1996a1603b..c35d3b381e 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -11,6 +11,8 @@ PREFERRED_PROVIDER_xserver = "xserver-xorg"
 
 udevdir = "/dev"
 
+KERNEL_IMAGETYPE = "bzImage"
+
 OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index de620fcd61..2cae2a87dc 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -12,6 +12,8 @@ PACKAGE_EXTRA_ARCHS = "x86 i386 i486"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 OLDEST_KERNEL = "2.6.18"
 
+KERNEL_IMAGETYPE = "bzImage"
+
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index 5eba33fa97..883d6b4dd0 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -11,6 +11,8 @@ PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 OLDEST_KERNEL = "2.6.20"
 
+KERNEL_IMAGETYPE = "bzImage"
+
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
diff --git a/conf/machine/kb9202.conf b/conf/machine/kb9202.conf
index 0e9c0d3b92..6501896780 100644
--- a/conf/machine/kb9202.conf
+++ b/conf/machine/kb9202.conf
@@ -18,3 +18,5 @@ require conf/machine/include/tune-arm920t.conf
 ROOT_FLASH_SIZE = "12"
 
 MACHINE_FEATURES = "kernel26 usbhost usbgadget irda"
+
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index e7aeab7389..8d6cd2d220 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -9,6 +9,8 @@ PACKAGE_EXTRA_ARCHS = "netvista"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 XSERVER = "xserver-kdrive-vesa"
 
+KERNEL_IMAGETYPE = "bzImage"
+
 # todo: convert to task-base
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 7c293d9ebf..ffa7dad468 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -9,6 +9,8 @@ PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
+KERNEL_IMAGETYPE = "bzImage"
+
 OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/conf/machine/sarge-at91.conf b/conf/machine/sarge-at91.conf
index 6001e69cf7..f1a8b7f271 100644
--- a/conf/machine/sarge-at91.conf
+++ b/conf/machine/sarge-at91.conf
@@ -21,3 +21,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
 # device has own patchset for u-boot 1.1.6
 PREFERRED_VERSION_u-boot = "1.1.6"
 PREFERRED_VERSION_linux  = "2.6.21"
+
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
index 34d6775932..d73c80214c 100644
--- a/conf/machine/wrap.conf
+++ b/conf/machine/wrap.conf
@@ -32,3 +32,5 @@ IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt"
 # glibc
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+KERNEL_IMAGETYPE = "bzImage"
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index e0d4cc96a2..af0cf8996b 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -7,6 +7,8 @@ TARGET_ARCH = "i486"
 # TARGET_VENDOR = "-oe"
 PACKAGE_EXTRA_ARCHS = "x86"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+
+KERNEL_IMAGETYPE = "bzImage"
 # todo: convert to task-base
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/files/device_table-jlime.txt b/files/device_table-jlime.txt
index 6c5d53d18e..d8fbc8e26a 100644
--- a/files/device_table-jlime.txt
+++ b/files/device_table-jlime.txt
@@ -1,4 +1,5 @@
-/dev/initctl	p	600	0	0	-	-	-	-
+/dev		d	755	0	0	-	-	-	-	-
+/dev/initctl	p	600	0	0	-	-	-	-       -
 /dev/dsp        c       644     0       0       14      3       -       -       - 
 /dev/apm_bios	c	660	0	46	10	134	-	-	-
 /dev/fb0	c	600	0	0	29	0	-	-	-
@@ -18,6 +19,3 @@
 /dev/console	c	662	0	5	5	1	-	-
 /dev/urandom    c       644     0       0       1       9       -       -       -
 /dev/random     c       644     0       0       1       8       -       -       -
-/bin/tinylogin	f	4755	0	0	-	-	-	-
-/bin/mount	f	4755	0	0	-	-	-	-
-/bin/umount	f	4755	0	0	-	-	-	-
diff --git a/files/device_table-minimal.txt b/files/device_table-minimal.txt
index 04fcc413a2..495b5d5635 100644
--- a/files/device_table-minimal.txt
+++ b/files/device_table-minimal.txt
@@ -8,7 +8,8 @@
 #    b	Block special device file
 #    p	Fifo (named pipe)
 
-/dev/initctl	p	600	0	0	-	-	-	-
+/dev		d	755	0	0	-	-	-	-	-
+/dev/initctl	p	600	0	0	-	-	-	-	-
 /dev/apm_bios	c	660	0	46	10	134	-	-	-
 /dev/fb0	c	600	0	0	29	0	-	-	-
 /dev/hda	b	660	0	6	3	0	-	-	-
@@ -21,12 +22,9 @@
 /dev/tty	c	666	0	5	4	0	0	1	9
 /dev/ttyS	c	640	0	5	4	64	0	1	1
 /dev/ttySA	c	640	0	5	204	5	0	1	1
-/dev/zero	c	644	0	0	1	5	-	-
+/dev/zero	c	644	0	0	1	5	-	-	-
 /dev/mtd	c	660	0	6	90	0	0	2	8
 /dev/mtdblock	b	640	0	0	31	0	0	1	8
-/dev/console	c	662	0	5	5	1	-	-
-/bin/tinylogin	f	4755	0	0	-	-	-	-
-/bin/mount	f	4755	0	0	-	-	-	-
-/bin/umount	f	4755	0	0	-	-	-	-
+/dev/console	c	662	0	5	5	1	-	-	-
 /dev/random	c	644	0	0	1	8	-	-	-
 /dev/urandom	c	644	0	0	1	9	-	-	-
diff --git a/files/device_table-slugos.txt b/files/device_table-slugos.txt
index 185d70f6ea..17e8064b97 100644
--- a/files/device_table-slugos.txt
+++ b/files/device_table-slugos.txt
@@ -8,6 +8,7 @@
 #	c	Character special device file
 #	b	Block special device file
 #	p	Fifo (named pipe)
+/dev		d	755	0	0	-	-	-	-	-
 /dev/buzzer	c	660	0	0	13	64	-	-	-
 /dev/console	c	622	0	0	5	1	-	-	-
 /dev/kmem	c	640	0	0	1	2	-	-	-
diff --git a/files/device_table-unslung.txt b/files/device_table-unslung.txt
index ef81494ee4..cd5d5f7bc5 100644
--- a/files/device_table-unslung.txt
+++ b/files/device_table-unslung.txt
@@ -49,4 +49,3 @@
 /dev/urandom	c	644	0	0	1	9	-	-	-
 /dev/video	c	664	0	0	81	0	0	1	4
 /dev/zero	c	666	0	0	1	5	-	-	-
-/bin/tinylogin	f	6755	0	0	-	-	-	-	-
diff --git a/packages/glibc/glibc-initial_2.6.bb b/packages/glibc/glibc-initial_2.6.1.bb
index 0d4a79f2a4..0d4a79f2a4 100644
--- a/packages/glibc/glibc-initial_2.6.bb
+++ b/packages/glibc/glibc-initial_2.6.1.bb
diff --git a/packages/glibc/glibc-intermediate_2.6.bb b/packages/glibc/glibc-intermediate_2.6.1.bb
index 7610f560a7..7610f560a7 100644
--- a/packages/glibc/glibc-intermediate_2.6.bb
+++ b/packages/glibc/glibc-intermediate_2.6.1.bb
diff --git a/packages/glibc/glibc_2.6.bb b/packages/glibc/glibc_2.6.1.bb
index 87a99ebbe9..87a99ebbe9 100644
--- a/packages/glibc/glibc_2.6.bb
+++ b/packages/glibc/glibc_2.6.1.bb
diff --git a/packages/images/angstrom-minimal-image-with-mtd-utils.bb b/packages/images/angstrom-minimal-image-with-mtd-utils.bb
new file mode 100644
index 0000000000..635833af4e
--- /dev/null
+++ b/packages/images/angstrom-minimal-image-with-mtd-utils.bb
@@ -0,0 +1,7 @@
+# this image was created for use with the compulab cm-x270 platform
+# for creating a small initramfs image in NOR flash that can be used
+# to program the NAND flash.
+
+require angstrom-minimal-image.bb
+RDEPENDS += "mtd-utils"
+
diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb
index 3b576e8059..ce6748149b 100644
--- a/packages/linux/compulab-pxa270_2.6.16.bb
+++ b/packages/linux/compulab-pxa270_2.6.16.bb
@@ -23,7 +23,6 @@ inherit kernel
 inherit package
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 
 FILES_kernel-image = ""
 
diff --git a/packages/linux/compulab-pxa270_2.6.22.bb b/packages/linux/compulab-pxa270_2.6.22.bb
index c1d0116a4f..963a8cf39f 100644
--- a/packages/linux/compulab-pxa270_2.6.22.bb
+++ b/packages/linux/compulab-pxa270_2.6.22.bb
@@ -34,7 +34,6 @@ inherit kernel
 inherit package
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 
 FILES_kernel-image = ""
 
diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
index 7fd152ab40..8cfd541720 100644
--- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
+++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
@@ -16,7 +16,6 @@ S = "${WORKDIR}/linux-2.6.17"
 
 inherit kernel
 
-KERNEL_IMAGETYPE = "zImage"
 
 
 
diff --git a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
index 4c39b0fc90..df8912e57e 100644
--- a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
+++ b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
@@ -15,7 +15,6 @@ S = "${WORKDIR}/linux-2.6.19"
 
 inherit kernel
 
-KERNEL_IMAGETYPE = "zImage"
 
 
 
diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
index f17f3168c0..9af2696d66 100644
--- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
+++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
@@ -16,7 +16,6 @@ S = "${WORKDIR}/linux-2.6.5"
 
 inherit kernel
 
-KERNEL_IMAGETYPE = "zImage"
 
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 367685f112..92bc34c987 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -156,7 +156,6 @@ COMPATIBLE_MACHINE = '(ixp4xx|nslu2|fsg3)'
 inherit kernel
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 
 # To specify the console set KERNEL_CONSOLE in the .bb file.
 # CMDLINE_ROOT contains the boot options, these will be
diff --git a/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb b/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb
index d58c28e227..2fbdf1aa9c 100644
--- a/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb
+++ b/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb
@@ -16,7 +16,6 @@ S = "${WORKDIR}/linux-${KV}"
 
 inherit kernel
 
-KERNEL_IMAGETYPE = "zImage"
 
 do_configure_prepend() {
 	cp ${WORKDIR}/defconfig ${S}/.config
diff --git a/packages/linux/linux-dht-walnut_2.6.20.bb b/packages/linux/linux-dht-walnut_2.6.20.bb
index bc876ebf34..89a776e075 100644
--- a/packages/linux/linux-dht-walnut_2.6.20.bb
+++ b/packages/linux/linux-dht-walnut_2.6.20.bb
@@ -21,7 +21,6 @@ FILES_kernel-image = "/boot/zImage.elf"
 
 export OS = "Linux"
 ARCH = "ppc"
-KERNEL_IMAGETYPE = "zImage"
 KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
 
 
diff --git a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
index 7c28e7270e..a66aae3700 100644
--- a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
+++ b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
@@ -19,7 +19,6 @@ inherit kernel
 
 export ARCH="powerpc"
 
-KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
 		install -m 644 ${WORKDIR}/defconfig ${S}/.config
diff --git a/packages/linux/linux-efika_2.6.20.11.bb b/packages/linux/linux-efika_2.6.20.11.bb
index d54b642a1b..2113b27be9 100644
--- a/packages/linux/linux-efika_2.6.20.11.bb
+++ b/packages/linux/linux-efika_2.6.20.11.bb
@@ -53,7 +53,6 @@ inherit kernel
 
 export ARCH="powerpc"
 
-KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
 		install -m 644 ${WORKDIR}/defconfig ${S}/.config
diff --git a/packages/linux/linux-efika_2.6.20.bb b/packages/linux/linux-efika_2.6.20.bb
index bb2a6dc815..ddf3ee3257 100644
--- a/packages/linux/linux-efika_2.6.20.bb
+++ b/packages/linux/linux-efika_2.6.20.bb
@@ -50,7 +50,6 @@ inherit kernel
 
 export ARCH="powerpc"
 
-KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
 		install -m 644 ${WORKDIR}/defconfig ${S}/.config
diff --git a/packages/linux/linux-efika_2.6.21+git.bb b/packages/linux/linux-efika_2.6.21+git.bb
index 0dcc8b3304..80a4e69a4a 100644
--- a/packages/linux/linux-efika_2.6.21+git.bb
+++ b/packages/linux/linux-efika_2.6.21+git.bb
@@ -16,7 +16,6 @@ inherit kernel
 
 export ARCH="powerpc"
 
-KERNEL_IMAGETYPE = "zImage"
 
 do_fetch () {
 	cd ${WORKDIR}
diff --git a/packages/linux/linux-epia_2.6.11.bb b/packages/linux/linux-epia_2.6.11.bb
index dd68bcd4b7..04c47ca397 100644
--- a/packages/linux/linux-epia_2.6.11.bb
+++ b/packages/linux/linux-epia_2.6.11.bb
@@ -15,7 +15,6 @@ COMPATIBLE_HOST = 'i.86.*-linux'
 inherit kernel
 
 ARCH = "i386"
-KERNEL_IMAGETYPE = "bzImage"
 
 # Don't want kernel in rootfs
 FILES_kernel = ""
diff --git a/packages/linux/linux-epia_2.6.12.bb b/packages/linux/linux-epia_2.6.12.bb
index dd68bcd4b7..04c47ca397 100644
--- a/packages/linux/linux-epia_2.6.12.bb
+++ b/packages/linux/linux-epia_2.6.12.bb
@@ -15,7 +15,6 @@ COMPATIBLE_HOST = 'i.86.*-linux'
 inherit kernel
 
 ARCH = "i386"
-KERNEL_IMAGETYPE = "bzImage"
 
 # Don't want kernel in rootfs
 FILES_kernel = ""
diff --git a/packages/linux/linux-epia_2.6.19.2.bb b/packages/linux/linux-epia_2.6.19.2.bb
index 87d61b0226..29f53a4dae 100644
--- a/packages/linux/linux-epia_2.6.19.2.bb
+++ b/packages/linux/linux-epia_2.6.19.2.bb
@@ -14,7 +14,6 @@ COMPATIBLE_HOST = 'i.86.*-linux'
 inherit kernel
 
 ARCH = "i386"
-KERNEL_IMAGETYPE = "bzImage"
 
 # Don't want kernel in rootfs
 FILES_kernel = ""
diff --git a/packages/linux/linux-epia_2.6.8.1.bb b/packages/linux/linux-epia_2.6.8.1.bb
index ef38d10853..315ff118e8 100644
--- a/packages/linux/linux-epia_2.6.8.1.bb
+++ b/packages/linux/linux-epia_2.6.8.1.bb
@@ -14,7 +14,6 @@ COMPATIBLE_HOST = 'i.86.*-linux'
 inherit kernel
 
 ARCH = "i386"
-KERNEL_IMAGETYPE = "bzImage"
 
 # Don't want kernel in rootfs
 FILES_kernel = ""
diff --git a/packages/linux/linux-geodegx_2.4.24.bb b/packages/linux/linux-geodegx_2.4.24.bb
index 968127c5f3..fb42b562cc 100644
--- a/packages/linux/linux-geodegx_2.4.24.bb
+++ b/packages/linux/linux-geodegx_2.4.24.bb
@@ -19,7 +19,6 @@ S = "${WORKDIR}/linux-${KV}"
 inherit kernel
 
 ARCH = "i386"
-KERNEL_IMAGETYPE = "bzImage"
 
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
diff --git a/packages/linux/linux-geodelx_2.6.11.bb b/packages/linux/linux-geodelx_2.6.11.bb
index 7605f68011..adfd7475bb 100644
--- a/packages/linux/linux-geodelx_2.6.11.bb
+++ b/packages/linux/linux-geodelx_2.6.11.bb
@@ -19,7 +19,6 @@ S = "${WORKDIR}/linux-${KV}"
 inherit kernel
 
 ARCH = "i386"
-KERNEL_IMAGETYPE = "bzImage"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
 	http://www.amd.com/files/connectivitysolutions/geode/geode_lx/${AMD_DRIVER_LABEL}.patch;patch=1 \
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.11.bb b/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
index a83347bf7b..4b6f1fab9b 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
@@ -15,7 +15,6 @@ S = "${WORKDIR}/linux-${PV}"
 inherit kernel
 
 ARCH = "sh"
-KERNEL_IMAGETYPE = "zImage"
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 
 do_configure_prepend() {
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
index 4fdeb52fc4..afe5f30f29 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
@@ -22,7 +22,6 @@ inherit kernel
 KERNEL_CCSUFFIX = "-3.4.4"
 
 ARCH = "sh"
-KERNEL_IMAGETYPE = "zImage"
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 
 do_configure_prepend() {
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
index 82b54258b5..4b8a85844e 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
@@ -20,7 +20,6 @@ inherit kernel
 KERNEL_CCSUFFIX = "-3.4.4"
 
 ARCH = "sh"
-KERNEL_IMAGETYPE = "zImage"
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 
 do_configure_prepend() {
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
index eea3ceab7e..c9b39e5f8e 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
@@ -30,7 +30,6 @@ inherit kernel
 KERNEL_CCSUFFIX = "-3.4.4"
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 
 do_configure_prepend() {
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
index 80b1e51a50..dbb4277723 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
@@ -18,7 +18,6 @@ inherit kernel
 KERNEL_CCSUFFIX = "-3.4.4"
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 
 do_configure_prepend() {
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
index 10b3d2edac..52861e82ab 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
@@ -19,7 +19,6 @@ inherit kernel
 KERNEL_CCSUFFIX = "-3.4.4"
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 
diff --git a/packages/linux/linux-ks8695_2.6.16.bb b/packages/linux/linux-ks8695_2.6.16.bb
index e2bc3bb8d8..de64c680a8 100644
--- a/packages/linux/linux-ks8695_2.6.16.bb
+++ b/packages/linux/linux-ks8695_2.6.16.bb
@@ -17,7 +17,6 @@ inherit kernel
 inherit package
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 CMDLINE = "ttyS0,115200n8 root=/dev/mtdblock2 init=/linuxrc"
 
 do_configure_prepend() {
diff --git a/packages/linux/linux-magicbox_2.6.18.6.bb b/packages/linux/linux-magicbox_2.6.18.6.bb
index fde955ce9a..9410294020 100644
--- a/packages/linux/linux-magicbox_2.6.18.6.bb
+++ b/packages/linux/linux-magicbox_2.6.18.6.bb
@@ -30,7 +30,6 @@ FILES_kernel-image = "/boot/zImage.elf"
 
 export OS = "Linux"
 ARCH = "ppc"
-KERNEL_IMAGETYPE = "zImage"
 KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
 
 
diff --git a/packages/linux/linux-magicbox_2.6.19.2.bb b/packages/linux/linux-magicbox_2.6.19.2.bb
index 438eaac478..82576776f3 100644
--- a/packages/linux/linux-magicbox_2.6.19.2.bb
+++ b/packages/linux/linux-magicbox_2.6.19.2.bb
@@ -63,7 +63,6 @@ FILES_kernel-image = "/boot/zImage.elf"
 
 export OS = "Linux"
 ARCH = "ppc"
-KERNEL_IMAGETYPE = "zImage"
 KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
 
 
diff --git a/packages/linux/linux-ml403-slab-2.6.x_git.bb b/packages/linux/linux-ml403-slab-2.6.x_git.bb
index bdaeb39526..75233492eb 100644
--- a/packages/linux/linux-ml403-slab-2.6.x_git.bb
+++ b/packages/linux/linux-ml403-slab-2.6.x_git.bb
@@ -4,8 +4,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board"
 LICENSE = "GPL"
-DEPENDS = "git-native"
-PR = "r1"
+PR = "r2"
 PV = "2.6+git${SRCDATE}"
 
 COMPATIBLE_MACHINE = "xilinx-ml403"
@@ -24,6 +23,18 @@ ARCH = "ppc"
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
 
+#make sure git-native gets build before as
+python __anonymous () {
+
+    import bb
+
+
+    depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
+    depends = depends + " git-native:do_populate_staging"
+    bb.data.setVarFlag('do_fetch', 'depends', depends, d)
+
+}
+
 
 do_fetch () { 
 
diff --git a/packages/linux/linux-navman_2.6.18.bb b/packages/linux/linux-navman_2.6.18.bb
index 7cdb0b76a9..f9b8e37817 100644
--- a/packages/linux/linux-navman_2.6.18.bb
+++ b/packages/linux/linux-navman_2.6.18.bb
@@ -17,7 +17,6 @@ S = "${WORKDIR}/linux-2.6.18"
 
 inherit kernel
 
-KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
         rm -f ${S}/.config
diff --git a/packages/linux/linux-smdk2440_2.6.20+git.bb b/packages/linux/linux-smdk2440_2.6.20+git.bb
index ea9cbfb91a..cb824e22bb 100644
--- a/packages/linux/linux-smdk2440_2.6.20+git.bb
+++ b/packages/linux/linux-smdk2440_2.6.20+git.bb
@@ -15,7 +15,6 @@ inherit kernel
 
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "smdk2440"
-KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
 	install ${WORKDIR}/defconfig-smdk2440 ${S}/.config
diff --git a/packages/linux/linux-smdk2443_2.6.20+git.bb b/packages/linux/linux-smdk2443_2.6.20+git.bb
index 6d129baea1..b91ddb7bd0 100644
--- a/packages/linux/linux-smdk2443_2.6.20+git.bb
+++ b/packages/linux/linux-smdk2443_2.6.20+git.bb
@@ -25,7 +25,6 @@ inherit kernel
 
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = "smdk2443"
-KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
 	install ${WORKDIR}/defconfig-smdk2443 ${S}/.config
diff --git a/packages/linux/linux-titan-sh4_2.6.21.bb b/packages/linux/linux-titan-sh4_2.6.21.bb
index ee890e2415..c760669bde 100644
--- a/packages/linux/linux-titan-sh4_2.6.21.bb
+++ b/packages/linux/linux-titan-sh4_2.6.21.bb
@@ -16,7 +16,6 @@ COMPATIBLE_MACHINE = "titan"
 inherit kernel
 
 ARCH = "sh"
-KERNEL_IMAGETYPE = "zImage"
 KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
 
 #
diff --git a/packages/linux/linux-wrap-geode_2.6.17.bb b/packages/linux/linux-wrap-geode_2.6.17.bb
index d717cd3c40..3d9b81a936 100644
--- a/packages/linux/linux-wrap-geode_2.6.17.bb
+++ b/packages/linux/linux-wrap-geode_2.6.17.bb
@@ -14,7 +14,6 @@ COMPATIBLE_MACHINE = "wrap"
 inherit kernel
 
 ARCH = "i386"
-KERNEL_IMAGETYPE = "bzImage"
 KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
 
 do_configure_prepend() {
diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb
index f193ec2c79..d36016caa9 100644
--- a/packages/linux/linux-wrt_2.4.20.bb
+++ b/packages/linux/linux-wrt_2.4.20.bb
@@ -26,7 +26,6 @@ COMPATIBLE_HOST = 'mipsel.*-linux'
 
 inherit kernel
 
-KERNEL_IMAGETYPE ?= "zImage"
 CMDLINE_CONSOLE ?= "ttyS0,115200n8"
 CMDLINE_ROOT ?= "root=/dev/mtdblock2 noinitrd"
 # CMDLINE_INIT = "init=/bin/busybox ash"
diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index 4bcdf9d81d..ec269d94ef 100644
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -75,7 +75,6 @@ COMPATIBLE_HOST = 'mipsel.*-linux'
 
 inherit kernel
 
-KERNEL_IMAGETYPE ?= "zImage"
 KERNEL_OUTPUT = "arch/mips/brcm-boards/bcm947xx/compressed/piggy"
 CMDLINE = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 console=ttyS0,115200"
 
diff --git a/packages/linux/linux-x86_2.6.17.9.bb b/packages/linux/linux-x86_2.6.17.9.bb
index d7600dcfa9..829c884560 100644
--- a/packages/linux/linux-x86_2.6.17.9.bb
+++ b/packages/linux/linux-x86_2.6.17.9.bb
@@ -11,7 +11,6 @@ S = "${WORKDIR}/linux-${PV}"
 inherit kernel
 
 COMPATIBLE_HOST = "i.86.*-linux"
-KERNEL_IMAGETYPE = "bzImage"
 
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb
index 8688725bd7..0582c9d58a 100644
--- a/packages/linux/linux-x86_2.6.20.bb
+++ b/packages/linux/linux-x86_2.6.20.bb
@@ -15,7 +15,6 @@ S = "${WORKDIR}/linux-${PV}"
 inherit kernel
 
 COMPATIBLE_HOST = "i.86.*-linux"
-KERNEL_IMAGETYPE = "bzImage"
 
 do_configure_prepend_x86() {
 	install -m 0644 ${WORKDIR}/i486-defconfig ${S}/.config
diff --git a/packages/linux/linux-z_2.6.20.bb b/packages/linux/linux-z_2.6.20.bb
index b707a2649b..8c5c940155 100644
--- a/packages/linux/linux-z_2.6.20.bb
+++ b/packages/linux/linux-z_2.6.20.bb
@@ -15,7 +15,6 @@ COMPATIBLE_HOST = "(arm).*-linux"
 COMPATIBLE_MACHINE = '(shark)'
 
 
-KERNEL_IMAGETYPE = "zImage"
 
 
 do_configure_prepend() {
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 2b7df69015..cc87d3e3d0 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -12,15 +12,6 @@ DEPENDS_gumstix = "u-boot-mkimage-openmoko-native"
 
 inherit kernel
 
-KERNEL_IMAGETYPE_alix = "bzImage"
-KERNEL_IMAGETYPE_progear = "bzImage"
-KERNEL_IMAGETYPE_simpad = "zImage"
-KERNEL_IMAGETYPE_kb9202 = "uImage"
-KERNEL_IMAGETYPE_atngw100 = "uImage"
-KERNEL_IMAGETYPE_at32stk1000 = "uImage"
-KERNEL_IMAGETYPE_at91sam9263ek = "uImage"
-KERNEL_IMAGETYPE_sarge-at91 = "uImage"
-
 # Specify the commandline for you device here:
 
 #boot from mmc
diff --git a/packages/linux/linux_2.6.14.bb b/packages/linux/linux_2.6.14.bb
index 3ddfec809a..85febb45d9 100644
--- a/packages/linux/linux_2.6.14.bb
+++ b/packages/linux/linux_2.6.14.bb
@@ -42,10 +42,6 @@ SRC_URI_append_acern30 = "\
 
 inherit kernel
 
-KERNEL_IMAGETYPE = "bzImage"
-KERNEL_IMAGETYPE_simpad = "zImage"
-KERNEL_IMAGETYPE_acern30 = "zImage"
-
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
 }
diff --git a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
index b258e197ff..f631ff5356 100644
--- a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
+++ b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
@@ -17,7 +17,6 @@ inherit kernel
 inherit package
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 
 FILES_kernel-image = ""
 
diff --git a/packages/linux/logicpd-pxa270_2.6.19.2.bb b/packages/linux/logicpd-pxa270_2.6.19.2.bb
index 283ebb1133..f4b40e6cc6 100644
--- a/packages/linux/logicpd-pxa270_2.6.19.2.bb
+++ b/packages/linux/logicpd-pxa270_2.6.19.2.bb
@@ -38,7 +38,6 @@ inherit kernel
 inherit package
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 
 FILES_kernel-image = ""
 
diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb
index a3679d0b8c..d3c5cd1ea3 100644
--- a/packages/linux/mainstone-kernel_2.6.11.bb
+++ b/packages/linux/mainstone-kernel_2.6.11.bb
@@ -14,7 +14,6 @@ inherit kernel
 inherit package
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 #CMDLINE_CONSOLE ?= "ttyS0,115200n8"
 #CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000"
 #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb
index df14cffca4..f487e1f38a 100644
--- a/packages/linux/mainstone-kernel_2.6.18.bb
+++ b/packages/linux/mainstone-kernel_2.6.18.bb
@@ -14,7 +14,6 @@ inherit kernel
 inherit package
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 #CMDLINE_CONSOLE ?= "ttyS0,115200n8"
 #CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000"
 #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
diff --git a/packages/linux/mx21ads-kernel_2.6.19rc6.bb b/packages/linux/mx21ads-kernel_2.6.19rc6.bb
index 579bedd8d6..fe9c695b67 100644
--- a/packages/linux/mx21ads-kernel_2.6.19rc6.bb
+++ b/packages/linux/mx21ads-kernel_2.6.19rc6.bb
@@ -18,7 +18,6 @@ COMPATIBLE_MACHINE = "mx21ads"
 inherit kernel
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 RPROVIDES_kernel-image += "hostap-modules"
 
 #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
diff --git a/packages/linux/mx31ads-kernel_2.6.19rc6.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
index b6ba6a65cd..3854a82eb8 100644
--- a/packages/linux/mx31ads-kernel_2.6.19rc6.bb
+++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
@@ -18,7 +18,6 @@ COMPATIBLE_MACHINE = "mx31ads"
 inherit kernel
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 RPROVIDES_kernel-image += "hostap-modules"
 
 #CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb
index 8c04f75779..6360ef56ae 100644
--- a/packages/linux/netbook-pro-kernel_2.6.17.bb
+++ b/packages/linux/netbook-pro-kernel_2.6.17.bb
@@ -16,7 +16,6 @@ S = "${WORKDIR}/linux-2.6.17"
 
 inherit kernel
 
-KERNEL_IMAGETYPE = "zImage"
 
 
 
diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb
index 09c9c3cbad..343dd83bb3 100644
--- a/packages/linux/triton-kernel_2.6.11.bb
+++ b/packages/linux/triton-kernel_2.6.11.bb
@@ -17,7 +17,6 @@ COMPATIBLE_HOST = 'arm.*-linux'
 inherit kernel
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 CMDLINE ?= "root=/dev/mtdblock2 rw rootfstype=jffs2 reboot=5"
 
 do_configure_prepend() {
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index b4244c7e3d..b2e903c913 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -38,7 +38,6 @@ S = "${WORKDIR}/linux-2.4.22"
 inherit kernel
 
 ARCH = "arm"
-KERNEL_IMAGETYPE = "zImage"
 KERNEL_SUFFIX = "ixp4xxbe"
 CMDLINE_CONSOLE ?= "ttyS0,115200"
 CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000"
diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb
index eff85aca45..ff14d95667 100644
--- a/packages/python/python-evas_cvs.bb
+++ b/packages/python/python-evas_cvs.bb
@@ -1,7 +1,7 @@
 require python-efl.inc
 DEPENDS += "evas"
 
-PR = "r1"
+PR = "r2"
 
 do_stage() {
 	distutils_stage_all
diff --git a/packages/qt/qt4-x11-free_4.3.0.bb b/packages/qt/qt4-x11-free_4.3.0.bb
index 35fa1ccd62..181fd5086f 100644
--- a/packages/qt/qt4-x11-free_4.3.0.bb
+++ b/packages/qt/qt4-x11-free_4.3.0.bb
@@ -77,8 +77,8 @@ do_stage() {
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
 	sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g'  ${STAGING_QT_DIR}/mkspecs/qconfig.pri
-	for pc in ${STAGING_QT_DIR}/lib/pkgconfig/Qt{AssistantClient,DBus,Test,UiTools}.pc ; do
-		sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' $pc
+	for pcc in AssistantClient DBus Test UiTools ; do
+		sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc
 	done
         for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do
                 install -m 0644 $pc ${PKG_CONFIG_PATH}/