conf/distro: remove angstrom 2007.1, update dependant distros to 2008, special-case...

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 6d3ad7bd6bfa35061e09c9ed8290450c792fe01d..25b07e0038e6bcc3f40c15d81956b546d45abc71 100644 (file)
--- 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 298c8589e3851670574c08151053863cb7829311..358ed06cf26274318ca72086ff4b9de370a04c6b 100644 (file)
--- 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 ff7636e686bd0c4b0f8cfa1157532cd1a0103f83..d833fe922fcdf10bc8da21f20ac4b92aa85103f5 100644 (file)
--- 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 234c92f62a8c42a33ea1e2fa69eb47668c41bfb2..fe079db92d7385060e8a0207c09aa61c51145e45 100644 (file)
--- 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
similarity index 100%
rename from conf/distro/angstrom-2007.1.conf
rename to conf/distro/include/angstrom-2007-for-openmoko.inc

diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf
index 2c039dbcce47c3e7365bc5794a12954c2828513a..d68a03fa2b62ab22da790b992b5a4fca0bc6b7e4 100644 (file)
--- 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 f2007c231ff6dd6a4233059875cd86689da0ea16..e3ddd2165bb02a69538b4c72f578be261157583a 100644 (file)
--- 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