From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 25 May 2009 11:17:01 +0000 (+0000)
Subject: make uclibc 0.9.30.1 the default
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cd649df858be5066ae06a73647f6578421e541f7;p=openwrt%2Fstaging%2Frobimarko.git

make uclibc 0.9.30.1 the default

SVN-Revision: 16047
---

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 74c38fe2dd..f6d3537531 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -3,8 +3,7 @@
 choice
 	prompt "uClibc Version"
 	depends on TOOLCHAINOPTS && USE_UCLIBC
-	default UCLIBC_VERSION_0_9_29
-	default UCLIBC_VERSION_0_9_30_1 if (TARGET_uml && x86_64)
+	default UCLIBC_VERSION_0_9_30_1
 	help
 	  Select the version of uClibc you wish to use.
 
@@ -19,4 +18,3 @@ choice
 		depends BROKEN
 
 endchoice
-
diff --git a/toolchain/uClibc/Config.version b/toolchain/uClibc/Config.version
index 96f13d9f25..acb222696a 100644
--- a/toolchain/uClibc/Config.version
+++ b/toolchain/uClibc/Config.version
@@ -2,7 +2,6 @@ config UCLIBC_VERSION
 	string
 	depends on USE_UCLIBC
 	default "0.9.29"       if UCLIBC_VERSION_0_9_29
-	default "0.9.30.1"     if UCLIBC_VERSION_0_9_30_1 || (TARGET_uml && x86_64)
+	default "0.9.30.1"     if UCLIBC_VERSION_0_9_30_1
 	default "0.9.30+nptl"  if UCLIBC_VERSION_NPTL
-	default "0.9.29"
-
+	default "0.9.30.1"