merge of '49fb48a813e1e0d599f74dd7a809922ab71939b1'

     and '6fe2cd0b60b675a1e3118d25934adb4693f3b8ed'

82 files changed, 4199 insertions, 4944 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/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index ead957f1ba..67be27eae3 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -60,7 +60,7 @@ 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-hh18"
+PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh19"
 PREFERRED_VERSION_linux-ixp4xx                      ?= "2.6.21.6+svnr${SRCREV}"
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
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/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index a24752fe89..509fe59469 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/<