diff options
| author | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
| commit | 27fc28fd2ff52e079a5bc58d6aaea4c752420615 (patch) | |
| tree | 7ac943fb1ba4f430a7220efd18f66f6a77205c30 /util/install | |
| parent | e736133392fe6427cfb995da0787337189828272 (diff) | |
| parent | 2709b6ed616f8012ff4cfd3ee69a822a8d188351 (diff) | |
Merge upstream master
Diffstat (limited to 'util/install')
| -rwxr-xr-x | util/install/fedora.sh | 11 | ||||
| -rwxr-xr-x | util/install/gentoo.sh | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/util/install/fedora.sh b/util/install/fedora.sh index 4227906ad9..03e05a42fe 100755 --- a/util/install/fedora.sh +++ b/util/install/fedora.sh @@ -6,9 +6,14 @@ _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 libusb-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 + + # 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 \ |