merge of '3ee7753352acbc0627f1b877b1ba96587f656224'

     and 'bc0b144ff867cb1e66b24d5ba91c183ee6d51cb6'

7 files changed, 17 insertions, 5 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index ac2d281123..27a04a028c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -529,6 +529,10 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUIL
 include conf/site.conf
 include conf/auto.conf
 include conf/local.conf
+# USERDISTRO should always contain original DISTRO value as set by user
+# If a distro config overrides DISTRO for whatever reason (e.g. to get
+# overrides like it wants), USERDISTRO must be reassigned with := first
+USERDISTRO = "${DISTRO}"
 include conf/build/${BUILD_SYS}.conf
 include conf/target/${TARGET_SYS}.conf
 include conf/machine/${MACHINE}.conf
@@ -541,7 +545,7 @@ require conf/sanity.conf
 ##################################################################
 
 DL_DIR ?= "${TMPDIR}/downloads"
-IMAGE_FSTYPES ?= "jffs2"
+IMAGE_FSTYPES ?= "tar.gz"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 DEFAULT_TASK_PROVIDER ?= "task-base"
 MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index fe216800c3..6ba20c4830 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -2,6 +2,8 @@
 #@NAME: Angstrom 
 #@DESCRIPTION: Release independent distribution configuration for Angstrom
 
+# Preserve original DISTRO value
+USERDISTRO := "${DISTRO}"
 DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"
 
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 2c2e0acb03..5641c8ee39 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1 +1,8 @@
+PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_libtool = "1.2.14"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.10"
+
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index aaf7b02a09..43ffa1de9f 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -46,7 +46,6 @@ SRCDATE_rosetta ?= "20060804"
 SRCDATE_gpesyncd ?= "20070701"
 
 # GNOME
-SRCDATE_gconf-dbus ?= "20070512"
 SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a585fdeca6..4d92f48928 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -23,7 +23,7 @@ SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7650"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
-SRCREV_pn-gconf-dbus ?= "606"
+SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gsm0710muxd ?= "73"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 92fd42f4f8..3fbe79e354 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -37,7 +37,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" 
-PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
 
 PREFERRED_VERSION_glibc = "2.2.5"
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
index ecff6fae13..faf86c5ed0 100644
--- a/conf/machine/davinci-sffsdr.conf
+++ b/conf/machine/davinci-sffsdr.conf
@@ -19,7 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 #ROOT_FLASH_SIZE = "29"
 
-MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
+MACHINE_FEATURES = "kernel26 serial"
 
 require conf/machine/include/tune-arm926ejs.inc