merge of '88e2766fe8aa4c69dc8688e0554e2e6d05bb9c67'

     and 'f556521018478109967b108bb830f8109aefbb0e'

10 files changed, 16 insertions, 10 deletions

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 6d3ad7bd6b..25b07e0038 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe"
 DISTRO_NAME = "AmsDelta Linux"
 DISTRO_VERSION = "unstable-${DATE}"
 
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
 
 
 DISTRO_TYPE = "debug"
diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2007.1-legacy.conf
index 298c8589e3..358ed06cf2 100644
--- a/conf/distro/angstrom-2007.1-legacy.conf
+++ b/conf/distro/angstrom-2007.1-legacy.conf
@@ -4,6 +4,6 @@
 #      * no sysfs
 #      * no EABI for ARM
 
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
 
 # We'll have to fill this in as we go.
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index ff7636e686..d833fe922f 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -6,11 +6,15 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de>
 #@--------------------------------------------------------------------
 
-# This is a testbed for unstable and/or untested things, while angstrom-2007.1 
-# is aiming for stability and a release.
+# This is a aimed to be the next stable angstrom release. 
+# If you want something stable *right now*, use angstrom-2007.1
+# with the org.openembedded.angstrom-2007.12-stable branch
+#
 # Use this at your own risk, we welcome bugreports filed at 
 #    http://bugs.openembedded.org
-# In doubt, use DISTRO="angstrom-2007.1"
+#
+# Again, in doubt, use DISTRO="angstrom-2007.1" with the 
+# org.openembedded.angstrom-2007.12-stable branch
 
 #DISTRO_VERSION = "2008.1"
 DISTRO_VERSION = "2008.1-test-${DATE}"
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 234c92f62a..fe079db92d 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -8,7 +8,7 @@
 
 FOONAS_MODE ?= "glibc"
 ANGSTROM_MODE = ${FOONAS_MODE}
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
 
 DISTRO = "foonas"
 DISTRO_NAME = "foonas"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/include/angstrom-2007-for-openmoko.inc
index 380c882c2c..380c882c2c 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 97fed90f21..82c31cb64a 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1594,7 +1594,7 @@ PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0"
 PREFERRED_VERSION_qpe-libgaim ?= "1.5.0"
 PREFERRED_VERSION_qpealarmclock ?= "1.0.9"
 PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9"
-PREFERRED_VERSION_qpegps ?= "0.9.3"
+PREFERRED_VERSION_qpegps ?= "0.9.3.1"
 PREFERRED_VERSION_qpenmapfe ?= "1.0.0"
 PREFERRED_VERSION_qpf-arabic ?= "1.0"
 PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 9f8ae61fc3..87fea8d622 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -44,6 +44,8 @@ SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
 
+SRCREV_pn-python-gsmd ?= "${AUTOREV}"
+
 SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 5446a425ce..af96ae435a 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -42,7 +42,7 @@ SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "927"
+SRCREV_pn-linux-ixp4xx ?= "957"
 SRCREV_pn-linux-openmoko ?= "3238"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf
index 2c039dbcce..d68a03fa2b 100644
--- a/conf/distro/mokoslug.conf
+++ b/conf/distro/mokoslug.conf
@@ -6,7 +6,7 @@
 #@--------------------------------------------------------------------
 
 # MokoSlug is based on Angstrom, and would hopefully just be done by features one day ...
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
 
 DISTRO = "mokoslug"
 DISTRO_NAME = "MokoSlug"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index f2007c231f..e3ddd2165b 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
 #-----------------------------------------------------------------------------
 
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/include/angstrom-2007-for-openmoko.inc
 
 #
 # Header