diff options
author | Nick Brassel <nick@tzarc.org> | 2022-11-28 07:54:00 +1100 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2022-11-28 07:54:00 +1100 |
commit | 4020674163fc80914059c4c9c3be5c0ae00bd150 (patch) | |
tree | 6f4187d72b04d03572adf507502afbda9726d696 /util/install/fedora.sh | |
parent | 8f9b49dc5b05fd3421e47aa76822a5b2199dfca6 (diff) | |
parent | 9e78e65a566487b2f4fe7b663971a01deb6ddad2 (diff) |
Merge remote-tracking branch 'upstream/develop'0.19.0
Diffstat (limited to 'util/install/fedora.sh')
-rwxr-xr-x | util/install/fedora.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/util/install/fedora.sh b/util/install/fedora.sh index 6380f6d33f..03e05a42fe 100755 --- a/util/install/fedora.sh +++ b/util/install/fedora.sh @@ -8,7 +8,12 @@ _qmk_install() { clang diffutils git gcc glibc-headers kernel-devel kernel-headers \ 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 + arm-none-eabi-newlib avrdude dfu-programmer dfu-util hidapi + + # Handle discrepancies between different Fedora versions + sudo dnf $SKIP_PROMPT install libusb-devel \ + || sudo dnf $SKIP_PROMPT install libusb1-devel libusb-compat-0.1-devel \ + || sudo dnf $SKIP_PROMPT install libusb0-devel python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt } |