diff options
| author | Ryan <fauxpark@gmail.com> | 2022-07-03 00:08:05 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-02 15:08:05 +0100 |
| commit | 25033d5d9ee1298c719d8e33a96eb7cabb9c04ac (patch) | |
| tree | 75f2ca5feeb228188855b16d7e8f28952ee91d75 /util | |
| parent | 1cffe5b6ce764f4ff0d07e93669a425773ccc103 (diff) | |
MSYS2 install: use MinGW python-qmk package (#17302)
* MSYS2 install: use MinGW python-qmk package
* Add missing flashers
* Note VC Redist for manual install
* VC Redist no longer needed
Diffstat (limited to 'util')
| -rwxr-xr-x | util/install/msys2.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/util/install/msys2.sh b/util/install/msys2.sh index c57c455eb4..fa422023ab 100755 --- a/util/install/msys2.sh +++ b/util/install/msys2.sh | |||
| @@ -7,17 +7,14 @@ _qmk_install_prepare() { | |||
| 7 | _qmk_install() { | 7 | _qmk_install() { |
| 8 | echo "Installing dependencies" | 8 | echo "Installing dependencies" |
| 9 | 9 | ||
| 10 | pacman --needed --noconfirm --disable-download-timeout -S pactoys-git | 10 | pacman --needed --noconfirm --disable-download-timeout -S pactoys |
| 11 | pacboy sync --needed --noconfirm --disable-download-timeout \ | 11 | pacboy sync --needed --noconfirm --disable-download-timeout \ |
| 12 | base-devel: toolchain:x clang:x git: unzip: python3-pip:x \ | 12 | base-devel: toolchain:x clang:x python-qmk:x hidapi:x \ |
| 13 | avr-binutils:x avr-gcc:x avr-libc:x arm-none-eabi-binutils:x \ | 13 | avr-binutils:x avr-gcc:x avr-libc:x \ |
| 14 | arm-none-eabi-gcc:x arm-none-eabi-newlib:x avrdude:x bootloadhid:x \ | 14 | arm-none-eabi-binutils:x arm-none-eabi-gcc:x arm-none-eabi-newlib:x \ |
| 15 | dfu-programmer:x dfu-util:x teensy-loader-cli:x hidapi:x \ | 15 | avrdude:x bootloadhid:x dfu-programmer:x dfu-util:x hid-bootloader-cli:x mdloader:x teensy-loader-cli:x wb32-dfu-updater:x |
| 16 | python-appdirs:x python-colorama:x python-jsonschema:x python-pillow:x python-pygments:x | ||
| 17 | 16 | ||
| 18 | _qmk_install_drivers | 17 | _qmk_install_drivers |
| 19 | |||
| 20 | python3 -m pip install -r "$QMK_FIRMWARE_DIR/requirements.txt" | ||
| 21 | } | 18 | } |
| 22 | 19 | ||
| 23 | _qmk_install_drivers() { | 20 | _qmk_install_drivers() { |
