1.1 --- a/config/libc/uClibc.in Sun Jan 02 22:32:48 2011 +0100
1.2 +++ b/config/libc/uClibc.in Mon Jan 03 01:15:30 2011 +0100
1.3 @@ -31,22 +31,22 @@
1.4 prompt "0.9.30.2"
1.5 select LIBC_UCLIBC_0_9_30_or_later
1.6
1.7 -config LIBC_V_0_9_30_1
1.8 +config LIBC_UCLIBC_V_0_9_30_1
1.9 bool
1.10 prompt "0.9.30.1"
1.11 select LIBC_UCLIBC_0_9_30_or_later
1.12
1.13 -config LIBC_V_0_9_30
1.14 +config LIBC_UCLIBC_V_0_9_30
1.15 bool
1.16 prompt "0.9.30"
1.17 select LIBC_UCLIBC_0_9_30_or_later
1.18
1.19 -config LIBC_V_0_9_29
1.20 +config LIBC_UCLIBC_V_0_9_29
1.21 bool
1.22 prompt "0.9.29 (OBSOLETE)"
1.23 depends on OBSOLETE
1.24
1.25 -config LIBC_V_0_9_28_3
1.26 +config LIBC_UCLIBC_V_0_9_28_3
1.27 bool
1.28 prompt "0.9.28.3 (OBSOLETE)"
1.29 depends on OBSOLETE
1.30 @@ -54,14 +54,14 @@
1.31 # As of today (20100702) we can be pretty sure that every
1.32 # snapshots made since a month ago are post -0.9.30.
1.33
1.34 -config LIBC_V_snapshot
1.35 +config LIBC_UCLIBC_V_snapshot
1.36 bool
1.37 prompt "latest snapshot (EXPERIMENTAL)"
1.38 depends on EXPERIMENTAL
1.39 select LIBC_SUPPORT_NPTL
1.40 select LIBC_UCLIBC_0_9_30_or_later
1.41
1.42 -config LIBC_V_specific_date
1.43 +config LIBC_UCLIBC_V_specific_date
1.44 bool
1.45 prompt "<specific date> (EXPERIMENTAL)"
1.46 depends on EXPERIMENTAL
1.47 @@ -72,17 +72,17 @@
1.48
1.49 config LIBC_VERSION
1.50 string
1.51 - prompt "Enter date (YYYYMMDD)" if LIBC_V_specific_date
1.52 + prompt "Enter date (YYYYMMDD)" if LIBC_UCLIBC_V_specific_date
1.53 # Don't remove next line
1.54 # CT_INSERT_VERSION_STRING_BELOW
1.55 default "0.9.31" if LIBC_UCLIBC_V_0_9_31
1.56 default "0.9.30.3" if LIBC_UCLIBC_V_0_9_30_3
1.57 default "0.9.30.2" if LIBC_UCLIBC_V_0_9_30_2
1.58 - default "0.9.30.1" if LIBC_V_0_9_30_1
1.59 - default "0.9.30" if LIBC_V_0_9_30
1.60 - default "0.9.29" if LIBC_V_0_9_29
1.61 - default "0.9.28.3" if LIBC_V_0_9_28_3
1.62 - default "snapshot" if LIBC_V_snapshot
1.63 + default "0.9.30.1" if LIBC_UCLIBC_V_0_9_30_1
1.64 + default "0.9.30" if LIBC_UCLIBC_V_0_9_30
1.65 + default "0.9.29" if LIBC_UCLIBC_V_0_9_29
1.66 + default "0.9.28.3" if LIBC_UCLIBC_V_0_9_28_3
1.67 + default "snapshot" if LIBC_UCLIBC_V_snapshot
1.68
1.69 config LIBC_UCLIBC_0_9_30_or_later
1.70 bool
2.1 --- a/scripts/build/libc/uClibc.sh Sun Jan 02 22:32:48 2011 +0100
2.2 +++ b/scripts/build/libc/uClibc.sh Mon Jan 03 01:15:30 2011 +0100
2.3 @@ -25,8 +25,8 @@
2.4 }
2.5
2.6 libc_uclibc_src_dir() {
2.7 - if [ -z "${CT_LIBC_V_snapshot}" \
2.8 - -a -z "${CT_LIBC_V_specific_date}" \
2.9 + if [ -z "${CT_LIBC_UCLIBC_V_snapshot}" \
2.10 + -a -z "${CT_LIBC_UCLIBC_V_specific_date}" \
2.11 ]; then
2.12 echo "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"
2.13 else
2.14 @@ -38,8 +38,8 @@
2.15 do_libc_extract() {
2.16 CT_Extract "uClibc-${CT_LIBC_VERSION}"
2.17 # Don't patch snapshots
2.18 - if [ -z "${CT_LIBC_V_snapshot}" \
2.19 - -a -z "${CT_LIBC_V_specific_date}" \
2.20 + if [ -z "${CT_LIBC_UCLIBC_V_snapshot}" \
2.21 + -a -z "${CT_LIBC_UCLIBC_V_specific_date}" \
2.22 ]; then
2.23 CT_Patch "uClibc" "${CT_LIBC_VERSION}"
2.24 fi