8 files changed, 31 insertions, 5 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index a936259fe6..c3e4b41b97 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1506,7 +1506,7 @@ PREFERRED_VERSION_python24-sip ?= "4.1.1"
 PREFERRED_VERSION_python ?= "2.5.2"
 PREFERRED_VERSION_python-ao ?= "0.82"
 PREFERRED_VERSION_python-constraint ?= "1.1"
-PREFERRED_VERSION_python-dbus ?= "0.82.4"
+PREFERRED_VERSION_python-dbus ?= "0.83.0"
 PREFERRED_VERSION_python-fam ?= "1.1.1"
 PREFERRED_VERSION_python-fnorb ?= "1.3"
 PREFERRED_VERSION_python-fpconst ?= "0.6.0"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 612baa8756..c63a202629 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE ?= "20080727"
+EFL_SRCDATE ?= "20080802"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8e48ba407b..d8c3686b64 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -37,7 +37,7 @@ SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "f4e22aeeeeab16eee5f13151f184da4f899d7ff1"
+SRCREV_pn-frameworkd ?= "5b0878b69037b68e64f4048a51003416c9b1261b"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
@@ -171,7 +171,7 @@ SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
-SRCREV_pn-webkit-gtk ?= "35062"
+SRCREV_pn-webkit-gtk ?= "35533"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index d1e19aa3e4..cbd82fa467 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -32,6 +32,8 @@ KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
+PREFERRED_VERSION_u-boot = "git"
+EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
 # and sdio
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/htcpolaris.conf b/conf/machine/htcpolaris.conf
new file mode 100644
index 0000000000..e2fc46889e
--- /dev/null
+++ b/conf/machine/htcpolaris.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: HTC Polaris phone
+#@DESCRIPTION: Machine configuration for HTC Polaris phone
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
+ 
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+ 
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+ 
+TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
+FEED_ARCH = "armv6"
+BASE_PACKAGE_ARCH = "armv6"
+ 
+
+IMAGE_FSTYPES ?= "tar.gz cpio.gz"
+ 
+PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser"
+ 
+MACHINE_FEATURES = "kernel26 touchscreen screen keyboard bluetooth"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 4bea25a0ed..c16707be84 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -19,6 +19,7 @@ SERIAL_CONSOLE_collie = "115200 ttySA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
@@ -80,4 +81,4 @@ zaurus_make_installkit () {
 RDEPENDS_kernel-base = ""
 # collie is an exception. We use mmc as root, include kernel and use another small kernel to boot it.
 RDEPENDS_kernel-base_collie = "kernel-image" 
-KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPE ?= "zImage"
diff --git a/conf/machine/nonworking/.mtn2git_empty b/conf/machine/nonworking/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/nonworking/.mtn2git_empty
diff --git a/conf/machine/db1200.conf b/conf/machine/nonworking/db1200.conf
index cbde602824..cbde602824 100644
--- a/conf/machine/db1200.conf
+++ b/conf/machine/nonworking/db1200.conf