merge of '4ca8a8b2d3b5c23e0df60d228c5549695910a24b'

     and 'ec9b4188f1f043fd13783ea1ed8a13f349a862d8'

5 files changed, 18 insertions, 4 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index cc7b51f3a5..9d5d54bfb8 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -107,7 +107,18 @@ DATETIME = "${DATE}${TIME}"
 
 # python-native should be here but python relies on building 
 # its own in staging
-ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native util-linux-native"
+ASSUME_PROVIDED = "\
+    bc-native \
+    bzip2-native \
+    cvs-native \
+    diffstat-native \
+    patch-native \
+    perl-native-runtime \
+    python-native-runtime \
+    svn-native \
+    texinfo-native \
+    util-linux-native \
+    "
 
 ##################################################################
 # Package default variables.
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index f74f432730..e4b083dd86 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1123,7 +1123,7 @@ PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxtst ?= "1.0.3"
 PREFERRED_VERSION_libxv ?= "1.0.3"
 PREFERRED_VERSION_libxvmc ?= "1.0.4"
-PREFERRED_VERSION_lib10xxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
 PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
 PREFERRED_VERSION_libyaml-perl ?= "0.62"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 11d7b14747..85c0d9d128 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -185,6 +185,8 @@ FEED_ARCH_lsppchd 	= "ppc603e"
 FEED_ARCH_lsppchg 	= "ppc603e"
 FEED_ARCH_storcenter 	= "ppc603e"
 FEED_ARCH_turbostation 	= "ppc603e"
+FEED_ARCH_mpc8313e-rdb 	= "ppce300c3"
+FEED_ARCH_mpc8323e-rdb 	= "ppce300c2"
 
 
 #strongarm machines, no EABI
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index aeb0a2afbc..0e29c19c5c 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -35,6 +35,7 @@ SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
 SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
+SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7187c875be..ead766e3ee 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -81,7 +81,7 @@ SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-mediaplayer2 ?= "3345"
 SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-messages2 ?= "3424"
+SRCREV_pn-openmoko-messages2 ?= "3477"
 SRCREV_pn-openmoko-panel-battery ?= "3360"
 SRCREV_pn-openmoko-panel-bt ?= "3149"
 SRCREV_pn-openmoko-panel-clock ?= "2567"
@@ -105,7 +105,7 @@ SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
 SRCREV_pn-openmoko-theme-standard2 ?= "3425"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3342"
+SRCREV_pn-openmoko-today2 ?= "3478"
 SRCREV_pn-openmoko-today2-folders ?= "3414"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"