diff options
| author | Alexey Neyman <stilor@att.net> | 2017-01-13 09:53:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 09:53:27 -0800 |
| commit | cbb045ab333df1047a6a9851c19c4b0b61442011 (patch) | |
| tree | 0e886b4bcf6f54c9cb3b273c9ac511585f3959f6 /scripts/build/libc | |
| parent | e282fd5551b35cba0c09b92efbe6fa17af7f80a8 (diff) | |
| parent | 9f5a92a783eb33430a3c8e5518e7e1c723fe3a15 (diff) | |
| download | crosstool-ng-cbb045ab333df1047a6a9851c19c4b0b61442011.tar.gz crosstool-ng-cbb045ab333df1047a6a9851c19c4b0b61442011.tar.bz2 crosstool-ng-cbb045ab333df1047a6a9851c19c4b0b61442011.zip | |
Merge pull request #525 from stilor/linaro-download-location
Fix Linaro download locations
Diffstat (limited to 'scripts/build/libc')
| -rw-r--r-- | scripts/build/libc/glibc.sh | 21 | ||||
| -rw-r--r-- | scripts/build/libc/newlib.sh | 21 |
2 files changed, 22 insertions, 20 deletions
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 019dd902..3e2c88ed 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -11,17 +11,16 @@ do_libc_get() { CT_GetCustom "glibc" "${CT_LIBC_GLIBC_CUSTOM_VERSION}" \ "${CT_LIBC_GLIBC_CUSTOM_LOCATION}" else - if echo ${CT_LIBC_VERSION} |grep -q linaro; then - # Linaro glibc releases come from regular downloads... - YYMM=`echo ${CT_LIBC_VERSION} |cut -d- -f3 |sed -e 's,^..,,'` - CT_GetFile "glibc-${CT_LIBC_VERSION}" \ - https://releases.linaro.org/${YYMM}/components/toolchain/glibc-linaro \ - http://cbuild.validation.linaro.org/snapshots - else - CT_GetFile "glibc-${CT_LIBC_VERSION}" \ - {http,ftp,https}://ftp.gnu.org/gnu/glibc \ - ftp://{sourceware.org,gcc.gnu.org}/pub/glibc/{releases,snapshots} - fi + case "${CT_LIBC_VERSION}" in + linaro-*) + CT_GetLinaro "glibc" "${CT_LIBC_VERSION}" + ;; + *) + CT_GetFile "glibc-${CT_LIBC_VERSION}" \ + {http,ftp,https}://ftp.gnu.org/gnu/glibc \ + ftp://{sourceware.org,gcc.gnu.org}/pub/glibc/{releases,snapshots} + ;; + esac fi return 0 diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index 0a87581e..06e88e4d 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -17,15 +17,18 @@ do_libc_get() { CT_GetCustom "newlib" "${CT_LIBC_NEWLIB_CUSTOM_VERSION}" \ "${CT_LIBC_NEWLIB_CUSTOM_LOCATION}" else # ! custom location - if echo ${CT_LIBC_VERSION} |grep -q linaro; then - YYMM=`echo ${CT_LIBC_VERSION} |cut -d- -f3 |sed -e 's,^..,,'` - CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src} \ - https://releases.linaro.org/${YYMM}/components/toolchain/newlib-linaro \ - http://cbuild.validation.linaro.org/snapshots - else - CT_GetFile "newlib-${CT_LIBC_VERSION}" ${libc_src} \ - http://mirrors.kernel.org/sources.redhat.com/newlib - fi + case "${CT_LIBC_VERSION}" in + linaro-*) + CT_GetLinaro "newlib" "${CT_LIBC_VERSION}" + ;; + *) + # kernel.org mirror is outdated, keep last as a fallback + CT_GetFile "newlib-${CT_LIBC_VERSION}" \ + ftp://sourceware.org/pub/newlib \ + http://mirrors.kernel.org/sourceware/newlib \ + http://mirrors.kernel.org/sources.redhat.com/newlib + ;; + esac fi # ! custom location } |