summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xutil/linux_install.sh10
1 files changed, 3 insertions, 7 deletions
diff --git a/util/linux_install.sh b/util/linux_install.sh
index fa8afdcda6..d3b79942ab 100755
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -60,9 +60,8 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
zip
elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
- # install avr-gcc 8.1 until 8.3 is available. See #3657 for details of the bug.
- sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.1.0-1-x86_64.pkg.tar.xz
- sudo pacman -S \
+ sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz
+ sudo pacman -S --needed \
arm-none-eabi-binutils \
arm-none-eabi-gcc \
arm-none-eabi-newlib \
@@ -71,6 +70,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
avr-gcc \
base-devel \
clang \
+ dfu-programmer \
dfu-util \
diffutils \
gcc \
@@ -79,10 +79,6 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
unzip \
wget \
zip
- git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer
- cd /tmp/dfu-programmer || exit 1
- makepkg -sic
- rm -rf /tmp/dfu-programmer/
elif grep ID /etc/os-release | grep -q gentoo; then
echo "$GENTOO_WARNING" | fmt