diff options
| author | Cory Watson <watson.cory@protonmail.com> | 2019-09-02 10:32:14 -0400 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2019-09-26 10:08:39 +0900 |
| commit | db4445e870ca7f5ea7ba72867d876e5f44b85433 (patch) | |
| tree | 5f5bae270a37877bf7e22c7d8044a4f6e2a9de88 /util/linux_install.sh | |
| parent | 9bc4684371c8feab58751c558edaf2b9d5007889 (diff) | |
Add `dfu-programmer` to `pacman -S` (#6619)
* Add `dfu-programmer` to `pacman -S` (#6618)
`dfu-programmer` now resides at `extra/dfu-programmer` and is no longer
in the AUR
* Add `--needed` option to `pacman -S` for efficiency
* Fix
* Update util/linux_install.sh
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Diffstat (limited to 'util/linux_install.sh')
| -rwxr-xr-x | util/linux_install.sh | 10 |
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 |