From ad7b095da6b2a51a310725c1c0fcb6571b46e7e7 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 27 Nov 2022 04:16:08 +1100 Subject: [PATCH] Fixup installation procedure for different Fedora versions. (#19159) --- util/install/fedora.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/install/fedora.sh b/util/install/fedora.sh index 6380f6d33f9..03e05a42fec 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 }