From 0c0687e74c0a78c0a5c524331b6234b847c56a9b Mon Sep 17 00:00:00 2001 From: CoryWatson Date: Mon, 26 Aug 2019 22:29:27 -0400 Subject: [PATCH 1/2] 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 --- util/linux_install.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/util/linux_install.sh b/util/linux_install.sh index d21cd3c1c9f2..cecf50fa8c1a 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -59,7 +59,7 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then 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 \ + sudo pacman -S --needed \ arm-none-eabi-binutils \ arm-none-eabi-gcc \ arm-none-eabi-newlib \ @@ -68,6 +68,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then avr-libc \ avr-gcc \ base-devel \ + dfu-programmer \ dfu-util \ diffutils \ gcc \ @@ -76,10 +77,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 From 8865d031c7cdc54fbadaeea2410a8c10f9d37bf6 Mon Sep 17 00:00:00 2001 From: Cory Watson Date: Tue, 27 Aug 2019 13:46:32 -0400 Subject: [PATCH 2/2] Update util/linux_install.sh Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> --- util/linux_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/linux_install.sh b/util/linux_install.sh index cecf50fa8c1a..369232e3b8fa 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -68,7 +68,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then avr-libc \ avr-gcc \ base-devel \ - dfu-programmer \ + dfu-programmer \ dfu-util \ diffutils \ gcc \