merge of 'bb233fef5b7011690cc33565cb45dadb42be30c7'

     and 'f22e68740932b52d4128634598e1377947560f47'

4 files changed, 11 insertions, 31 deletions

diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index c9003128aa..a574112bae 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -6,11 +6,6 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
 #@--------------------------------------------------------------------
 
-# If you want to use the angstrom 2007.12 release or if
-# you want to base you distro on angstrom 2007, switch to
-# the org.openembedded.angstrom-2007.12-stable branch
-# THIS FILE WILL GO AWAY IN JANUARY 2008!!
-
 DISTRO_VERSION = "2007.11RC3"
 DISTRO_REVISION = "51"
 
@@ -33,30 +28,12 @@ DISTRO_TYPE ?= "debug"
 # Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
 IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
 
-# These will be put under package management soon
-#FEED_URIS += " \
-#		no-arch##${ANGSTROM_URI}/unstable/feed/all \
-#		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
-#		perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
-#		python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
-#		debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
-#		gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
-#		${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
-#        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \
-#        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
-#        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates"
-
-
 # set feed path variables
 FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/"
 
 
 #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
-CVS_TARBALL_STASH ?= "\
-		     http://www.angstrom-distribution.org/unstable/sources/ \
-		     http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
-		    "
-
+CVS_TARBALL_STASH ?= "http://www.angstrom-distribution.org/unstable/sources/"
 
 #Make sure we use 2.6 on machines with a 2.4/2.6 selector
 KERNEL = "kernel26"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index a43f15eca9..b043b30c8c 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -3,6 +3,7 @@ SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
 SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-exposure ?= "${AUTOREV}"
 SRCREV_pn-illume ?= "${AUTOREV}"
 SRCREV_pn-illume-theme-asu ?= "${AUTOREV}"
 SRCREV_pn-libgsmd ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 0e38beb83c..612baa8756 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -1,4 +1,5 @@
-# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version 
+# Lock down some SRCDATEs
+# See http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version 
 
 # Kernel modules
 SRCDATE_at76c503a-modules ?= "20060814"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 75d9a9756a..320d9c057b 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -10,19 +10,19 @@ require conf/distro/include/angstrom-2007-for-openmoko.inc
 #
 # Header
 #
-DISTRO_NAME = "Openmoko"
-DISTRO_VERSION = "P1-Snapshot-${DATE}"
+DISTRO_NAME = "openmoko"
+DISTRO_VERSION = "-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
 DISTRO = "openmoko"
 
 OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
-CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
+CVS_TARBALL_STASH += "http://downloads.openmoko.org/sources/"
 
 PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
 
-ANGSTROM_FEED_CONFIGS = "openmoko-feed-configs"
+ANGSTROM_FEED_CONFIGS ?= "openmoko-feed-configs"
 
 # 2.18 seems to break badly on 64-bit systems
 PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
@@ -31,12 +31,13 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
 # we want the openmoko svn version of gsmd
 PREFERRED_PROVIDER_libgsmd = "libgsmd"
 
-# Bleeding-edge developers should add the following line to their local.conf:
+# Bleeding-edge developers should add the following lines to their local.conf:
 # require conf/distro/include/moko-autorev.inc
+# require conf/distro/include/fso-autorev.inc
 
 # override the PACKAGE_ARCH of certain packages for openmoko distro
 #
-# Same kernel runs on both these machines
+# Same kernel used to run on both these machines...
 # Currently not used but left here in case someone wants to switch on
 # quickly
 #PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "${MACHINE_CLASS}"