Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

9 files changed, 141 insertions, 74 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index fd84ea205a..e7ac03e34c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -342,9 +342,9 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output=
 IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2"
 IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
 IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
+IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz"
 IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
+IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz"
 IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 9cdf47af72..ffc84c666e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -7086,6 +7086,10 @@ sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
 md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
 sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
 
+[ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.0/gcc-4.4.0.tar.bz2]
+md5=cf5d787bee57f38168b74d65a7c0e6fd
+sha256=c5fe6f4c62ee7288765c3800ec9d21ad936bdcb5a04374cc09bd5a4232b836c9
+
 [http://downloads.sourceforge.net/mingw/gcc-ada-3.4.5-20060117-2-src.tar.gz]
 md5=30154205636c12c6abcc462ce07550cf
 sha256=404358fe19326679f602de6f7d6a2db180e27af83813150f58ab28eec197b646
@@ -7278,6 +7282,10 @@ sha256=5af6001401a6bc04c075474be5d8aeb2bdb2ca3e509022c2fc55ca7c7f310256
 md5=fd0337e89778e2dba74461c555ea8e42
 sha256=e50495d292a1d456c28044efbf07c16d8865f8d95e1caba86f4c5b2e3fb1d28f
 
+[http://downloads.sourceforge.net/genext2fs/genext2fs-1.4.1.tar.gz]
+md5=b7b6361bcce2cedff1ae437fadafe53b
+sha256=404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc
+
 [http://downloads.sourceforge.net/genext2fs/genext2fs-1.4rc1.tar.gz]
 md5=664431bf6737df1c265500e1f0b5d40c
 sha256=e60f88763ee12c02a5c7ade1a58925ef0ab198f9ec6aaf404747dfc29074c7be
@@ -18306,9 +18314,9 @@ sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e
 md5=26f67d99666834cc579094619821d3c8
 sha256=035bbd4c1ac9c5b3a42e58777446e0370ca66d9258dc30a9f4c5ad48ebfacd65
 
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2]
-md5=05daeda25430fd13bbdb47b3481f7320
-sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc3.bz2]
+md5=cd69d16ea42bbf20d0a505690be45868
+sha256=7d07783e7ba793c8e043a83a2aabcf23ef29174a1963643a407f3a02fcb4542b
 
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 82d216ace5..af768c33da 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -155,7 +155,7 @@ SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
-SRCREV_pn-openezx-kernel ?= "b53ea978de2a628f61f8e24e584c11dc90df3d39"
+SRCREV_pn-openezx-kernel ?= "43b844d1d38f0343272d3f0f844f80666186c526"
 SRCREV_pn-openmoko-agpsui ?= "7"
 SRCREV_pn-openmoko-alsa-scenarios ?= "4732"
 SRCREV_pn-openmoko-appearance ?= "3262"
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 1cc165b008..53e928ba81 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -1,12 +1,16 @@
 #@--------------------------------------------------------------------
 #@TYPE: Distribution
-#@NAME: KaeilOS 
+#@NAME: KaeilOS(R) - http://www.kaeilos.com
 #@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
 #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+#@VERSION: 28-04-2009
+#
+# Use this at your own risk, we welcome bugreports filed at 
+#    http://bugs.openembedded.net
 #@--------------------------------------------------------------------
 
-#DISTRO_VERSION = "2008.1"
-DISTRO_VERSION = "2008.1-test-${DATE}"
+#DISTRO_VERSION = "2009.1"
+DISTRO_VERSION = "2009.1-test-${DATE}"
 DISTRO_REVISION = "1"
 DISTRO_PR = ".1"
 
@@ -20,7 +24,6 @@ require conf/distro/include/preferred-opie-versions-1.2.4.inc
 
 PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
 PREFERRED_VERSION_busybox        = "1.13.2"
-
 IMAGE_DEV_MANAGER = "busybox-mdev"
 
 #Images built can have to modes:
@@ -46,19 +49,38 @@ FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROMLIBC}/"
 
 #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
 CVS_TARBALL_STASH ?= "\
-             http://www.angstrom-distribution.org/unstable/sources/ \
-            "
+		     http://www.angstrom-distribution.org/unstable/sources/ \
+		    "
 
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
 PCMCIA_MANAGER = "pcmciautils"
 
+#Preferred version for the kernel on various machines
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
+
+#Initramfs for kernels
+#KERNEL_INITRAMFS_DIR = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/"
+#KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
+
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers    = "2.6.23"
+PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
 
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
-PREFERRED_VERSION_glibc         ?= "2.6.1"
-PREFERRED_VERSION_glibc-initial     ?= "2.6.1"
-PREFERRED_VERSION_uclibc            ?= "0.9.30"
-PREFERRED_VERSION_uclibc-initial    ?= "0.9.30"
+PREFERRED_VERSION_glibc 		?= "2.6.1"
+PREFERRED_VERSION_glibc-initial 	?= "2.6.1"
+PREFERRED_VERSION_uclibc        	?= "0.9.30"
+PREFERRED_VERSION_uclibc-initial	?= "0.9.30"
+
+# Preferred provider for virtual/psplash
+# This enforces a specific brand to be used, in our case the angstrom
+# one. In case you want to change the logo or something like that we
+# suggest you to create another recipe (e.g: psplash-<brand>) for that
+# and add that into your image.
+# You can also opt to change or override this line, but that isn't
+# needed because psplash is using update-alternatives.
+#PREFERRED_PROVIDER_virtual/psplash               ?= "psplash-kaeilos"
 
 PREFERRED_PROVIDER_avahi = "avahi"
 
@@ -67,31 +89,28 @@ PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
 #powerpc needs additional patches to gcc
-ANGSTROM_GCC_VERSION_ppc405         ?= "4.1.1"
-ANGSTROM_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
-ANGSTROM_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
+ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 
 # Blackfin has its own gcc
-ANGSTROM_GCC_VERSION_bfin           = "4.1.2"
+ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 
-#for proper NEON support we need a CSL toolchain 
-#ANGSTROM_GCC_VERSION_armv7a         = "4.2.1+csl-arm-2007q3-53"
-ANGSTROM_GCC_VERSION_armv7a     = "4.3.1" 
+ANGSTROM_GCC_VERSION_armv7a		= "4.3.1" 
 
-#Horrible workaround for armv7a follows:
-# gcc 4.3.1 builds a kernel that oopses with a null-pointer in the rcu-update function
-# gcc 4.2.1 (the one from *gasp* csl) builds a working kernel, but non-working userspace
+ANGSTROM_GCC_VERSION_486sx = "4.3.2"
 
-KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
+# Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
+#KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
 
 #avr32 only has support for gcc 4.2.2
-ANGSTROM_GCC_VERSION_avr32      ?= "4.2.2"
+ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
 
 #Everybody else can just use this: 
-ANGSTROM_GCC_VERSION            ?= "4.2.4"
-PREFERRED_VERSION_binutils              ?= "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross        ?= "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross-sdk    ?= "2.18.50.0.7"
+ANGSTROM_GCC_VERSION 			?= "4.2.4"
+PREFERRED_VERSION_binutils	?= "2.18.50.0.7"
+PREFERRED_VERSION_binutils-cross 	?= "2.18.50.0.7"
+PREFERRED_VERSION_binutils-cross-sdk 	?= "2.18.50.0.7"
 
 PREFERRED_VERSION_gcc                    ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross              ?= "${ANGSTROM_GCC_VERSION}"
@@ -118,6 +137,8 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
 
 # hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
 PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
+PREFERRED_PROVIDER_hostap-modules_h2200             ?= "hostap-modules"
+PREFERRED_PROVIDER_hostap-modules_hx4700            ?= "hostap-modules"
 
 PREFERRED_PROVIDER_virtual/db           ?= "db"
 PREFERRED_PROVIDER_virtual/db-native    ?= "db-native"
@@ -126,19 +147,20 @@ PREFERRED_PROVIDER_virtual/libx11       ?= "libx11"
 PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
-PREFERRED_PROVIDER_linux-libc-headers     = "linux-libc-headers"
-PREFERRED_PROVIDER_dbus-glib              = "dbus-glib"
-PREFERRED_PROVIDER_esound                ?= "pulseaudio"
-PREFERRED_PROVIDER_gconf                 ?= "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs             ?= "gnome-vfs"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
+PREFERRED_PROVIDER_esound               ?= "pulseaudio"
+PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs            ?= "gnome-vfs"
 PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib                 ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf            ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget          ?= "libgpewidget"
-PREFERRED_PROVIDER_ntp                   ?= "ntp"
-PREFERRED_PROVIDER_hotplug                = "udev"
-PREFERRED_PROVIDER_libxss                 = "libxss"
-PREFERRED_PROVIDER_bluez-utils-dbus       = "bluez-utils"
+PREFERRED_PROVIDER_tslib                ?= "tslib"
+PREFERRED_PROVIDER_tslib-conf           ?= "tslib"
+PREFERRED_PROVIDER_libgpewidget         ?= "libgpewidget"
+PREFERRED_PROVIDER_ntp                  ?= "ntp"
+PREFERRED_PROVIDER_hotplug               = "udev"
+PREFERRED_PROVIDER_libxss                = "libxss"
+PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
+PREFERRED_PROVIDER_bluez-libs            = "bluez4"
 
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
@@ -156,13 +178,29 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 
+
 #Silence a warning during parsing
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
+#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
+ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 require conf/distro/include/kaeilos.inc
 
+
+
+# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
+# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
+IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
+
 # do some task-base stuff here
 
+# Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with
+# bluez 3.x
+DISTRO_BLUETOOTH_MANAGER = "\
+	blueprobe \
+	bluez4 \
+   "
+
 # We want to ship extra debug utils in the rootfs when doing a debug build 
 DEBUG_APPS ?= ""
 DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
@@ -178,9 +216,22 @@ DISTRO_EXTRA_RDEPENDS += "\
     ${DEBUG_APPS} angstrom-libc-fixup-hack \
     "
 
+# This also hooks into task-base, but isn't mandatory.
+# If you don't want parts of this in your task-base using images you can put this in the image recipe:
+# BAD_RECOMMENDATIONS = "avahi-daemon avahi-autoipd"
+# Note that BAD_RECOMMENDATIONS is a feature of rootfs_ipk.bbclass, not angstrom
+# kernel modules: ship fs modules so you can mount stuff and af-packet so networking works
+# avahi: makes finding your device on the network a lot easier
+# openssh-sftp-server: provides sftp which combined with avahi makes it real easy to use things like sshfs
+# psplash-angstrom: angstrom branded psplash, you can add your own psplash-foo to an image, it uses update-alternatives
+# DEBUG_APPS: ship strace and procpc to make simple debugging a lot easier
 DISTRO_EXTRA_RRECOMMENDS += " \
     kernel-module-vfat \
     kernel-module-ext2 \
+    kernel-module-ext3 \
     kernel-module-af-packet \
     openssh-sftp-server \
     "
+
+ARM_INSTRUCTION_SET_pn-uclibc = "arm"
+ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm"
diff --git a/conf/licenses.conf b/conf/licenses.conf
index e81434da8c..01c4747167 100644
--- a/conf/licenses.conf
+++ b/conf/licenses.conf
@@ -1,4 +1,5 @@
-SRC_DISTRIBUTE_LICENSES += "GPL GPLv2 BSD LGPL Apache-2.0 QPL AFL"
+SRC_DISTRIBUTE_LICENSES += "GPL GPLv2 GPLv3 LGPL LGPLv2.1 LGPLv3"
+SRC_DISTRIBUTE_LICENSES += "BSD Apache-2.0 QPL AFL"
 SRC_DISTRIBUTE_LICENSES += "MIT Sleepycat Classpath Perl PSF PD Artistic"
 SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf openssl"
 SRC_DISTRIBUTE_LICENSES += "Info-ZIP tcp-wrappers"
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index be38858ae9..f58feb686c 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,9 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-IMAGE_FSTYPES += "tar.gz"
+MACHINE_KERNEL_PR = "r1"
+
+IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
 
 # Currently all the orion devices we support use uImage
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 5e4e1ac579..71fea7a508 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -44,32 +44,19 @@ KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
 
 zaurus_make_installkit () {
-    cd ${DEPLOY_DIR_IMAGE}
-    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/         
-    mkdir ${IMAGE_NAME}-installkit/
-
-    # Get the latest kernel using the ${KERNEL_IMAGETYPE}-<machine>.bin symlink
-    if [ "${@base_contains('MACHINE_FEATURES', 'kexecboot', 'true', 'false',d)}" = "true" ]; then
-	    [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/${KERNEL_IMAGETYPE}
-	    # we need also tgz for mmc or cf cards
-	    cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/image.tgz
-    else
-	    cp ${KERNEL_IMAGETYPE}-${MACHINE}.bin ${IMAGE_NAME}-installkit/${KERNEL_IMAGETYPE}
-    fi
-
-    if [ "${MACHINE}" = "spitz" ]; then
-        cp gnu-tar ${IMAGE_NAME}-installkit/
-        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
-    else
-        [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
-    fi
-
-    cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
-   
+
+	cd ${DEPLOY_DIR_IMAGE}
+	rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/         
+	mkdir installkit-${MACHINE}/
+
+	[ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
+
+	cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh
  
-    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
-    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
-    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
+	tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/
+	md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5
+	rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/     
+
 }
 
 require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index cc58c4a48b..c3bbca856a 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,7 +1,10 @@
 include conf/machine/include/tune-xscale.inc
 
-UBOOT_ENTRYPOINT = "0xA0008000"
-UBOOT_LOADADDRESS = "0xA0008000"
+UBOOT_ENTRYPOINT_c7x0 = "0xA0008000"
+UBOOT_ENTRYPOINT_akita = "0xA1000000"
+UBOOT_ENTRYPOINT_spitz = "0xA1000000"
+
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
 
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
diff --git a/conf/machine/sheevaplug.conf b/conf/machine/sheevaplug.conf
index ee9ba6cb88..4517312e7a 100644
--- a/conf/machine/sheevaplug.conf
+++ b/conf/machine/sheevaplug.conf
@@ -3,4 +3,19 @@
 MACHINE_EXTRA_RDEPENDS          = "u-boot-utils"
 MACHINE_EXTRA_RRECOMMENDS       = "kernel-modules"
 
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 4096 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 4096"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
 require conf/machine/include/kirkwood.inc