summaryrefslogtreecommitdiff
path: root/scripts/build/libc/uClibc.sh
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@free.fr>2012-10-31 22:31:32 (GMT)
committerYann E. MORIN" <yann.morin.1998@free.fr>2012-10-31 22:31:32 (GMT)
commitbaba0868065b5e2c90f4654aabe79db14a97d477 (patch)
treea8b9b387599a052aa6a609adacae4d18aceabbb4 /scripts/build/libc/uClibc.sh
parent5ed8715c9d5b24d1bc2545255f7a5743a629bb75 (diff)
libc/uClibc: remove use of snapshots and specific date
We now have the ability to use a custom location, so supporting snapshots or custom date is no longer needed. Let the user do the required preparation in this case. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Diffstat (limited to 'scripts/build/libc/uClibc.sh')
-rw-r--r--scripts/build/libc/uClibc.sh22
1 files changed, 7 insertions, 15 deletions
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index affdb97..395d31d 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -10,11 +10,7 @@ uclibc_local_tarball="uClibc-locale-${uclibc_locales_version}"
# Download uClibc
do_libc_get() {
libc_src="http://www.uclibc.org/downloads
- http://www.uclibc.org/downloads/snapshots
http://www.uclibc.org/downloads/old-releases"
- # For uClibc, we have almost every thing: releases, and snapshots
- # for the last month or so. We'll have to deal with svn revisions
- # later...
if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" ]; then
CT_GetCustom "uClibc" "${CT_LIBC_VERSION}" \
"${CT_LIBC_UCLIBC_CUSTOM_LOCATION}"
@@ -31,16 +27,14 @@ do_libc_get() {
# Extract uClibc
do_libc_extract() {
- # If using custom directory location, nothing to do
- if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \
+ # If not using custom directory location, extract and patch
+ # Note: we do the inverse test we do in other components,
+ # because here we still need to extract the locales, even for
+ # custom location directory. Just use negate the whole test,
+ # to keep it the same as for other components.
+ if ! [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" \
-a -d "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}" ]; then
- return 0
- fi
- CT_Extract "uClibc-${CT_LIBC_VERSION}"
- # Don't patch snapshots
- if [ -z "${CT_LIBC_UCLIBC_V_snapshot}" \
- -a -z "${CT_LIBC_UCLIBC_V_specific_date}" \
- ]; then
+ CT_Extract "uClibc-${CT_LIBC_VERSION}"
CT_Patch "uClibc" "${CT_LIBC_VERSION}"
fi
@@ -467,8 +461,6 @@ mungeuClibcConfig() {
fi
# Push the threading model
- # Note: we take into account all of the .28, .29, .30 and .31
- # versions, here. Even snapshots with NPTL.
case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in
none:)
cat <<-ENDSED