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

28 files changed, 421 insertions, 104 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 6d9458193b..bb29499183 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2762,6 +2762,10 @@ sha256=cf3957b4548df051cd0971d179cb92dc0fcab3839977ddb70aae81c14cd04b03
 md5=d113f2777e4f508faa8b674ece87a37b
 sha256=f2b433270f22aad86f61cef61d95338aaa63dbe2f9468b9ed5defd1c01c9645f
 
+[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-depmod.patch]
+md5=7c9dfb5dcd66a1d6e837e72ad0cb05d4
+sha256=35e3854599a074ce1b47872ab1b97a625ed7d1ab3345b918f7f60524f5e390c5
+
 [http://www.busybox.net/downloads/busybox-1.13.2.tar.gz]
 md5=aeb526108f13b91c02b115c8d86f9659
 sha256=03fc9dbdc6f44afd2da55c0ab36646d2d063708cc35f3f4569b913b064f11d83
@@ -10146,6 +10150,10 @@ sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
 md5=03a0f63b997ce7b83a1eeaa6b80f4388
 sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
 
+[http://jackaudio.org/downloads/jack-audio-connection-kit-0.116.2.tar.gz]
+md5=9c0ae9880e9b6e081f1a238fe6a28bd5
+sha256=ce6e1f61a3b003137af56b749e5ed4274584167c0877ea9ef2d83f47b11c8d3d
+
 [http://downloads.sourceforge.net/jackit/jack-audio-connection-kit-0.99.0.tar.gz]
 md5=a891a699010452258d77e59842ebe4a0
 sha256=2096acc56c314e689faad0036bbc1d86dea1b9d9620f711d471de76b1dd6859e
@@ -11390,6 +11398,14 @@ sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 md5=15de3830b751818a54a42899bd3ae72c
 sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 
+[http://libchamplain.pierlux.com/release/0.2.8/libchamplain-0.2.8.tar.gz]
+md5=fa4a620efa1a1c1036b6701b7d4dafe1
+sha256=01e17811a85e93e5158f5d721b9b1b249db44683735a172fa0debd9759d3175c
+
+[http://libchamplain.pierlux.com/release/0.2.8/libchamplain-gtk-0.2.8.tar.gz]
+md5=c3e62c1912c0dba013c8f3df28fc809d
+sha256=03d751bd836174e2d6766d8036fc72e130dd090b13256d40a58ba6ab659475ef
+
 [http://gpephone.linuxtogo.org/download/gpephone/libchenabler-0.1/libchenabler-0.1.tar.gz]
 md5=866fd13611a8de946428db1df9be8468
 sha256=74def55ba6a61e966e0873a4081fd3dd65089b94b837810d3bc056221d7e41c7
@@ -21918,6 +21934,10 @@ sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345
 md5=c990186db06cf188cb267d12bc21e2da
 sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345
 
+[http://downloads.sourceforge.net/witty/wt-2.2.3.tar.gz]
+md5=2f4c34f1e092451d3c4d2e7f8c250015
+sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3
+
 [http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz]
 md5=b6319d5e75611fe2210453b5feb82c0c
 sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
@@ -25162,7 +25182,3 @@ sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 md5=5f7b88ebb2bcd7e8044328482d079661
 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 
-[http://jackaudio.org/downloads/jack-audio-connection-kit-0.116.2.tar.gz]
-md5=9c0ae9880e9b6e081f1a238fe6a28bd5
-sha256=ce6e1f61a3b003137af56b749e5ed4274584167c0877ea9ef2d83f47b11c8d3d 
-
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index dd584b3106..c51684d0e6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -22,6 +22,9 @@ SRCREV_pn-bootchart-lite ?= "4"
 SRCREV_pn-clutter-box2d ?= "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
 SRCREV_pn-clutter-gst ?= "3188"
+SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a"
+SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
+SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e"
 SRCREV_pn-clutter ?= "3240"
 SRCREV_pn-comic-reader ?= "54"
 SRCREV_pn-connman ?= "103706c4f4da0c89f8b6f33cccdc3149f4ecc09a"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 92651f60f1..b26df9dfea 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,18 +3,29 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
-
-MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
 require conf/machine/include/tune-strongarm.inc
 
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+MACHINE_KERNEL_VERSION = "2.6"
+KERNEL_IMAGE_MAXSIZE = "1048576"
+KERNEL_IMAGETYPE = "zImage"
+SERIAL_CONSOLE = "115200 ttySA0"
+
+ROOT_FLASH_SIZE = "14"
+# actually 14680064, see EXTRA_IMAGECMD
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+XSERVER ?= "xserver-kdrive-fbdev"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
 IMAGE_LINGUAS ?= ""
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-ROOT_FLASH_SIZE = "14"
-# actually 14680064, see EXTRA_IMAGECMD above
+PCMCIA_MANAGER ?= "pcmciautils"
 
-XSERVER ?= "xserver-kdrive-fbdev"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
+
+require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index 0a9f209fe2..c8656bb117 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -13,3 +13,4 @@ RDEPENDS_kernel-base = "kernel-image"
 # we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
 DONT_CHECK_KERNELSIZE ?= "1"
 
+MACHINE_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 8fb36f78be..aeba16b67c 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -2,7 +2,6 @@
 # Additionally, clamshell specific stuff in zaurus-clamshell.inc
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS_collie = ""
 
 MACHINE_KERNEL_VERSION = "2.6"
 
@@ -10,14 +9,11 @@ ERASEBLOCKSIZE = "0x4000"
 ERASEBLOCKSIZE_akita = "0x20000"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
-IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
-ZAURUS-UPDATER_collie = ""
 ZAURUS-UPDATER = "zaurus-updater"
 EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
 
 SERIAL_CONSOLE = "115200 ttyS0"
-SERIAL_CONSOLE_collie = "115200 ttySA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
@@ -35,16 +31,11 @@ MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-px
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
-MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
-	kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi \
-	kernel-module-power"
 
 GUI_MACHINE_CLASS = "bigscreen"
-GUI_MACHINE_CLASS_collie = "smallscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
 
 KERNEL_IMAGE_MAXSIZE = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
 
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
 
@@ -69,10 +60,8 @@ zaurus_make_installkit () {
         [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
     fi
 
-    # All zaurus machines except collie need updater.sh
-    if [ "${MACHINE}" != "collie" ]; then
-        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
-    fi
+    cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/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
diff --git a/packages/boost/boost-36.inc b/packages/boost/boost-36.inc
index 0ad71ca9d6..5ab187d89d 100644
--- a/packages/boost/boost-36.inc
+++ b/packages/boost/boost-36.inc
@@ -9,7 +9,7 @@ SECTION = "libs"
 DEPENDS = "boost-jam-native zlib"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
-PR = "r1"
+PR = "r2"
 
 BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
 BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
@@ -70,6 +70,9 @@ FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
 PACKAGES += "${PN}"
 RRECOMMENDS_${PN} += "${BOOST_PACKAGES}"
 
+# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works
+TARGET_CC_ARCH += " ${LDFLAGS}" 
+
 # Oh yippee, a new build system, it's sooo cooool I could eat my own
 # foot.  inlining=on lets the compiler choose, I think.  At least this
 # stuff is documented...
diff --git a/packages/boost/boost_1.36.0.bb b/packages/boost/boost_1.36.0.bb
index 77d99e4fda..76c8322fb9 100644
--- a/packages/boost/boost_1.36.0.bb
+++ b/packages/boost/boost_1.36.0.bb
@@ -1,8 +1,6 @@
 include boost-36.inc
 
-DEFAULT_PREFERENCE = "-1"
-
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
            file://arm-intrinsics.patch;patch=1 \
diff --git a/packages/busybox/busybox-1.13.2/angstrom/defconfig b/packages/busybox/busybox-1.13.2/angstrom/defconfig
index 203acfd20b..0db650fcf1 100644
--- a/packages/busybox/busybox-1.13.2/angstrom/defconfig
+++ b/packages/busybox/busybox-1.13.2/angstrom/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.13.2
-# Fri Jan 23 17:02:44 2009
+# Sun Feb  8 17:22:39 2009
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -19,7 +19,7 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
+CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 # CONFIG_FEATURE_INSTALLER is not set
 CONFIG_LOCALE_SUPPORT=y
@@ -82,7 +82,7 @@ CONFIG_FEATURE_FAST_TOP=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_HISTORY=64
 CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 CONFIG_FEATURE_USERNAME_COMPLETION=y
@@ -124,7 +124,7 @@ CONFIG_FEATURE_TAR_FROM=y
 CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
 # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
 CONFIG_FEATURE_TAR_UNAME_GNAME=y
 # CONFIG_UNCOMPRESS is not set
 # CONFIG_UNLZMA is not set
@@ -152,7 +152,7 @@ CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
 # CONFIG_FEATURE_DD_IBS_OBS is not set
 CONFIG_DF=y
-# CONFIG_FEATURE_DF_FANCY is not set
+CONFIG_FEATURE_DF_FANCY=y
 CONFIG_DIRNAME=y
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
@@ -169,7 +169,7 @@ CONFIG_EXPR=y
 CONFIG_FALSE=y
 # CONFIG_FOLD is not set
 CONFIG_HEAD=y
-# CONFIG_FEATURE_FANCY_HEAD is not set
+CONFIG_FEATURE_FANCY_HEAD=y
 # CONFIG_HOSTID is not set
 CONFIG_ID=y
 # CONFIG_INSTALL is not set
@@ -192,8 +192,8 @@ CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
 CONFIG_MKFIFO=y
 CONFIG_MKNOD=y
 CONFIG_MV=y
-# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
-# CONFIG_NICE is not set
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
 CONFIG_NOHUP=y
 CONFIG_OD=y
 # CONFIG_PRINTENV is not set
@@ -204,7 +204,7 @@ CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_REALPATH=y
 CONFIG_RM=y
 CONFIG_RMDIR=y
-# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
 CONFIG_SEQ=y
 # CONFIG_SHA1SUM is not set
 CONFIG_SLEEP=y
@@ -223,7 +223,7 @@ CONFIG_SYNC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
 CONFIG_TEE=y
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
 CONFIG_TEST=y
 # CONFIG_FEATURE_TEST_64 is not set
 CONFIG_TOUCH=y
@@ -341,7 +341,7 @@ CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_XDEV=y
 CONFIG_FEATURE_FIND_MAXDEPTH=y
 CONFIG_FEATURE_FIND_NEWER=y
-# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_INUM=y
 CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_FEATURE_FIND_USER=y
 CONFIG_FEATURE_FIND_GROUP=y
@@ -350,7 +350,7 @@ CONFIG_FEATURE_FIND_DEPTH=y
 CONFIG_FEATURE_FIND_PAREN=y
 CONFIG_FEATURE_FIND_SIZE=y
 CONFIG_FEATURE_FIND_PRUNE=y
-# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_DELETE=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -361,8 +361,8 @@ CONFIG_FEATURE_GREP_CONTEXT=y
 CONFIG_XARGS=y
 # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
 CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 
 #
 # Init Utilities
@@ -430,7 +430,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 CONFIG_INSMOD=y
 CONFIG_RMMOD=y
 CONFIG_LSMOD=y
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 CONFIG_MODPROBE=y
 CONFIG_FEATURE_MODPROBE_BLACKLIST=y
 # CONFIG_DEPMOD is not set
@@ -468,7 +468,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
 CONFIG_FEATURE_OSF_LABEL=y
 CONFIG_FEATURE_FDISK_ADVANCED=y
 # CONFIG_FINDFS is not set
-# CONFIG_FREERAMDISK is not set
+CONFIG_FREERAMDISK=y
 CONFIG_FSCK_MINIX=y
 CONFIG_MKFS_MINIX=y
 
@@ -515,7 +515,7 @@ CONFIG_VOLUMEID=y
 # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 CONFIG_MOUNT=y
 # CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+CONFIG_FEATURE_MOUNT_VERBOSE=y
 CONFIG_FEATURE_MOUNT_HELPERS=y
 CONFIG_FEATURE_MOUNT_LABEL=y
 CONFIG_FEATURE_MOUNT_NFS=y
@@ -526,7 +526,7 @@ CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
 CONFIG_RDEV=y
 CONFIG_READPROFILE=y
-# CONFIG_RTCWAKE is not set
+CONFIG_RTCWAKE=y
 # CONFIG_SCRIPT is not set
 # CONFIG_SETARCH is not set
 CONFIG_SWAPONOFF=y
@@ -569,10 +569,10 @@ CONFIG_FEATURE_DC_LIBM=y
 # CONFIG_DEVMEM is not set
 # CONFIG_EJECT is not set
 # CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
+CONFIG_FBSPLASH=y
 # CONFIG_INOTIFYD is not set
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_SMALL is not set
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
 # CONFIG_FEATURE_LAST_FANCY is not set
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
@@ -594,7 +594,7 @@ CONFIG_MAKEDEVS=y
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 CONFIG_FEATURE_MAKEDEVS_TABLE=y
 # CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
+CONFIG_MICROCOM=y
 # CONFIG_MOUNTPOINT is not set
 # CONFIG_MT is not set
 # CONFIG_RAIDAUTORUN is not set
@@ -627,26 +627,26 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 # CONFIG_FTPPUT is not set
 # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
 CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_RANGES=y
+CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
+CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y
+CONFIG_FEATURE_HTTPD_SETUID=y
+CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
+CONFIG_FEATURE_HTTPD_AUTH_MD5=y
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y
+CONFIG_FEATURE_HTTPD_CGI=y
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
+CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
+CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
+CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
+CONFIG_FEATURE_HTTPD_PROXY=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
 # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
 CONFIG_FEATURE_IFCONFIG_HW=y
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
 # CONFIG_IFENSLAVE is not set
 CONFIG_IFUPDOWN=y
 CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
@@ -686,8 +686,8 @@ CONFIG_NC=y
 CONFIG_NC_SERVER=y
 CONFIG_NC_EXTRA=y
 CONFIG_NETSTAT=y
-# CONFIG_FEATURE_NETSTAT_WIDE is not set
-# CONFIG_FEATURE_NETSTAT_PRG is not set
+CONFIG_FEATURE_NETSTAT_WIDE=y
+CONFIG_FEATURE_NETSTAT_PRG=y
 CONFIG_NSLOOKUP=y
 CONFIG_PING=y
 CONFIG_PING6=y
@@ -708,10 +708,10 @@ CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_TFTP_DEBUG is not set
 CONFIG_TRACEROUTE=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
+CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
 CONFIG_APP_UDHCPD=y
-# CONFIG_APP_DHCPRELAY is not set
+CONFIG_APP_DHCPRELAY=y
 CONFIG_APP_DUMPLEASES=y
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
 CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
@@ -831,12 +831,12 @@ CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
 CONFIG_ASH_GETOPTS=y
-# CONFIG_ASH_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_ECHO=y
 CONFIG_ASH_BUILTIN_PRINTF=y
 CONFIG_ASH_BUILTIN_TEST=y
 # CONFIG_ASH_CMDCMD is not set
 # CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_ASH_RANDOM_SUPPORT is not set
 CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_HUSH is not set
diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb
index 3d7f9fc59d..5ae76b900d 100644
--- a/packages/busybox/busybox_1.13.2.bb
+++ b/packages/busybox/busybox_1.13.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
diff --git a/packages/clutter/clutter-gtk-0.6_git.bb b/packages/clutter/clutter-gtk-0.6_git.bb
new file mode 100644
index 0000000000..89f2592bfc
--- /dev/null
+++ b/packages/clutter/clutter-gtk-0.6_git.bb
@@ -0,0 +1,9 @@
+require clutter-gtk.inc
+
+PV = "0.6.0+git${SRCREV}"
+
+DEPENDS += "clutter-0.6"
+
+SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-6"
+
+S = "${WORKDIR}/git"
diff --git a/packages/clutter/clutter-gtk-0.8_git.bb b/packages/clutter/clutter-gtk-0.8_git.bb
new file mode 100644
index 0000000000..3fb0cff8aa
--- /dev/null
+++ b/packages/clutter/clutter-gtk-0.8_git.bb
@@ -0,0 +1,9 @@
+require clutter-gtk.inc
+
+PV = "0.8.0+git${SRCREV}"
+
+DEPENDS += "clutter"
+
+SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-8"
+
+S = "${WORKDIR}/git"
diff --git a/packages/clutter/clutter-gtk.inc b/packages/clutter/clutter-gtk.inc
new file mode 100644
index 0000000000..bbecee548c
--- /dev/null
+++ b/packages/clutter/clutter-gtk.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "Clutter GTK+"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPL"
+
+DEPENDS = "gtk+"
+
+FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
+
+PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage"
+
+inherit autotools_stage pkgconfig gtk-doc
+
diff --git a/packages/clutter/clutter-gtk_git.bb b/packages/clutter/clutter-gtk_git.bb
new file mode 100644
index 0000000000..a3e3767f90
--- /dev/null
+++ b/packages/clutter/clutter-gtk_git.bb
@@ -0,0 +1,10 @@
+require clutter-gst.inc
+
+PV = "0.9.0+git${SRCREV}"
+PR = "r0"
+
+SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "clutter"
diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc
index e91ddaa40e..97a45ac8dc 100644
--- a/packages/eglibc/eglibc.inc
+++ b/packages/eglibc/eglibc.inc
@@ -18,4 +18,6 @@ LEAD_SONAME = "libc.so"
 GLIBC_EXTRA_OECONF ?= ""
 INHIBIT_DEFAULT_DEPS = "1"
 
+ARM_INSTRUCTION_SET = "arm"
+
 PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
diff --git a/packages/eglibc/eglibc_2.9.bb b/packages/eglibc/eglibc_2.9.bb
index 7643bb3f6b..7a71fcd646 100644
--- a/packages/eglibc/eglibc_2.9.bb
+++ b/packages/eglibc/eglibc_2.9.bb
@@ -4,7 +4,7 @@ DEPENDS += "gperf-native"
 DEFAULT_PREFERENCE = "1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.9"
-PR = "r2"
+PR = "r3"
 SVN_REV="7430"
 EGLIBC_BRANCH="eglibc-2_9"
 SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \
diff --git a/packages/gnome/libchamplain-gtk_0.2.8.bb b/packages/gnome/libchamplain-gtk_0.2.8.bb
new file mode 100644
index 0000000000..b72685a786
--- /dev/null
+++ b/packages/gnome/libchamplain-gtk_0.2.8.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Libchamplain is a C library aimed to provide a Gtk+ widget to display rasterized maps. "
+LICENSE = "LGPL"
+DEPENDS = "libchamplain clutter-gtk-0.8"
+
+inherit gnome autotools_stage
+
+SRC_URI = "http://libchamplain.pierlux.com/release/${PV}/libchamplain-gtk-${PV}.tar.gz"
+
+
diff --git a/packages/gnome/libchamplain_0.2.8.bb b/packages/gnome/libchamplain_0.2.8.bb
new file mode 100644
index 0000000000..9418a4d3e0
--- /dev/null
+++ b/packages/gnome/libchamplain_0.2.8.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Libchamplain is a C library aimed to provide a Gtk+ widget to display rasterized maps. "
+LICENSE = "LGPL"
+DEPENDS = "clutter-cairo libsoup-2.4 clutter gtk+"
+
+inherit gnome autotools_stage
+
+SRC_URI = "http://libchamplain.pierlux.com/release/${PV}/libchamplain-${PV}.tar.gz"
+
+FILES_${PN} += "${datadir}/champlain/error.svg"
+
diff --git a/packages/kexecboot/kexecboot-cfg_0.1.bb b/packages/kexecboot/kexecboot-cfg_0.1.bb
new file mode 100644
index 0000000000..394e531760
--- /dev/null
+++ b/packages/kexecboot/kexecboot-cfg_0.1.bb
@@ -0,0 +1,25 @@
+LICENSE = "GPL"
+SECTION = "base"
+DESCRIPTION = "Configuration file for kexecboot"
+
+PR = "r1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
+CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd"
+CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd"
+
+CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
+
+CMDLINE_MEM_collie = "mem=${mem}M"
+
+CMDLINE_ROTATE_spitz = "fbcon=rotate:1"
+CMDLINE_ROTATE_akita = "fbcon=rotate:1"
+CMDLINE_ROTATE_collie = "fbcon=rotate:1"
+CMDLINE_ROTATE_poodle = "fbcon=rotate:1"
+FILES_${PN} += "/boot/*"
+
+do_install () {
+	install -d ${D}/boot
+	echo "${CMDLINE_CON} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"> ${D}/boot/kernel-cmdline
+}
diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc
index cb2e85e49a..e2af859069 100644
--- a/packages/linux/linux-rp.inc
+++ b/packages/linux/linux-rp.inc
@@ -68,24 +68,6 @@ module_autoload_collie-ts_collie = "collie-ts"
 module_autoload_leds-locomo_collie = "leds-locomo"
 module_autoload_power_collie = "power"
 
-
-#package kernel cmdline
-PACKAGES_append += "kernel-cmdline"
-FILES_kernel-cmdline = "/boot/kernel-cmdline*"
-PKG_kernel-cmdline = "kernel-cmdline-${KERNEL_VERSION}"
-RRECOMMENDS_kernel-base += "kernel-cmdline"
-
-pkg_postinst_kernel-cmdline () {
-	cd /boot; update-alternatives --install /boot/kernel-cmdline kernel-cmdline kernel-cmdline-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
-}
-
-pkg_postrm_kernel-cmdline () {
-	cd /boot; update-alternatives --remove kernel-cmdline kernel-cmdline-${KERNEL_VERSION} || true
-}
-do_install_append () {
-	echo "${CMDLINE_CON} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"> "${D}/boot/kernel-cmdline-${KERNEL_VERSION}"
-}
-
 do_configure() {
 	rm -f ${S}/.config
 
@@ -165,10 +147,6 @@ do_configure() {
 
 	yes '' | oe_runmake oldconfig
 }
-#collie dosn't need to deploy kernel. The kernel is in the rootfs and
-# linux-kexecboot kernel is flashed
-do_deploy_collie() {
-}
 
 # wlan-ng stuff need compiled kernel sources
 do_rm_work() {
diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb
index ebc969f1bf..2293eea80e 100644
--- a/packages/linux/linux-rp_2.6.23.bb
+++ b/packages/linux/linux-rp_2.6.23.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r34"
+PR = "r35"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
diff --git a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
index 3f9eac86a5..1ce1e01c78 100644
--- a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
+++ b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r5"
+PR = "r6"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "1"
diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb
index 524405cfd9..406d95d2d0 100644
--- a/packages/linux/linux-rp_2.6.26.bb
+++ b/packages/linux/linux-rp_2.6.26.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r7"
+PR = "r8"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "-1"
diff --git a/packages/ogre/files/ogre-egl-update.diff b/packages/ogre/files/ogre-egl-update.diff
new file mode 100644
index 0000000000..9173715ee3
--- /dev/null
+++ b/packages/ogre/files/ogre-egl-update.diff
@@ -0,0 +1,165 @@
+Index: RenderSystems/GLES/include/OgreGLESSupport.h
+===================================================================
+--- RenderSystems/GLES/include/OgreGLESSupport.h	(revision 8310)
++++ RenderSystems/GLES/include/OgreGLESSupport.h	(working copy)
+@@ -80,6 +80,11 @@
+             virtual void initialiseExtensions();
+             virtual bool checkExtension(const String& ext) const;
+ 
++            virtual unsigned int getDisplayMonitorCount() const
++            {
++                return 1;
++            }
++            
+             virtual void start() = 0;
+             virtual void stop() = 0;
+ 
+Index: RenderSystems/GLES/include/OgreGLESRenderSystem.h
+===================================================================
+--- RenderSystems/GLES/include/OgreGLESRenderSystem.h	(revision 8310)
++++ RenderSystems/GLES/include/OgreGLESRenderSystem.h	(working copy)
+@@ -139,9 +139,11 @@
+             void _setTextureBorderColour(size_t stage, const ColourValue& colour);
+             void _setTextureMipmapBias(size_t unit, float bias);
+             void _setTextureMatrix(size_t stage, const Matrix4& xform);
+-            void _setSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor);
+-            void _setSeparateSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor, SceneBlendFactor sourceFactorAlpha, SceneBlendFactor destFactorAlpha);
+-            void _setAlphaRejectSettings(CompareFunction func, unsigned char value);
++            void _setSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor, SceneBlendOperation op );
++            void _setSeparateSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor, SceneBlendFactor sourceFactorAlpha, SceneBlendFactor destFactorAlpha, SceneBlendOperation op, SceneBlendOperation alphaOp );
++            void _setSceneBlendingOperation(SceneBlendOperation op);
++            void _setSeparateSceneBlendingOperation(SceneBlendOperation op, SceneBlendOperation alphaOp);
++            void _setAlphaRejectSettings(CompareFunction func, unsigned char value, bool alphaToCoverage);
+             void _setViewport(Viewport *vp);
+             void _beginFrame(void);
+             void _endFrame(void);
+@@ -195,6 +197,7 @@
+ 
+             GLESContext* _getMainContext() { return mMainContext; }
+             void _unregisterContext(GLESContext *context);
++            unsigned int getDisplayMonitorCount() const;
+             void _switchContext(GLESContext *context);
+             void _oneTimeContextInitialization();
+             void initialiseContext(RenderWindow* primary);
+Index: RenderSystems/GLES/include/OgreGLESDefaultHardwareBufferManager.h
+===================================================================
+--- RenderSystems/GLES/include/OgreGLESDefaultHardwareBufferManager.h	(revision 8310)
++++ RenderSystems/GLES/include/OgreGLESDefaultHardwareBufferManager.h	(working copy)
+@@ -110,6 +110,8 @@
+             HardwareIndexBufferSharedPtr
+                 createIndexBuffer(HardwareIndexBuffer::IndexType itype, size_t numIndexes,
+                     HardwareBuffer::Usage usage, bool useShadowBuffer = false);
++            // Create a render to vertex buffer
++            RenderToVertexBufferSharedPtr createRenderToVertexBuffer();
+     };
+ }
+ 
+Index: RenderSystems/GLES/src/OgreGLESRenderSystem.cpp
+===================================================================
+--- RenderSystems/GLES/src/OgreGLESRenderSystem.cpp	(revision 8310)
++++ RenderSystems/GLES/src/OgreGLESRenderSystem.cpp	(working copy)
+@@ -1182,7 +1182,8 @@
+         return GL_ONE;
+     }
+ 
+-    void GLESRenderSystem::_setSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor)
++
++    void GLESRenderSystem::_setSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor, SceneBlendOperation op )
+     {
+         GLint sourceBlend = getBlendMode(sourceFactor);
+         GLint destBlend = getBlendMode(destFactor);
+@@ -1199,17 +1200,19 @@
+             GL_CHECK_ERROR;
+         }
+     }
+-
+-    void GLESRenderSystem::_setSeparateSceneBlending(SceneBlendFactor sourceFactor,
+-                                                   SceneBlendFactor destFactor,
+-                                                   SceneBlendFactor sourceFactorAlpha,
+-                                                   SceneBlendFactor destFactorAlpha)
++    
++    void GLESRenderSystem::_setSeparateSceneBlending(
++        SceneBlendFactor sourceFactor, SceneBlendFactor destFactor, 
++        SceneBlendFactor sourceFactorAlpha, SceneBlendFactor destFactorAlpha,
++        SceneBlendOperation op, SceneBlendOperation alphaOp )
+     {
+         // Not supported
+     }
+ 
+-    void GLESRenderSystem::_setAlphaRejectSettings(CompareFunction func, unsigned char value)
++    void GLESRenderSystem::_setAlphaRejectSettings(CompareFunction func, unsigned char value, bool alphaToCoverage)
+     {
++        bool a2c = false;
++        static bool lasta2c = false;
+         if (func == CMPF_ALWAYS_PASS)
+         {
+             glDisable(GL_ALPHA_TEST);
+@@ -1222,6 +1225,15 @@
+             glAlphaFunc(convertCompareFunction(func), value / 255.0f);
+             GL_CHECK_ERROR;
+         }
++        if (a2c != lasta2c && getCapabilities()->hasCapability(RSC_ALPHA_TO_COVERAGE))
++        {
++            if (a2c)
++                glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE);
++            else
++                glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE);
++
++            lasta2c = a2c;
++        } 
+     }
+ 
+     void GLESRenderSystem::_setViewport(Viewport *vp)
+@@ -2084,7 +2096,12 @@
+     {
+         // Not implemented
+     }
+-
++    
++    unsigned int GLESRenderSystem::getDisplayMonitorCount() const
++    {
++        return mGLSupport->getDisplayMonitorCount();
++    }
++    
+     void GLESRenderSystem::setClipPlanesImpl(const Ogre::PlaneList& clipPlanes)
+     {
+         // A note on GL user clipping:
+Index: RenderSystems/GLES/src/OgreGLESDefaultHardwareBufferManager.cpp
+===================================================================
+--- RenderSystems/GLES/src/OgreGLESDefaultHardwareBufferManager.cpp	(revision 8310)
++++ RenderSystems/GLES/src/OgreGLESDefaultHardwareBufferManager.cpp	(working copy)
+@@ -164,4 +164,12 @@
+         return HardwareIndexBufferSharedPtr(
+             new GLESDefaultHardwareIndexBuffer(itype, numIndexes, usage));
+     }
++
++    RenderToVertexBufferSharedPtr 
++        GLESDefaultHardwareBufferManager::createRenderToVertexBuffer()
++    {
++        OGRE_EXCEPT(Exception::ERR_RENDERINGAPI_ERROR, 
++                "Cannot create RenderToVertexBuffer in GLESDefaultHardwareBufferManager", 
++                "GLESDefaultHardwareBufferManager::createRenderToVertexBuffer");
++    }
+ }
+Index: RenderSystems/GLES/src/EGL/OgreEGLWindow.cpp
+===================================================================
+--- RenderSystems/GLES/src/EGL/OgreEGLWindow.cpp	(revision 8310)
++++ RenderSystems/GLES/src/EGL/OgreEGLWindow.cpp	(working copy)
+@@ -182,7 +182,7 @@
+ 
+             if ((opt = miscParams->find("parentWindowHandle")) != end)
+             {
+-                std::vector<String> tokens = StringUtil::split(opt->second, " :");
++                StringVector tokens = StringUtil::split(opt->second, " :");
+ 
+                 if (tokens.size() == 3)
+                 {
+@@ -197,7 +197,7 @@
+             }
+             else if ((opt = miscParams->find("externalWindowHandle")) != end)
+             {
+-                std::vector<String> tokens = StringUtil::split(opt->second, " :");
++                StringVector tokens = StringUtil::split(opt->second, " :");
+ 
+                 LogManager::getSingleton().logMessage(
+                                                       "EGLWindow::create: The externalWindowHandle parameter is deprecated.\n"
diff --git a/packages/ogre/ogre-egl_svn.bb b/packages/ogre/ogre-egl_svn.bb
new file mode 100644
index 0000000000..8cecf56a7d
--- /dev/null
+++ b/packages/ogre/ogre-egl_svn.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, flexible 3D engine "
+LICENSE = "LGPL"
+DEPENDS = "zziplib boost freeimage freetype virtual/libx11 virtual/egl"
+
+SRCREV = "8310"
+PV = "1.6.1+svnr${SRCREV}"
+
+SRC_URI = "svn://ogre.svn.sourceforge.net/svnroot/ogre;module=trunk;proto=https \
+           file://ogre-egl-update.diff;patch=1;pnum=0 \
+          "
+
+inherit autotools_stage
+
+# This is the EGL version
+EXTRA_OECONF = " --with-allocator=std --enable-threading=no --disable-cg --enable-gles "
+
+S = "${WORKDIR}/trunk"
+
+
+EXTRA_OEMAKE = " ZZIPLIB_CFLAGS=\"${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DOGRE_CONFIG_LITTLE_ENDIAN', '-DOGRE_CONFIG_BIG_ENDIAN', d)}\" "
+
+do_configure_prepend() {
+	sed -i -e /OGRE_DETECT_ENDIAN/d ${S}/configure.in
+}
+
+FILES_${PN}-dbg += "${libdir}/OGRE/.debug"
+FILES_${PN}-dev += "${libdir}/OGRE/*.la"
+FILES_${PN} += "${libdir}/OGRE/*.so"
+
diff --git a/packages/powervr-drivers/libgles-omap3.inc b/packages/powervr-drivers/libgles-omap3.inc
index af314293e5..36c2b6e9dd 100644
--- a/packages/powervr-drivers/libgles-omap3.inc
+++ b/packages/powervr-drivers/libgles-omap3.inc
@@ -1,6 +1,8 @@
 DESCRIPTION = "libGLES for the omap3"
 LICENCE = "proprietary-binary"
 
+PROVIDES += "virtual/egl"
+
 # Put "OMAP35x_Graphics_SDK_setuplinux_3_00_00_05.bin" in the same directory as this recipe
 SRC_URI = "file://OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \
            file://rc.pvr \
@@ -66,6 +68,10 @@ do_install () {
 	
 	install -d ${D}${sysconfdir}/init.d/
 	cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-init
+
+	install -d ${D}${sysconfdir}
+	echo "[default]" > ${D}${sysconfdir}/powervr.ini
+	echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so" >> ${D}${sysconfdir}/powervr.ini
 }
 
 do_stage () {
diff --git a/packages/slugos-init/files/sysconf b/packages/slugos-init/files/sysconf
index 3059a466da..8d59d5d6f3 100644
--- a/packages/slugos-init/files/sysconf
+++ b/packages/slugos-init/files/sysconf
@@ -381,7 +381,7 @@ sysconf_restore_conffiles(){
 			else
 				echo "sysconf_restore_conffiles: $file: timestamp copy failed (ignored)" >&2
 			fi
-		elif test -h "$saved/file" -o -h "$ffsdir/$file"
+		elif test -h "$saved/$file" -o -h "$ffsdir/$file"
 		then
 			# new or old symbolic link
 			if test -h "$saved/$file" -a -h "$ffsdir/$file" &&
@@ -396,7 +396,7 @@ sysconf_restore_conffiles(){
 					echo "$file"
 					echo "$file" >&3;;
 				diff)	# need user input
-					if sysconf_verify_link "$file" <>/dev/tty >&0 2>&0
+					if sysconf_verify_link "$file" </dev/tty >/dev/tty 2>&1
 					then
 						echo "$file"
 						echo "$file" >&3
@@ -420,7 +420,7 @@ sysconf_restore_conffiles(){
 					echo "$file"
 					echo "$file" >&3;;
 				diff)	# the files are different, get user input
-					if sysconf_verify "$file" <>/dev/tty >&0 2>&0
+					if sysconf_verify "$file" </dev/tty >/dev/tty 2>&1
 					then
 						echo "$file"
 						echo "$file" >&3
@@ -456,7 +456,7 @@ sysconf_test_restore(){
 		elif test "$file" = "etc/.configured"
 		then
 			: # special handling
-		elif test -h "$saved/file" -o -h "$ffsdir/$file"
+		elif test -h "$saved/$file" -o -h "$ffsdir/$file"
 		then
 			# new or old symbolic link
 			if test -h "$saved/$file" -a -h "$ffsdir/$file" &&
diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb
index e7a45a94aa..7d4769d6e9 100644
--- a/packages/slugos-init/slugos-init_5.0.bb
+++ b/packages/slugos-init/slugos-init_5.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
diff --git a/packages/wt/wt_2.2.3.bb b/packages/wt/wt_2.2.3.bb
new file mode 100644
index 0000000000..ec0f3cc302
--- /dev/null
+++ b/packages/wt/wt_2.2.3.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "A C++ Web Toolkit"
+PRIORITY = "optional"
+SECTION = "devel"
+LICENSE = "GPL"
+DEPENDS = "boost zlib openssl"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \
+	file://cmakelist.patch;patch=1"
+
+FILES_${PN} += "${datadir}/Wt"
+FILES_${PN}-dev += "${datadir}/cmake-2.*"
+
+inherit cmake
+
+STAGE_TEMP = "${WORKDIR}/temp-staging"
+
+do_configure_append() {
+	${BUILD_CXX} ${BUILD_CXXFLAGS} -o src/filetostring src/web/skeleton/FileToString.C
+}
+
+do_stage() {
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	oe_runmake DESTDIR="${STAGE_TEMP}" install
+	cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+	cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+	cp -pPR ${STAGE_TEMP}/${datadir}/cmake-2.* ${STAGING_DATADIR}
+	rm -rf ${STAGE_TEMP}
+}
+