1.1 --- a/config/libc/uClibc.in	Thu Oct 11 14:39:44 2012 +1000
     1.2 +++ b/config/libc/uClibc.in	Wed Oct 31 23:31:32 2012 +0100
     1.3 @@ -82,23 +82,6 @@
     1.4      prompt "0.9.28.3 (OBSOLETE)"
     1.5      depends on OBSOLETE
     1.6  
     1.7 -# As of today (20100702) we can be pretty sure that every
     1.8 -# snapshots made since a month ago are post -0.9.30.
     1.9 -
    1.10 -config LIBC_UCLIBC_V_snapshot
    1.11 -    bool
    1.12 -    prompt "latest snapshot (EXPERIMENTAL)"
    1.13 -    depends on EXPERIMENTAL
    1.14 -    select LIBC_SUPPORT_NPTL
    1.15 -    select LIBC_UCLIBC_0_9_30_or_later
    1.16 -
    1.17 -config LIBC_UCLIBC_V_specific_date
    1.18 -    bool
    1.19 -    prompt "<specific date> (EXPERIMENTAL)"
    1.20 -    depends on EXPERIMENTAL
    1.21 -    select LIBC_SUPPORT_NPTL
    1.22 -    select LIBC_UCLIBC_0_9_30_or_later
    1.23 -
    1.24  config LIBC_UCLIBC_CUSTOM
    1.25      bool
    1.26      prompt "Custom uClibc"
    1.27 @@ -122,7 +105,6 @@
    1.28  
    1.29  config LIBC_VERSION
    1.30      string
    1.31 -    prompt "Enter date (YYYYMMDD)" if LIBC_UCLIBC_V_specific_date
    1.32  # Don't remove next line
    1.33  # CT_INSERT_VERSION_STRING_BELOW
    1.34      default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2
    1.35 @@ -137,7 +119,6 @@
    1.36      default "0.9.30" if LIBC_UCLIBC_V_0_9_30
    1.37      default "0.9.29" if LIBC_UCLIBC_V_0_9_29
    1.38      default "0.9.28.3" if LIBC_UCLIBC_V_0_9_28_3
    1.39 -    default "snapshot" if LIBC_UCLIBC_V_snapshot
    1.40      default "custom" if LIBC_UCLIBC_CUSTOM
    1.41  
    1.42  config LIBC_UCLIBC_0_9_32_or_later

     2.1 --- a/scripts/build/libc/uClibc.sh	Thu Oct 11 14:39:44 2012 +1000
     2.2 +++ b/scripts/build/libc/uClibc.sh	Wed Oct 31 23:31:32 2012 +0100
     2.3 @@ -10,11 +10,7 @@
     2.4  # Download uClibc
     2.5  do_libc_get() {
     2.6      libc_src="http://www.uclibc.org/downloads
     2.7 -              http://www.uclibc.org/downloads/snapshots
     2.8                http://www.uclibc.org/downloads/old-releases"
     2.9 -    # For uClibc, we have almost every thing: releases, and snapshots
    2.10 -    # for the last month or so. We'll have to deal with svn revisions
    2.11 -    # later...
    2.12      if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" ]; then
    2.13          CT_GetCustom "uClibc" "${CT_LIBC_VERSION}" \
    2.14                       "${CT_LIBC_UCLIBC_CUSTOM_LOCATION}"
    2.15 @@ -31,16 +27,14 @@
    2.16  
    2.17  # Extract uClibc
    2.18  do_libc_extract() {
    2.19 -    # If using custom directory location, nothing to do
    2.20 -    if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \
    2.21 +    # If not using custom directory location, extract and patch
    2.22 +    # Note: we do the inverse test we do in other components,
    2.23 +    # because here we still need to extract the locales, even for
    2.24 +    # custom location directory. Just use negate the whole test,
    2.25 +    # to keep it the same as for other components.
    2.26 +    if ! [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \
    2.27           -a -d "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" ]; then
    2.28 -        return 0
    2.29 -    fi
    2.30 -    CT_Extract "uClibc-${CT_LIBC_VERSION}"
    2.31 -    # Don't patch snapshots
    2.32 -    if [    -z "${CT_LIBC_UCLIBC_V_snapshot}"      \
    2.33 -         -a -z "${CT_LIBC_UCLIBC_V_specific_date}" \
    2.34 -       ]; then
    2.35 +        CT_Extract "uClibc-${CT_LIBC_VERSION}"
    2.36          CT_Patch "uClibc" "${CT_LIBC_VERSION}"
    2.37      fi
    2.38  
    2.39 @@ -467,8 +461,6 @@
    2.40      fi
    2.41  
    2.42      # Push the threading model
    2.43 -    # Note: we take into account all of the .28, .29, .30 and .31
    2.44 -    #       versions, here. Even snapshots with NPTL.
    2.45      case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in
    2.46          none:)
    2.47              cat <<-ENDSED