summaryrefslogtreecommitdiff
path: root/util/install
diff options
context:
space:
mode:
Diffstat (limited to 'util/install')
-rwxr-xr-xutil/install/fedora.sh6
-rwxr-xr-xutil/install/msys2.sh13
2 files changed, 8 insertions, 11 deletions
diff --git a/util/install/fedora.sh b/util/install/fedora.sh
index b140438b42..6380f6d33f 100755
--- a/util/install/fedora.sh
+++ b/util/install/fedora.sh
@@ -6,9 +6,9 @@ _qmk_install() {
# TODO: Check whether devel/headers packages are really needed
sudo dnf $SKIP_PROMPT install \
clang diffutils git gcc glibc-headers kernel-devel kernel-headers \
- make unzip wget zip python3 avr-binutils avr-gcc avr-libc \
- arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-newlib \
- avrdude dfu-programmer dfu-util hidapi libusb1-devel
+ make unzip wget zip python3 avr-binutils avr-gcc avr-gcc-c++ avr-libc \
+ arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-gcc-cs-c++ \
+ arm-none-eabi-newlib avrdude dfu-programmer dfu-util hidapi libusb-devel
python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
}
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() {
_qmk_install() {
echo "Installing dependencies"
- pacman --needed --noconfirm --disable-download-timeout -S pactoys-git
+ pacman --needed --noconfirm --disable-download-timeout -S pactoys
pacboy sync --needed --noconfirm --disable-download-timeout \
- base-devel: toolchain:x clang:x git: unzip: python3-pip:x \
- avr-binutils:x avr-gcc:x avr-libc:x arm-none-eabi-binutils:x \
- arm-none-eabi-gcc:x arm-none-eabi-newlib:x avrdude:x bootloadhid:x \
- dfu-programmer:x dfu-util:x teensy-loader-cli:x hidapi:x \
- python-appdirs:x python-colorama:x python-jsonschema:x python-pillow:x python-pygments:x
+ base-devel: toolchain:x clang:x python-qmk:x hidapi:x \
+ avr-binutils:x avr-gcc:x avr-libc:x \
+ arm-none-eabi-binutils:x arm-none-eabi-gcc:x arm-none-eabi-newlib:x \
+ avrdude:x bootloadhid:x dfu-programmer:x dfu-util:x hid-bootloader-cli:x mdloader:x teensy-loader-cli:x wb32-dfu-updater:x
_qmk_install_drivers
-
- python3 -m pip install -r "$QMK_FIRMWARE_DIR/requirements.txt"
}
_qmk_install_drivers() {