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