aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-05-25 11:17:01 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-05-25 11:17:01 +0000
commit94785e705e7ab4192df5b9729bd77cf44c7e5d29 (patch)
treeda56294421f15bde100cbd507e8c6ef9f400f60b
parent37bea86a2ec5148628d7318d66425c1f8ab2286c (diff)
downloadupstream-94785e705e7ab4192df5b9729bd77cf44c7e5d29.tar.gz
upstream-94785e705e7ab4192df5b9729bd77cf44c7e5d29.tar.bz2
upstream-94785e705e7ab4192df5b9729bd77cf44c7e5d29.zip
make uclibc 0.9.30.1 the default
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16047 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--toolchain/uClibc/Config.in4
-rw-r--r--toolchain/uClibc/Config.version5
2 files changed, 3 insertions, 6 deletions
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"