merge of '4a859de905afc30ec35cf91dcd1dd6c18307c1f8'

     and '9c6ceb61576fa98453a24fedb60c9d2b23d79c72'

6 files changed, 86 insertions, 14 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 6d5d84a794..3b2dcce756 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -6,8 +6,8 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
 #@--------------------------------------------------------------------
 
-#DISTRO_VERSION = "2007.4"
-DISTRO_VERSION = "test-${DATE}"
+#DISTRO_VERSION = "2007.9"
+DISTRO_VERSION = "2007.9-test-${DATE}"
 DISTRO_REVISION = "46"
 
 require conf/distro/include/sane-srcdates.inc
@@ -267,9 +267,9 @@ PREFERRED_VERSION_gcc-cross         ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross-sdk     ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
 
-PREFERRED_VERSION_binutils          ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross    ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils          ?= "2.18"
+PREFERRED_VERSION_binutils-cross    ?= "2.18"
+PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
 
 #avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross"
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 655d435994..34a1e54959 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -21,10 +21,6 @@ DISTRO_REVISION = "0"
 PREFERRED_VERSION_gcc               = "4.2.1"
 PREFERRED_VERSION_gcc-cross         = "4.2.1"
 
-PREFERRED_VERSION_binutils          = "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross    = "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12"
-
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers = "2.6.22"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 708159f4cb..0c3ac35672 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -14,7 +14,12 @@ DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}"
 require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
 
 #Use this variable in feeds and other parts that need a URI
-ANGSTROM_URI = "http://www.angstrom-distribution.org"
+ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
+
+#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/*, /etc/apt/sources.list)
+# usefull for derivative distros and local testing
+# As this is runtime we can't and won't use virtual/feed-configs
+ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
 
 #Set the default maintainer to angstrom-dev
 MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 9fdf115781..e5db7a9ceb 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -40,9 +40,6 @@ SRCDATE_psplash ?= "20070330"
 SRCDATE_web ?= "20060613"
 SRCDATE_zaurusd ?= "20060628"
 
-# OpenMoko
-SRCDATE_uboot-openmoko = "20070829"
-
 # GPE
 SRCDATE_dasher-gpe  ?= "20060814"
 SRCDATE_rosetta ?= "20060804"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
new file mode 100644
index 0000000000..27ce277965
--- /dev/null
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -0,0 +1,74 @@
+#Ggenerated with 
+# bitbake -s | grep svnr  | awk '{print "SRCREV_pn-" $1 "=" $2}' | \
+# sed -e s:\+:\=:g -e s:svnr::g| awk -F "=" '{print $1 "=\"" $3}' | \
+# awk -F "-r" '{print $1"\""}'
+
+# This will miss recipes that have skippackage set (e.g. uclibc)
+
+SRCREV_pn-dfu-util="2866"
+SRCREV_pn-dfu-util-native="2866"
+SRCREV_pn-eglibc="3376"
+SRCREV_pn-eglibc-initial="3376"
+SRCREV_pn-eglibc-intermediate="3376"
+SRCREV_pn-elf2flt="1786"
+SRCREV_pn-gnuradio="6316"
+SRCREV_pn-hildon-1="13599"
+SRCREV_pn-libgsmd="2806"
+SRCREV_pn-libmokogsmd2="2780"
+SRCREV_pn-libmokojournal2="2780"
+SRCREV_pn-libmokopanelui2="2892"
+SRCREV_pn-libmokoui2="2868"
+SRCREV_pn-libowl="277"
+SRCREV_pn-libxosd="627"
+SRCREV_pn-llvm-gcc4="41698"
+SRCREV_pn-llvm-gcc4-cross="41698"
+SRCREV_pn-matchbox-desktop-2="1649"
+SRCREV_pn-matchbox-keyboard="1583"
+SRCREV_pn-matchbox-panel-2="1626"
+SRCREV_pn-neod="2901"
+SRCREV_pn-openmoko-appmanager="1851"
+SRCREV_pn-openmoko-calculator="2404"
+SRCREV_pn-openmoko-calculator2="2789"
+SRCREV_pn-openmoko-common="397"
+SRCREV_pn-openmoko-common2="2679"
+SRCREV_pn-openmoko-contacts="2298"
+SRCREV_pn-openmoko-contacts2="335"
+SRCREV_pn-openmoko-dates="467"
+SRCREV_pn-openmoko-dialer="2811"
+SRCREV_pn-openmoko-dialer2="2869"
+SRCREV_pn-openmoko-feedreader2="2905"
+SRCREV_pn-openmoko-finger-demo="1671"
+SRCREV_pn-openmoko-firststart2="2873"
+SRCREV_pn-openmoko-footer="2354"
+SRCREV_pn-openmoko-icon-theme-standard="2232"
+SRCREV_pn-openmoko-icon-theme-standard2="2840"
+SRCREV_pn-openmoko-keyboard="1631"
+SRCREV_pn-openmoko-libs="2367"
+SRCREV_pn-openmoko-mediaplayer2="2883"
+SRCREV_pn-openmoko-messages="2276"
+SRCREV_pn-openmoko-panel-battery="2897"
+SRCREV_pn-openmoko-panel-bt="2896"
+SRCREV_pn-openmoko-panel-clock="2567"
+SRCREV_pn-openmoko-panel-demo="1622"
+SRCREV_pn-openmoko-panel-demo-simple="1328"
+SRCREV_pn-openmoko-panel-gps="2900"
+SRCREV_pn-openmoko-panel-gsm="2894"
+SRCREV_pn-openmoko-panel-mainmenu="2567"
+SRCREV_pn-openmoko-panel-usb="2893"
+SRCREV_pn-openmoko-session="152"
+SRCREV_pn-openmoko-simplemediaplayer="1688"
+SRCREV_pn-openmoko-sound-theme-standard="2827"
+SRCREV_pn-openmoko-stylus-demo="2324"
+SRCREV_pn-openmoko-stylus-demo-simple="1818"
+SRCREV_pn-openmoko-taskmanager="1663"
+SRCREV_pn-openmoko-tasks="320"
+SRCREV_pn-openmoko-tasks2="320"
+SRCREV_pn-openmoko-theme-standard="2370"
+SRCREV_pn-openmoko-theme-standard-qvga="2370"
+SRCREV_pn-openmoko-today="2556"
+SRCREV_pn-openmoko-today2="2919"
+SRCREV_pn-openmoko-today2-folders="2680"
+SRCREV_pn-opentapi="2012"
+SRCREV_pn-sphyrna="43"
+SRCREV_pn-webkit-gtk="webcore"
+SRCREV_pn-xoo="1623"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 7061ef2c63..0748b8cb7f 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -11,7 +11,7 @@ require conf/distro/angstrom-2007.1.conf
 #
 DISTRO = "openmoko"
 DISTRO_NAME = "OpenMoko"
-DISTRO_VERSION = "P1-August-Snapshot-${DATE}"
+DISTRO_VERSION = "P1-September-Snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"