diff --git a/make/tool_install/gcc-arm-none-eabi.sh b/make/tool_install/gcc-arm-none-eabi.sh index 807709175..6e19cd4d0 100644 --- a/make/tool_install/gcc-arm-none-eabi.sh +++ b/make/tool_install/gcc-arm-none-eabi.sh @@ -1,24 +1,26 @@ if [ "$uname" = Linux ] then - url_ext="linux.tar.bz2" + url_ext="x86_64-linux.tar.bz2" + tool_md5="2383e4eb4ea23f248d33adc70dc3227e" elif [ "$uname" = Darwin ] then url_ext="mac.tar.bz2" + tool_md5="7f2a7b7b23797302a9d6182c6e482449" elif [ "$uname" = Windows ] then url_ext="win32.zip" + tool_md5="2bc8f0c4c4659f8259c8176223eeafc1" depends=(7z) fi -pkgver=4.9_2015_q2_update -pkgdate=20150609 +pkgver=10.3-2021.10 _pkgver=${pkgver//_/-} _pkgvershort=${_pkgver%-*} _pkgvershort=${_pkgvershort/-q/q} -tool_url="https://launchpad.net/gcc-arm-embedded/${pkgver%%_*}/${_pkgver}/+download/${tool}-${_pkgvershort/./_}-${pkgdate}-${url_ext}" -tool_md5_url="${tool_url}/+md5" -tool_install_name="${tool}-${_pkgvershort/./_}" +tool_url="https://developer.arm.com/-/media/Files/downloads/gnu-rm/${pkgver}/${tool}-${pkgver}-${url_ext}" +#tool_install_name="${tool}-${_pkgvershort/./_}" +tool_install_name="${tool}-${pkgver}" if [ "$uname" = Windows ] then tool_extract_dir=$tools_dir/$tool_install_name diff --git a/tool_install.sh b/tool_install.sh index 670b35730..3a41fddbc 100755 --- a/tool_install.sh +++ b/tool_install.sh @@ -191,7 +191,7 @@ function download_and_verify fi elif [ -n "${tool_md5:-}" ] then - if [[ "$tool_md5"* != "$(cd "$downloads_dir" && md5sum "$downloaded_file")" ]] + if [[ "${tool_md5:-} -" != "$(cd "$downloads_dir" && md5sum <"$downloaded_file")" ]] then mv -f "$downloaded_file"{,.rej} && \ verified=false