summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2011-01-24 10:01:07 +0100
committerKoen Kooi <koen@openembedded.org>2011-01-24 10:01:07 +0100
commit1fec4ff6b595dccd2ecd23402bf147442dd22876 (patch)
tree8144cb35d6c0ff8bfb3a9c105c369d85f6d498af
parentbb4c101bb2e02bb82b45bd0530499de1cd49c224 (diff)
downloadopenembedded-1fec4ff6b595dccd2ecd23402bf147442dd22876.tar.gz
Revert "angstrom-2010.x.conf: Prefer binutils 2.21 and uclibc-git"
This reverts commit e5274a6cceb56653971f355a4f19079831efb832. This was pushed without maintainer sign-off and breaks angstrom
-rw-r--r--conf/distro/angstrom-2010.x.conf6
-rw-r--r--conf/distro/include/angstrom-2010-preferred-versions.inc1
2 files changed, 4 insertions, 3 deletions
diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf
index 3ac3847922..c6fb07d406 100644
--- a/conf/distro/angstrom-2010.x.conf
+++ b/conf/distro/angstrom-2010.x.conf
@@ -71,8 +71,8 @@ PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}"
#Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
PREFERRED_VERSION_glibc ?= "2.10.1"
PREFERRED_VERSION_glibc-initial ?= "2.10.1"
-PREFERRED_VERSION_uclibc ?= "git"
-PREFERRED_VERSION_uclibc-initial ?= "git"
+PREFERRED_VERSION_uclibc ?= "0.9.30.2"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.30.2"
PREFERRED_VERSION_eglibc ?= "2.12"
PREFERRED_VERSION_eglibc-initial ?= "2.12"
@@ -95,7 +95,7 @@ ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
#Everybody else can just use this:
ANGSTROM_GCC_VERSION ?= "4.5"
-ANGSTROM_BINUTILS_VERSION ?= "2.21"
+ANGSTROM_BINUTILS_VERSION ?= "2.20.1"
PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}"
PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}"
diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc
index 66ee5abe1e..5532f291ee 100644
--- a/conf/distro/include/angstrom-2010-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
@@ -66,6 +66,7 @@ PREFERRED_VERSION_samba = "3.3.9"
PREFERRED_VERSION_tiff = "3.9.4+4.0.0beta6"
PREFERRED_VERSION_udev = "165"
+PREFERRED_VERSION_udev_libc-uclibc = "141"
UDEV_GE_141 = "1"
PREFERRED_VERSION_usbutils = "0.86"