From 5806432619d0d5cc9d3736c4a3cfff419eea55a0 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Wed, 7 Oct 2020 12:19:46 -0700 Subject: [PATCH] [script] fix arm-gcc toolchain install on ubuntu (#5613) --- script/bootstrap | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index f3ceb2464..3e11b5be5 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -44,20 +44,16 @@ install_packages_apt() echo 'Installing GNU Arm Embedded Toolchain...' PLATFORM=$(lsb_release -is) - RELEASE=$(lsb_release -rs) - UBUNTU2004=20.04 if [ "$PLATFORM" = "Raspbian" ]; then sudo apt-get --no-install-recommends install -y binutils-arm-none-eabi gcc-arm-none-eabi gdb-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib - elif [ "$PLATFORM" = "Ubuntu" ] && [[ ! $RELEASE < $UBUNTU2004 ]]; then - echo "Ubuntu Release >= $UBUNTU2004" - # no need to use ppa - sudo apt-get --no-install-recommends install -y gcc-arm-none-eabi gdb-multiarch libnewlib-arm-none-eabi - elif ! command -v arm-none-eabi-g++; then - # add gcc-arm-embedded ppa - sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa -y - sudo apt-get update - sudo apt-get --no-install-recommends install -y gcc-arm-embedded + elif [ "$PLATFORM" = "Ubuntu" ]; then + sudo apt-get --no-install-recommends install -y ca-certificates wget + (cd /opt \ + && wget -c https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 \ + && tar xjf gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 \ + && rm gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 \ + && ln -s /opt/gcc-arm-none-eabi-9-2020-q2-update/bin/* /usr/local/bin/.) fi echo 'Installing pretty tools useful for code contributions...'