X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2FuClibc%2FConfig.in;h=95113f3257bd6cddefb3e2d506f80484d0eb83d6;hb=96ff9f58c604fa5e0f8aaa2c1a127ab993162556;hp=6c89fd25e532b5a94826494028cf58d9307bf171;hpb=68d61957ec73a44c58e6eae6c1c66eb4825ced8c;p=openwrt-10.03%2F.git

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 6c89fd25e..95113f325 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -1,29 +1,17 @@
 # Choose uclibc version.
 
 choice
-	prompt "uClibc Version" if TOOLCHAINOPTS
-	default UCLIBC_VERSION_0_9_29
+	prompt "uClibc Version"
+	depends on TOOLCHAINOPTS && USE_UCLIBC
+	default UCLIBC_VERSION_0_9_30_1
 	help
 	  Select the version of uClibc you wish to use.
-	  Default for kernel 2.6 is 0.9.29, for kernel 2.4 it is 0.9.28 .
 
-	config UCLIBC_VERSION_SNAPSHOT
-		bool "uClibc snapshot"
+	config UCLIBC_VERSION_0_9_30_1
+		bool "uClibc 0.9.30.1"
 
-	config UCLIBC_VERSION_0_9_28
-		bool "uClibc 0.9.28"
-
-	config UCLIBC_VERSION_0_9_29
-		bool "uClibc 0.9.29"
+	config UCLIBC_VERSION_NPTL
+		bool "uClibc NPTL branch"
+		depends BROKEN
 
 endchoice
-
-config UCLIBC_EXTRA_VERSION
-	string
-	prompt "Extra uClibc version" if TOOLCHAINOPTS
-	default "snapshot"   if UCLIBC_VERSION_SNAPSHOT
-	default ".2"         if UCLIBC_VERSION_0_9_28
-	default ""
-	help
-	    Default for version 0.9.28 is ".02", for daily snapshot it's just "snapshot"
-	    For all other versions the default string is empty.