X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=toolchain%2FuClibc%2FConfig.in;h=6c89fd25e532b5a94826494028cf58d9307bf171;hb=e98062ae33be0c074f1372f806480099f7cd2ec9;hp=09453bff3e5f351fa6d2ceb1ba87a4d6ede94560;hpb=362585143d362b5ffe9a140abd210cdea62d012c;p=openwrt-10.03%2F.git

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 09453bff3..6c89fd25e 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -1,26 +1,29 @@
-# Choose uClibc options
-#
-if CONFIG_DEVEL
-	comment "uClibc Options"
-endif
+# Choose uclibc version.
 
-config BR2_UCLIBC_VERSION_SNAPSHOT
-	bool
-	prompt "Use the daily snapshot of uClibc?" if CONFIG_DEVEL
-	default n
+choice
+	prompt "uClibc Version" if TOOLCHAINOPTS
+	default UCLIBC_VERSION_0_9_29
 	help
-	    Would you like to use the latest daily snapshot?
+	  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 BR2_USE_UCLIBC_SNAPSHOT
-	string
-	default "snapshot"
-	depends on BR2_UCLIBC_VERSION_SNAPSHOT
+	config UCLIBC_VERSION_SNAPSHOT
+		bool "uClibc snapshot"
 
-config BR2_ENABLE_LOCALE
-	bool
-	prompt "Enable locale/gettext/i18n support?" if CONFIG_DEVEL
-	default n
-	help
-	    Enable locale/gettext/i18n support?
+	config UCLIBC_VERSION_0_9_28
+		bool "uClibc 0.9.28"
+
+	config UCLIBC_VERSION_0_9_29
+		bool "uClibc 0.9.29"
 
+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.