X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/955e03f23ad5f2e8b61b256a7147a9f403583381..6ac33b7908f3bf511f7dfdd96b46a9e9dce435ab:/toolchain/uClibc/Config.in

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 4b016c951..c4f41aedb 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -1,18 +1,40 @@
-# Choose uClibc options
-#
-if CONFIG_DEVEL
-	comment "uClibc Options"
-endif
-
-config BR2_UCLIBC_VERSION_SNAPSHOT
-	bool
-	prompt "Use the daily snapshot of uClibc?" if CONFIG_DEVEL
-	default n
+# Choose uclibc version.
+
+choice
+	prompt "uClibc Version"
+	depends on TOOLCHAINOPTS && USE_UCLIBC
+	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.
 
-config BR2_USE_UCLIBC_SNAPSHOT
-	string
-	default "snapshot"
-	depends on BR2_UCLIBC_VERSION_SNAPSHOT
+	config UCLIBC_VERSION_SNAPSHOT
+		bool "uClibc snapshot"
+
+	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_0_9_30
+		bool "uClibc 0.9.30"
 
+endchoice
+
+config UCLIBC_VERSION_NPTL
+	bool "Use NPTL branch"
+	depends on TOOLCHAINOPTS && USE_UCLIBC
+	depends on UCLIBC_VERSION_0_9_30
+
+
+config UCLIBC_EXTRA_VERSION
+	string
+	prompt "Extra uClibc version"
+	depends on TOOLCHAINOPTS && USE_UCLIBC
+	default "snapshot"   if UCLIBC_VERSION_SNAPSHOT
+	default ".2"         if UCLIBC_VERSION_0_9_28
+	default ".1"         if UCLIBC_VERSION_0_9_30 && !UCLIBC_VERSION_NPTL
+	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.