8 files changed, 50 insertions, 20 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 81d4c93dc0..61e894882e 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -329,7 +329,8 @@ IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_
 IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
 IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) ${EXTRA_IMAGECMD}"
 IMAGE_CMD_cpio.gz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img"
+IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=rootfs >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg"
+IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
 
 EXTRA_IMAGECMD = ""
 EXTRA_IMAGECMD_jffs2 = ""
@@ -338,6 +339,7 @@ EXTRA_IMAGECMD_squashfs = ""
 EXTRA_IMAGECMD_squashfs-lzma = ""
 EXTRA_IMAGECMD_cpio = ""
 EXTRA_IMAGECMD_cpio.gz = ""
+EXTRA_IMAGECMD_ubi = ""
 EXTRA_IMAGECMD_ubifs = ""
 
 IMAGE_DEPENDS = ""
@@ -350,6 +352,7 @@ IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
 IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
 IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
 IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native"
+IMAGE_DEPENDS_ubi = "mtd-utils-native"
 IMAGE_DEPENDS_ubifs = "mtd-utils-native"
 
 EXTRA_IMAGEDEPENDS = ""
diff --git a/conf/checksums.ini b/conf/checksums.ini
index af5bc3ef8b..17cfe83f13 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5018,13 +5018,9 @@ sha256=2b6b0d1af5b8af63eb5edf7052fdc9f46c55b6f7b607c8772b18927cb481ecf9
 md5=28fb15cd024162c55249888fe1b97820
 sha256=c74239052d62565c13a82f9bbf217a4fdcce4b34949e361b53bb3f28e3168543
 
-[http://projects.gstaedtner.net/euphony/euphony-0.1.1.tar.gz]
-md5=0263344899dfcda7d26183f63d716b00
-sha256=34a398c1c27b22652ceacf29b1b3f33feff33f612802ed0c9b57afc1dce9b27e
-
-[http://projects.gstaedtner.net/euphony/euphony-0.1.2.tar.gz]
-md5=f939fb9a2c7aab5877f7e420827af027
-sha256=fedcf1b669873de67d69d3e81ad88a47414ccfede4a6a73ffa15ab82b1378460
+[http://projects.gstaedtner.net/euphony/euphony-0.1.3.tar.gz]
+md5=47d5663f0c66177e3529b9062f9b071f
+sha256=30f035bc39967f72f3ac8740d78f4d5e611577ea2b90f47f4cd72d6729fd4ce5
 
 [http://enlightenment.freedesktop.org/files/evas-0.9.9.037.tar.gz]
 md5=21cb713b01be39992a7c48d0ea23429b
@@ -13986,6 +13982,10 @@ sha256=5a729a49ce591a58d241ac39979cb496ab30687556633782557196d2b262921e
 md5=eddf56af6f248812e3016a9e34b42bbd
 sha256=5a729a49ce591a58d241ac39979cb496ab30687556633782557196d2b262921e
 
+[http://downloads.sourceforge.net/lmbench/lmbench-2.5.tgz]
+md5=d5b05498af26d5c09b372caab82a0337
+sha256=e7431530a4cf4c44b5068e23454f95765dc0b51e7d98bc2bd70451b17d505bd9
+
 [http://heanet.dl.sourceforge.net/lmbench/lmbench-2.5.tgz]
 md5=d5b05498af26d5c09b372caab82a0337
 sha256=e7431530a4cf4c44b5068e23454f95765dc0b51e7d98bc2bd70451b17d505bd9
@@ -14122,6 +14122,10 @@ sha256=bfc8cf4258574b48d33e9d622627db496e6533a469a6a87fd7ed76098dabb8a6
 md5=afd35e0770f28121a9f8d6093d20a62b
 sha256=bfc8cf4258574b48d33e9d622627db496e6533a469a6a87fd7ed76098dabb8a6
 
+[http://downloads.sourceforge.net/ltp/ltp-full-20080229.tgz]
+md5=5860835de7e8d6f76a856243fd5f299e
+sha256=e4c56dbbbf2d1a4d641624234b561e9402c00e47b5b253ae126aa444182310a4
+
 [http://heanet.dl.sourceforge.net/ltp/ltp-full-20080229.tgz]
 md5=5860835de7e8d6f76a856243fd5f299e
 sha256=e4c56dbbbf2d1a4d641624234b561e9402c00e47b5b253ae126aa444182310a4
@@ -14902,10 +14906,18 @@ sha256=4f65183200955540c097b82bfb18f5d21b636ca79f47cd018a4ea8b89cd2998c
 md5=7d049a8331efcfe34600c0cda6934ac6
 sha256=a145a90d0824c65cfc11c3fc843ba484585983e1e8ee14b79f4d09cf1d38b98b
 
+[http://downloads.sourceforge.net/mingw/mingw32-make-3.81-20080326-src.tar.gz]
+md5=7c21ed475aa72a0fd3115dcc12eaeaa2
+sha256=f05c64eaa334cf6a59aacdfff3213fc53d0b670e79662fb25f029bfb78148bac
+
 [http://downloads.sourceforge.net/mingw/mingwrt-3.15.1-mingw32-src.tar.gz]
 md5=0411b98fd5eeac0706e2abb7122526bb
 sha256=4f4d19f3e15fdf00957932211be609b6bf4e689ad5938ce7bff666a638bde0e7
 
+[http://downloads.sourceforge.net/mingw/mingwrt-3.15.2-mingw32-src.tar.gz]
+md5=7bf0525f158213f3ac990ea68a5ec34d
+sha256=64d7c31354d318ec2085e39e724287c78742a66302fd0b27dab7a3f705d5c54d
+
 [http://www.denx.de/twiki/pub/Know/MiniFOHome/mini_fo-0-6-1-pre1.tar.bz2]
 md5=7e192e01b08023c7f3e63bf1c796bc14
 sha256=68c64a38f0b29347f86871248f0399e7e1b12645dc6263af7b2e4940f1392eaa
@@ -15026,6 +15038,10 @@ sha256=f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850
 md5=75bbd1dc425849e415a60afd9e74d2ff
 sha256=e83b80b4ccd7863223fac4a2d54974a64a79c635d6bdda0c6e7039f966eae9e2
 
+[ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.6.tar.gz]
+md5=3e66f91f8a39c7dc0a67b158aeb9c2ac
+sha256=a1275889c7bb6b3c353d5b9ebb983064e8ef1d29ef8688bd132cec065642d2d9
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mmc-spi.patch]
 md5=329fd64f8ccdb2731c54f6a1b8c6de14
 sha256=27934de6da3f5ac94ed60ba4bfdd3acc2d93b01a2f932b576f87fb4508dcde6e
@@ -16834,6 +16850,10 @@ sha256=31c35db09289c6e0436a258745d7180e0cd8f567949f27b3dab5a57a3664ed2f
 md5=4550a418f0480b39e839735a7e0e8d82
 sha256=fbb5ee21210a4e4e1fe25941c6e16ec0fe8634817e6c96145128f376ba0c640b
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.28.4.gz]
+md5=464f663266e2c18371e213adab3c0077
+sha256=4862e7bf53553f645d9d730d3657bbec79f7c03482a984259b38e10e25b54382
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -23134,6 +23154,10 @@ sha256=c6032ec1753a0f5975b5a7488ca3ca0d46f84bc5dd8fcb42eebd807c7faec765
 md5=c209e54fa8dcd3cd3342e84d261b02db
 sha256=d03eb7e5b47e2f1e1a665700f4e22d15651dc949196b0ec880f0d63cafb6814c
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.0.tar.bz2]
+md5=1dbede8f6393edfe6c1ecab2f754b3b2
+sha256=d70c198cde981c3a53b1c41b717dea4bbf1d397d82957f584c641bb5fd02c82d
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.8.0.tar.bz2]
 md5=a2b9c70a32b0a6436d837d67fa7aae18
 sha256=f0b68171dd4256c927fbee91ecf84fa28c409b5b6b39cbf47eaa48fd73db305f
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index a84faf1234..109fabe3b8 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -3,6 +3,7 @@ SRCREV_pn-dbus-hlid = "${AUTOREV}"
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-devel = "${AUTOREV}"
 SRCREV_pn-fsod = "${AUTOREV}"
+SRCREV-pn-fso-abyss = "${AUTOREV}"
 SRCREV_pn-fso-apm = "${AUTOREV}"
 SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
 SRCREV_pn-fso-gpsd = "${AUTOREV}"
@@ -11,7 +12,9 @@ SRCREV_pn-fso-sounds = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
 SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
+SRCREV_pn-libgsm0710 = "${AUTOREV}"
 SRCREV_pn-mickeydbus = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"
 SRCREV_pn-python-pytrc = "${AUTOREV}"
+SRCREV_pn-qtopia0710muxd = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 433dc0d6e5..3b3669c953 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -56,8 +56,8 @@ PREFERRED_VERSION_aumix ?= "2.8"
 PREFERRED_VERSION_autoconf ?= "2.61"
 PREFERRED_VERSION_autoconf-native ?= "2.61"
 PREFERRED_VERSION_autofs ?= "4.1.4"
-PREFERRED_VERSION_automake ?= "1.9.6"
-PREFERRED_VERSION_automake-native ?= "1.9.6"
+PREFERRED_VERSION_automake ?= "1.10"
+PREFERRED_VERSION_automake-native ?= "1.10"
 PREFERRED_VERSION_avahi ?= "0.6.22"
 PREFERRED_VERSION_avahi-python ?= "0.6.21"
 PREFERRED_VERSION_avahi-ui ?= "0.6.21"
@@ -1042,10 +1042,10 @@ PREFERRED_VERSION_libtinymail ?= "0.0.3"
 PREFERRED_VERSION_libtododb ?= "0.11"
 PREFERRED_VERSION_libtomcrypt ?= "0.97b"
 PREFERRED_VERSION_libtomoe-gtk ?= "0.1.0"
-PREFERRED_VERSION_libtool ?= "1.5.24"
-PREFERRED_VERSION_libtool-cross ?= "1.5.10"
-PREFERRED_VERSION_libtool-native ?= "1.5.10"
-PREFERRED_VERSION_libtool-sdk ?= "1.5.10"
+PREFERRED_VERSION_libtool ?= "2.2.4"
+PREFERRED_VERSION_libtool-cross ?= "2.2.4"
+PREFERRED_VERSION_libtool-native ?= "2.2.4"
+PREFERRED_VERSION_libtool-sdk ?= "2.2.4"
 PREFERRED_VERSION_libungif ?= "4.1.3"
 PREFERRED_VERSION_libupnp ?= "1.3.1"
 PREFERRED_VERSION_liburiparser ?= "0.5.1"
@@ -1539,8 +1539,8 @@ PREFERRED_VERSION_python-pyfits ?= "1.1"
 PREFERRED_VERSION_python-pyflakes ?= "0.2.1"
 PREFERRED_VERSION_python-pygame ?= "1.8.1"
 PREFERRED_VERSION_python-pygnome ?= "2.16.2"
-PREFERRED_VERSION_python-pygobject ?= "2.14.2"
-PREFERRED_VERSION_python-pygobject-native ?= "2.14.2"
+PREFERRED_VERSION_python-pygobject ?= "2.16.0"
+PREFERRED_VERSION_python-pygobject-native ?= "2.16.0"
 PREFERRED_VERSION_python-pygoogle ?= "0.6"
 PREFERRED_VERSION_python-pygtk-1.2 ?= "0.6.12"
 PREFERRED_VERSION_python-pygtk ?= "2.10.4"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
index a81d5eca71..1f6076525f 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
@@ -2,6 +2,6 @@
 
 PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.0"
 PREFERRED_VERSION_libxi ?= "1.2.0"
 PREFERRED_VERSION_inputproto ?= "1.5.0"
-
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e72549e58c..cf879526c7 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -208,7 +208,7 @@ SRCREV_pn-tslib ?= "53"
 SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu ?= "${QEMUSRCREV}"
-SRCREV_pn-qi ?= "ed52486b43dca91891305b9e832c8366a2742798"
+SRCREV_pn-qi ?= "1fc83905fe99da92ff18e6ba671ee339477b1b9e"
 SRCREV_pn-remoko ?= "121"
 SRCREV_pn-remoko-server ?= "121"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index b26df9dfea..6d09406375 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -13,7 +13,7 @@ SERIAL_CONSOLE = "115200 ttySA0"
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
 XSERVER ?= "xserver-kdrive-fbdev"
diff --git a/conf/machine/include/orion.inc b/conf/machine/include/orion.inc
index c6fe6e3678..9e16805bd2 100644
--- a/conf/machine/include/orion.inc
+++ b/conf/machine/include/orion.inc
@@ -10,7 +10,7 @@ USE_DEVFS = "0"
 
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-orion"
-PREFERRED_VERSION_linux-orion = "2.6.27.10"
+PREFERRED_VERSION_linux-orion = "2.6.28.4"
 
 IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 IMAGE_FSTYPES = "tar.gz"