From f0d07ae6d311698adf9e2593701a4263235caa41 Mon Sep 17 00:00:00 2001 From: Yaoxing Shan Date: Wed, 3 Jun 2020 12:17:15 +0800 Subject: [PATCH] [bootstrap] remove PPA on Ubuntu 20.04 and later (#5009) --- script/bootstrap | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/script/bootstrap b/script/bootstrap index 9754dd30f..d4d64eaaf 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -40,9 +40,15 @@ install_packages_apt() sudo apt-get --no-install-recommends install -y automake g++ libtool lsb-release make cmake ninja-build 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" ] && [ "$(echo "$RELEASE >= $UBUNTU2004" | bc)" -eq 1 ]; then + echo "Ubuntu Release >= $UBUNTU2004" + # no need to use ppa + sudo apt-get --no-install-recommends install -y gcc-arm-none-eabi gdb-multiarch elif ! command -v arm-none-eabi-g++; then # add gcc-arm-embedded ppa sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa -y