6 files changed, 6 insertions, 8 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index d8c3cd78df..7e921bf06a 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -32,9 +32,6 @@ require conf/distro/include/angstrom-${LIBC}.inc
 
 # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
 ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
-ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5teb = "thumb"
 
 
 ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc
index ed3e0ecf9d..0d2087ed4b 100644
--- a/conf/distro/include/eglibc.inc
+++ b/conf/distro/include/eglibc.inc
@@ -1,5 +1,5 @@
 # Add glibc overrides to the overrides for eglibc.
-OVERRIDES .= ":glibc"
+OVERRIDES .= ":libc-glibc"
 
 # The things eglibc can provide.  We default to wanting eglibc to provide them.
 PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
diff --git a/conf/distro/include/glibc.inc b/conf/distro/include/glibc.inc
index 1d6b22d8b5..f9140ffa43 100644
--- a/conf/distro/include/glibc.inc
+++ b/conf/distro/include/glibc.inc
@@ -1,5 +1,5 @@
 # Add glibc to the overrides.
-OVERRIDES .= ":glibc"
+OVERRIDES .= ":libc-glibc"
 
 # The things glibc can provide.  We default to wanting glibc to provide them.
 PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 8be99a363d..1be3dabc2b 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -39,6 +39,7 @@ SRCDATE_python-cairo ?= "20060814"
 SRCDATE_qemu-native ?= "20070613"
 SRCDATE_rdesktop ?= "20080917"
 SRCDATE_roadster ?= "20060814"
+SRCDATE_rosetta ?= "20090514"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"
 SRCDATE_waimea ?= "20060814"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3b24ce62c7..bd78008dd0 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -249,11 +249,11 @@ SRCREV_pn-usbpath-native ?= "3172"
 SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
-SRCREV_pn-webkit-gtk ?= "42127"
+SRCREV_pn-webkit-gtk ?= "43434"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
-SRCREV_pn-xf86-video-glamo ?= "16a993d8b17ef623a21b003f6f08adb86c76de77"
+SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc
index 979b7f1539..ee18fc87e1 100644
--- a/conf/distro/include/uclibc.inc
+++ b/conf/distro/include/uclibc.inc
@@ -1,5 +1,5 @@
 # Add uclibc overrides to the overrides.
-OVERRIDES .= ":uclibc"
+OVERRIDES .= ":libc-uclibc"
 
 # The things uclibc can provide.  We default to wanting uclibc to provide them.
 PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"