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 | |
| parent | 8f9b49dc5b05fd3421e47aa76822a5b2199dfca6 (diff) | |
| parent | 9e78e65a566487b2f4fe7b663971a01deb6ddad2 (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'util')
| -rwxr-xr-x | util/install/fedora.sh | 7 | ||||
| -rwxr-xr-x | util/install/gentoo.sh | 2 | ||||
| -rwxr-xr-x | util/list_keyboards.sh | 16 |
3 files changed, 9 insertions, 16 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 } diff --git a/util/install/gentoo.sh b/util/install/gentoo.sh index b031fc7629..49e80490be 100755 --- a/util/install/gentoo.sh +++ b/util/install/gentoo.sh @@ -19,7 +19,7 @@ _qmk_install() { sudo touch /etc/portage/package.use/qmkfirmware # tee is used here since sudo doesn't apply to >> - echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null + echo "sys-devel/gcc multilib\ncross-arm-none-eabi/newlib nano" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null sudo emerge -auN sys-devel/gcc sudo emerge -au --noreplace \ app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang \ diff --git a/util/list_keyboards.sh b/util/list_keyboards.sh index aa6ed1c6af..0d1dae888f 100755 --- a/util/list_keyboards.sh +++ b/util/list_keyboards.sh @@ -1,18 +1,6 @@ #!/bin/sh # Temporary shell script to find keyboards # -# This allows us to exclude keyboards by including a .noci file. +# This allows us to include DEFAULT_FOLDER targets. -find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | while read keyboard; do - if [ "$1" = "noci" ]; then - case "$keyboard" in - handwired/*) - ;; - *) - test -e "keyboards/${keyboard}/.noci" || echo "$keyboard" - ;; - esac - else - echo "$keyboard" - fi -done +find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' |