merge of '4b48cc331d56f5ee9714871633ccb98a1cfe28e1'

     and '9e08f0a0ea353d01da3e8da16012b96b9e4e2fa2'

37 files changed, 3087 insertions, 4855 deletions

diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass
index 33caa54b21..8be1fa762f 100644
--- a/classes/nslu2-image.bbclass
+++ b/classes/nslu2-image.bbclass
@@ -19,5 +19,5 @@ nslu2_pack_image () {
 		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin
 }
 
-EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb'
+EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe apex-nslu2 apex-nslu2-16mb'
 IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; "
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index 743b7ad362..6e7d303586 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -2,24 +2,15 @@
 #@NAME: ixp4xx
 #@DESCRIPTION: genric machine configuration for ixp4xx platforms
 
-# Set default for nslu2 - can be overridden for machines with other features.
+# Set default for common ixp4xx-based machines
 MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex"
 
+# Select an appropriate default kernel
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
 PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
 
-# Add modules required for basic networking support
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= " \
-	ixp4xx-npe \
-	"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
-	kernel-module-mii \
-	kernel-module-ixp4xx-mac \
-	kernel-module-ixp4xx-qmgr \
-	kernel-module-via-velocity \
-	"
+# Add packages required for basic networking support
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
 
 # Set default for 16MB machines - can be overridden for more or less flash.
 ROOT_FLASH_SIZE ?= "12"
@@ -27,7 +18,7 @@ ROOT_FLASH_SIZE ?= "12"
 # Allow for rootfs loaded direct from internal hard disk
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-# Set default for nslu2, nas100d, dsmg600
+# Set default for common ixp4xx-based machines
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 3c47b53b56..81c3e29e91 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -13,6 +13,9 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
 PREFERRED_VERSION_u-boot = "1.3.0"
 UBOOT_MACHINE = "MPC8313ERDB_33_config"
 
+#rootfs on NAND flash
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers"
+
 #don't try to access tty1
 USE_VT = "0"
 
diff --git a/contrib/angstrom/angstrom.png b/contrib/angstrom/angstrom.png
new file mode 100644
index 0000000000..cdb84ae12b
--- /dev/null
+++ b/contrib/angstrom/angstrom.png
diff --git a/contrib/angstrom/angstrom.svg b/contrib/angstrom/angstrom.svg
index 8ae0bfc873..1cce5a547d 100644
--- a/contrib/angstrom/angstrom.svg
+++ b/contrib/angstrom/angstrom.svg
@@ -12,18 +12,19 @@
    height="300"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/mnt/MultimediaA"
-   sodipodi:docname="passer.svg"
+   sodipodi:docbase="/home/pfalcon/linux-ppc/org.openembedded.dev/contrib/angstrom"
+   sodipodi:docname="angstrom.svg"
    inkscape:export-filename="/mnt/MultimediaA/passer_s.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#dbe3e2"
+     pagecolor="#ecece1"
      bordercolor="#666666"
      borderopacity="1.0"
      gridtolerance="10000"
@@ -33,7 +34,7 @@
      inkscape:pageshadow="2"
      inkscape:zoom="0.5"
      inkscape:cx="305.99401"
-     inkscape:cy="190.18075"
+     inkscape:cy="-129.81925"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      width="300px"
@@ -46,9 +47,9 @@
      gridoriginy="0px"
      gridoriginx="0px"
      inkscape:window-width="1590"
-     inkscape:window-height="1122"
+     inkscape:window-height="961"
      inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="0"
      inkscape:object-points="true" />
   <metadata
      id="metadata7">
@@ -123,7 +124,10 @@
        rx="11.246277" />
     <g
        id="g1927"
-       transform="matrix(2.146701,0,0,2.146701,-398.0853,376.2692)">
+       transform="matrix(2.146701,0,0,2.146701,-398.0853,376.2692)"
+       inkscape:export-filename="/home/pfalcon/linux-ppc/org.openembedded.dev/contrib/angstrom/angstrom.png"
+       inkscape:export-xdpi="95.910004"
+       inkscape:export-ydpi="95.910004">
       <text
          transform="matrix(0,-1,1,0,0,0)"
          sodipodi:linespacing="100%"
@@ -143,7 +147,10 @@
     </g>
     <g
        id="g1936"
-       transform="matrix(2.052686,0,0,2.052686,-404.4489,380.2516)">
+       transform="matrix(2.052686,0,0,2.052686,-404.4489,380.2516)"
+       inkscape:export-filename="/home/pfalcon/linux-ppc/org.openembedded.dev/contrib/angstrom/angstrom.png"
+       inkscape:export-xdpi="95.910004"
+       inkscape:export-ydpi="95.910004">
       <path
          sodipodi:nodetypes="cc"
          id="path1938"
diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb
index 265f51863d..cc3d08972f 100644
--- a/packages/angstrom/angstrom-gpe-task-base.bb
+++ b/packages/angstrom/angstrom-gpe-task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r32"
+PR = "r33"
 
 inherit task
 
@@ -12,6 +12,8 @@ RDEPENDS_${PN} = "\
     rxvt-unicode \
     gpe-terminal \
     matchbox-keyboard \
+    xkbd \
+    xkbd-layout-ru \
     gpe-theme-clearlooks \
     xst \
     xhost \
diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb
index a9463fdbe5..adc4bb0756 100644
--- a/packages/angstrom/angstrom-gpe-task-settings.bb
+++ b/packages/angstrom/angstrom-gpe-task-settings.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r32"
+PR = "r33"
 
 inherit task
 
 RDEPENDS_${PN} = "\
     matchbox-panel-manager \
+    mboxkbd-layouts-gui \
     gpe-su \
     gpe-conf \
     gpe-package \
diff --git a/packages/devmem2/devmem2.bb b/packages/devmem2/devmem2.bb
index 64de9fcbf3..56095f5c99 100644
--- a/packages/devmem2/devmem2.bb
+++ b/packages/devmem2/devmem2.bb
@@ -1,3 +1,4 @@
+DESCRIPTION = "Simple program to read/write from/to any location in memory."
 SRC_URI = "http://www.abcsinc.com/small-linux/devmem2.c"
 LICENSE = "GPL"
 
diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb
index 8a792b4ae4..064a808273 100644
--- a/packages/directfb/directfb-examples_1.0.0.bb
+++ b/packages/directfb/directfb-examples_1.0.0.bb
@@ -3,8 +3,10 @@ DEPENDS = "directfb"
 SECTION = "libs"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-extra-${PV}.tar.gz"
-S = "${WORKDIR}/DirectFB-extra-${PV}"
+SRC_URI = " \
+           http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \
+          "
+S = "${WORKDIR}/DirectFB-examples-${PV}"
 
 inherit autotools
 
diff --git a/packages/directfb/directfb_1.1.0.bb b/packages/directfb/directfb_1.1.0.bb
index 84772b6a25..2c600b409f 100644
--- a/packages/directfb/directfb_1.1.0.bb
+++ b/packages/directfb/directfb_1.1.0.bb
@@ -10,12 +10,15 @@ DEPENDS = "jpeg libpng freetype zlib tslib"
 PR = "r1"
 RV = "1.1-0"
 
-SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
-           file://fix-pkgconfig-cflags.patch;patch=1 \
-	   file://fix-font-missing-char.patch;patch=1 \
-           file://getpagesize.patch;patch=1 \
-           file://fix-includes.patch;patch=1 \
-	   file://mkdfiff.patch;patch=1"
+SRC_URI = " \
+    http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+    file://fix-configure-include-path.patch;patch=1 \
+    file://fix-pkgconfig-cflags.patch;patch=1 \
+    file://fix-font-missing-char.patch;patch=1 \
+    file://getpagesize.patch;patch=1 \
+    file://fix-includes.patch;patch=1 \
+    file://mkdfiff.patch;patch=1 \
+   "
 
 S = "${WORKDIR}/DirectFB-${PV}"
 
@@ -23,11 +26,12 @@ LDFLAGS_append =" -lts -lm"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-gfxdrivers=none \
+EXTRA_OECONF = " \
+    --with-gfxdrivers=none \
 		--enable-libmpeg3=no \
 		--enable-freetype=yes \
 		--enable-sdl=no \
-	        --enable-vnc=no \
+		--enable-vnc=no \
 		--disable-x11 \
 		"
 
diff --git a/packages/directfb/files/fix-configure-include-path.patch b/packages/directfb/files/fix-configure-include-path.patch
new file mode 100644
index 0000000000..f9bbff8b00
--- /dev/null
+++ b/packages/directfb/files/fix-configure-include-path.patch
@@ -0,0 +1,13 @@
+--- DirectFB-1.1.0/configure.in-orig	2007-08-27 00:07:00.000000000 -0700
++++ DirectFB-1.1.0/configure.in	2007-11-26 12:05:52.000000000 -0800
+@@ -1380,8 +1380,8 @@
+ 
+ MODULEDIR=$libdir/$MODULEDIRNAME
+ DATADIR=$datadir/directfb-$VERSION
+-INCLUDEDIR=$includedir/directfb
+-INTERNALINCLUDEDIR=$includedir/directfb-internal
++INCLUDEDIR=$includedir/
++INTERNALINCLUDEDIR=$includedir/
+ 
+ SOPATH=$libdir/libdirectfb-$LT_RELEASE.so.$LT_CURRENT
+ AC_SUBST(SOPATH)
diff --git a/packages/dropbear/dropbear-early/.mtn2git_empty b/packages/dropbear/dropbear-early/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dropbear/dropbear-early/.mtn2git_empty
diff --git a/packages/dropbear/dropbear-early/dropbear-early b/packages/dropbear/dropbear-early/dropbear-early
new file mode 100644
index 0000000000..fa06a93003
--- /dev/null
+++ b/packages/dropbear/dropbear-early/dropbear-early
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for x in $(cat /proc/cmdline); do
+        case $x in
+        dropbear=early)
+                echo "Starting dropbear early"
+                exec /etc/init.d/dropbear $*
+                ;;
+        esac
+done
diff --git a/packages/dropbear/dropbear-early_1.0.bb b/packages/dropbear/dropbear-early_1.0.bb
new file mode 100644
index 0000000000..651d1327ca
--- /dev/null
+++ b/packages/dropbear/dropbear-early_1.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
+SECTION = "devel"
+PR = "r1"
+
+SRC_URI = "file://dropbear-early"
+
+inherit update-rc.d
+
+do_install() {
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/
+}
+
+PACKAGE_ARCH = "all"
+
+INITSCRIPT_NAME = "dropbear-early"
+INITSCRIPT_PARAMS = "start 00 S ."
diff --git a/packages/images/initramfs-bootmenu-image.bb b/packages/images/initramfs-bootmenu-image.bb
new file mode 100644
index 0000000000..a495363661
--- /dev/null
+++ b/packages/images/initramfs-bootmenu-image.bb
@@ -0,0 +1,11 @@
+# Sample initramfs image
+
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu"
+IMAGE_LINGUAS = ""
+
+# Remove any kernel-image that the kernel-module-* packages may have pulled in.
+PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d"
+ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
+                                remove ${PACKAGE_REMOVE};"
+
+inherit image
diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index b63bc67af7..3101ecb3be 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,7 +1,7 @@
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-PR = "r14"
+PR = "r15"
 
 inherit native
 
diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index 51f5d7f835..c089796ccb 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,19 +5,18 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \
            file://ipkg-py-sane-vercompare.patch;patch=1 \
            file://ipkg-py-tarfile.patch;patch=1 \
            file://ipkg-make-index-track-stamps.patch;patch=1 \
-	   file://fields_tweaks.patch;patch=1 \
-	   "
+           file://fields_tweaks.patch;patch=1 "
 
 S = "${WORKDIR}/ipkg-utils"
 
-INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py"
+INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py ipkg-list-fields"
 
 do_compile() {
 	oe_runmake ipkg-compare-versions
diff --git a/packages/ipkg/files/ipkg-configure b/packages/ipkg/files/ipkg-configure
new file mode 100644
index 0000000000..e0c65ad4e2
--- /dev/null
+++ b/packages/ipkg/files/ipkg-configure
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Starting to configure packages..."
+ipkg-cl configure
+echo "Finished to configure packages."
diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc
index b1e2f19267..9154572f08 100644
--- a/packages/ipkg/ipkg.inc
+++ b/packages/ipkg/ipkg.inc
@@ -10,28 +10,24 @@ FILES_libipkg = "${libdir}/*.so.*"
 AUTO_LIBNAME_PKGS = "libipkg"
 
 SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+        file://ipkg-configure \
 	file://terse.patch;patch=1"
 
 S = "${WORKDIR}/ipkg/C"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-rc.d
 
 # Define a variable to allow distros to run configure earlier.
 # (for example, to enable loading of ethernet kernel modules before networking starts)
 IPKG_INIT_POSITION = "98"
 IPKG_INIT_POSITION_slugos = "41"
 
+INITSCRIPT_NAME = "ipkg-configure"
+INITSCRIPT_PARAMS = "start ${IPKG_INIT_POSITION} S ."
+
+
 pkg_postinst_ipkg () {
 #!/bin/sh
-if [ "x$D" != "x" ]; then
-	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
-	# this happens at S98 where our good 'ole packages script used to run
-	echo "#!/bin/sh
-ipkg-cl configure
-" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
-	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
-fi
-
 update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
@@ -40,6 +36,11 @@ pkg_postrm_ipkg () {
 update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
+do_install_append() {
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/
+}
+
 do_stage() {
 	oe_libinstall -so libipkg ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/replace/
diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb
index 56e25900c1..fccfe8d53f 100644
--- a/packages/ipkg/ipkg_0.99.163.bb
+++ b/packages/ipkg/ipkg_0.99.163.bb
@@ -1,9 +1,10 @@
 include ipkg.inc
-PR = "r5"
+PR = "r6"
 
 S = "${WORKDIR}/ipkg-${PV}"
 
 SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
+	file://ipkg-configure \
 	file://terse.patch;patch=1 \
 	file://is-processing.patch;patch=1 \
 	file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \
diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
index 0310746dfe..56176c1095 100644
--- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
+++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
@@ -1,6 +1,6 @@
 diff -urN linux-2.6.23.orig/drivers/leds/Kconfig linux-2.6.23/drivers/leds/Kconfig
 --- linux-2.6.23.orig/drivers/leds/Kconfig	2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/drivers/leds/Kconfig	2007-11-29 09:02:42.000000000 +0100
++++ linux-2.6.23/drivers/leds/Kconfig	2007-12-03 11:08:06.000000000 +0100
 @@ -101,6 +101,12 @@
  	  outputs. To be useful the particular board must have LEDs
  	  and they must be connected to the GPIO lines.
@@ -16,8 +16,8 @@ diff -urN linux-2.6.23.orig/drivers/leds/Kconfig linux-2.6.23/drivers/leds/Kconf
  config LEDS_TRIGGERS
 diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c
 --- linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c	2007-11-29 09:02:42.000000000 +0100
-@@ -0,0 +1,128 @@
++++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c	2007-12-03 11:08:36.000000000 +0100
+@@ -0,0 +1,127 @@
 +/*
 + * drivers/leds/leds-mpc8313e-rdb.c
 + * Copyright (C) 2007 Leon Woestenberg <leon@sidebranch.com>
@@ -38,18 +38,18 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
 +#include <linux/err.h>
 +#include <asm/io.h>
 +
-+int par_io_config_pin(u8 port, u8 pin, int dir, int open_drain,
-+                      int assignment, int has_irq);
-+int par_io_data_set(u8 port, u8 pin, u8 val);
++#define LEDS_BASE 0xfa000000
++#define LEDS_SIZE 0x2
 +
 +static struct platform_dev *leds_pdev = NULL;
 +static struct resource *led_mem = NULL;
-+static void *p = NULL;
++static void *led_io = NULL;
++static u8 led_state = 0;
 +
 +static void mpc8313leds_green_set(struct led_classdev *led_cdev, enum led_brightness value)
 +{
-+	int d = ioread16(p);
-+	iowrite16(value?d&~1:d|1, p);
++	led_state = value ? led_state&~32 : led_state|32;
++	iowrite8(led_state, led_io);
 +}
 +
 +static struct led_classdev mpc8313_green_led = {
@@ -59,8 +59,8 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
 +
 +static void mpc8313leds_yellow_set(struct led_classdev *led_cdev, enum led_brightness value)
 +{
-+	int d = ioread16(p);
-+	iowrite16(value?d&~2:d|2, p);
++	led_state = value ? led_state&~64 : led_state|64;
++	iowrite8(led_state, led_io);
 +}
 +
 +static struct led_classdev mpc8313_yellow_led = {
@@ -70,8 +70,8 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
 +
 +static void mpc8313leds_red_set(struct led_classdev *led_cdev, enum led_brightness value)
 +{
-+	int d = ioread16(p);
-+	iowrite16(value?d&~4:d|4, p);
++	led_state = value ? led_state&~128 : led_state|128;
++	iowrite8(led_state, led_io);
 +}
 +
 +static struct led_classdev mpc8313_red_led = {
@@ -117,12 +117,11 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
 +
 +static int __init mpc8313leds_init(void)
 +{
-+	led_mem = request_mem_region(0xfa000000, 0x100, "mpc8313-leds");
-+	if (led_mem == NULL) return -ENOMEM;
-+	p = ioremap(0xfa000000, 0x100);
-+	if (p == NULL)
++	if (!(led_mem = request_mem_region(LEDS_BASE, LEDS_SIZE, "mpc8313-leds")))
++		return -ENOMEM;
++	if (!(led_io = ioremap(LEDS_BASE, LEDS_SIZE)))
 +	{
-+		if (led_mem) release_mem_region(0xfa000000, 0x100);
++		release_mem_region(LEDS_BASE, LEDS_SIZE);
 +		led_mem = NULL;
 +		return -ENOMEM;
 +	}
@@ -133,7 +132,7 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
 +
 +static void __exit mpc8313leds_exit(void)
 +{
-+	if (led_mem) release_mem_region(0xfa000000, 0x100);
++	if (led_mem) release_mem_region(LEDS_BASE, LEDS_SIZE);
 +	led_mem = NULL;
 +	platform_driver_unregister(&mpc8313leds_driver);
 +
@@ -148,7 +147,7 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
 +MODULE_LICENSE("GPL");
 diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile
 --- linux-2.6.23.orig/drivers/leds/Makefile	2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/drivers/leds/Makefile	2007-11-29 09:03:09.000000000 +0100
++++ linux-2.6.23/drivers/leds/Makefile	2007-12-03 11:08:06.000000000 +0100
 @@ -17,6 +17,7 @@
  obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o
  obj-$(CONFIG_LEDS_COBALT)		+= leds-cobalt.o
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
new file mode 100644
index 0000000000..b34d4630a0
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb
new file mode 100644
index 0000000000..c483ea26a6
--- /dev/null
+++ b/packages/meta/external-toolchain.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "This package allows OE to work with an external toolchain generated \
+               by meta-toolchain instead of building its own. It expects that toolchain \
+               to be located in SDK_PREFIX/prefix."
+
+PROVIDES = "\
+    linux-libc-headers \
+    virtual/${TARGET_PREFIX}gcc \
+    virtual/${TARGET_PREFIX}gcc-initial \
+    virtual/${TARGET_PREFIX}binutils \
+    virtual/${TARGET_PREFIX}libc-for-gcc \
+    virtual/libc \
+    virtual/libintl \
+    virtual/libiconv \
+    glibc-thread-db \
+    virtual/linux-libc-headers \
+    "
+
+RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+PACKAGES_DYNAMIC = "glibc-gconv-*"
+PR = "r1"
+
+inherit sdk
+
+do_stage() {
+	if [ ! -e  ${prefix}/package-status ]; then
+		echo "The external toolchain could not be found in ${prefix}!"
+		exit 1
+	fi
+	
+	install -d ${STAGING_DIR}/pkgdata/
+	install -d ${STAGING_DIR_TARGET}/shlibs/
+
+	cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
+	cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
+
+	if [ -d ${prefix}/ipk ]; then
+		install -d ${DEPLOY_DIR_IPK}/
+		cp -ar ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/
+	fi
+
+	if [ -d ${prefix}/deb ]; then
+		install -d ${DEPLOY_DIR_DEB}/
+		cp -ar ${prefix}/deb/* ${DEPLOY_DIR_DEB}/
+	fi
+
+	if [ -d ${prefix}/pstage -a "x${DEPLOY_DIR_PSTAGE}" != "x" ]; then
+		install -d ${DEPLOY_DIR_PSTAGE}/
+		cp -ar ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/
+	fi
+}
diff --git a/packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h b/packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h
deleted file mode 100644
index a03d16e57a..0000000000
--- a/packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h
+++ /dev/null
@@ -1,1336 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
-
-#define HAND_IMG_ROWSTRIDE (1016)
-#define HAND_IMG_WIDTH (254)
-#define HAND_IMG_HEIGHT (264)
-#define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\331\333\343\342\377\5\327" \
-  "\340\337\377\314\327\325\377\306\323\320\377\321\333\331\377\332\342" \
-  "\341\377\377\333\343\342\377\206\333\343\342\377\1\276\311\307\377\202" \
-  "g~y\377\357\333\343\342\377\2\253\276\272\377\233\262\255\377\204\223" \
-  "\254\247\377\3\225\255\250\377\240\266\262\377\303\321\316\377\377\333" \
-  "\343\342\377\204\333\343\342\377\1\270\305\303\377\202Slg\377\357\333" \
-  "\343\342\377\11\231\260\254\377\223\254\247\377\243\271\264\377\267\307" \
-  "\304\377\277\316\313\377\256\301\275\377\232\261\255\377\223\254\247" \
-  "\377\271\311\306\377\377\333\343\342\377\204\333\343\342\377\1\270\305" \
-  "\303\377\202Slg\377\357\333\343\342\377\202\231\260\254\377\204\377\377" \
-  "\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\364\333\343" \
-  "\342\377\4\332\342\341\377\316\330\326\377\277\312\310\377\260\275\273" \