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

diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf
index 3ac3847..c6fb07d 100644 (file)
--- 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 66ee5ab..5532f29 100644 (file)
--- 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"