make uclibc 0.9.30.1 the default

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16047 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 74c38fe..f6d3537 100644 (file)
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -3,8 +3,7 @@
 choice
        prompt "uClibc Version"
        depends on TOOLCHAINOPTS && USE_UCLIBC
 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.
 
        help
          Select the version of uClibc you wish to use.
 


@@ -19,4 +18,3 @@ choice
                depends BROKEN
 
 endchoice
                depends BROKEN
 
 endchoice

-

diff --git a/toolchain/uClibc/Config.version b/toolchain/uClibc/Config.version
index 96f13d9..acb2226 100644 (file)
--- 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
        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.30+nptl"  if UCLIBC_VERSION_NPTL

-       default "0.9.29"
-
+       default "0.9.30.1"