diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/amsdelta-oe.conf | 2 | ||||
-rw-r--r-- | conf/distro/angstrom-2007.1-legacy.conf | 2 | ||||
-rw-r--r-- | conf/distro/angstrom-2008.1.conf | 10 | ||||
-rw-r--r-- | conf/distro/foonas.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko.inc (renamed from conf/distro/angstrom-2007.1.conf) | 0 | ||||
-rw-r--r-- | conf/distro/mokoslug.conf | 2 | ||||
-rw-r--r-- | conf/distro/openmoko.conf | 2 |
7 files changed, 12 insertions, 8 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/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 |