From cd336b2b545798269405e8ffef0fe8958d4d27d4 Mon Sep 17 00:00:00 2001 From: Zach White Date: Sat, 13 Feb 2021 10:26:45 -0800 Subject: bump to python 3.7 (#11408) --- util/install/gentoo.sh | 2 +- util/install/opensuse.sh | 31 ------------------------------- util/install/sabayon.sh | 15 --------------- util/qmk_install.sh | 8 ++------ 4 files changed, 3 insertions(+), 53 deletions(-) delete mode 100755 util/install/opensuse.sh delete mode 100755 util/install/sabayon.sh (limited to 'util') diff --git a/util/install/gentoo.sh b/util/install/gentoo.sh index d4284e9a93..97eb5df07f 100755 --- a/util/install/gentoo.sh +++ b/util/install/gentoo.sh @@ -23,7 +23,7 @@ _qmk_install() { sudo emerge -auN sys-devel/gcc sudo emerge -au --noreplace \ app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang sys-devel/crossdev \ - \>=dev-lang/python-3.6 \ + \>=dev-lang/python-3.7 \ dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr diff --git a/util/install/opensuse.sh b/util/install/opensuse.sh deleted file mode 100755 index 47b44ae364..0000000000 --- a/util/install/opensuse.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -_qmk_install_prepare() { - case $(grep ID /etc/os-release) in - *15.1*) - REPO_RELEASE=Leap_15.1;; - *15.2*) - REPO_RELEASE=Leap_15.2;; - *) - #REPO_RELEASE=Tumbleweed;; - echo "ERROR: Tumbleweed is currently not supported." - exit 1 - esac - - sudo zypper addrepo https://download.opensuse.org/repositories/devel:gcc/openSUSE_$REPO_RELEASE/devel:gcc.repo - sudo zypper addrepo https://download.opensuse.org/repositories/hardware/openSUSE_$REPO_RELEASE/hardware.repo - sudo zypper --gpg-auto-import-keys refresh -} - -_qmk_install() { - echo "Installing dependencies" - - sudo zypper install -y \ - make clang gcc unzip wget zip \ - python3-pip \ - cross-avr-binutils cross-avr-gcc8 avr-libc \ - cross-arm-binutils cross-arm-none-gcc8 cross-arm-none-newlib-devel \ - avrdude dfu-programmer dfu-util - - python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt -} diff --git a/util/install/sabayon.sh b/util/install/sabayon.sh deleted file mode 100755 index fd4f4d8dfd..0000000000 --- a/util/install/sabayon.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -_qmk_install() { - echo "Installing dependencies" - - sudo equo install \ - app-arch/unzip app-arch/zip net-misc/wget dev-vcs/git sys-devel/clang sys-devel/gcc sys-devel/crossdev \ - dev-python/pip \ - dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util - - sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr - sudo crossdev -s4 --stable --g \<9 --portage --verbose --target arm-none-eabi - - python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt -} diff --git a/util/qmk_install.sh b/util/qmk_install.sh index 5076e980a2..421a91a999 100755 --- a/util/qmk_install.sh +++ b/util/qmk_install.sh @@ -25,10 +25,6 @@ case $(uname -a) in . "$QMK_FIRMWARE_UTIL_DIR/install/fedora.sh";; *gentoo*) . "$QMK_FIRMWARE_UTIL_DIR/install/gentoo.sh";; - *opensuse*|*tumbleweed*) - . "$QMK_FIRMWARE_UTIL_DIR/install/opensuse.sh";; - *sabayon*) - . "$QMK_FIRMWARE_UTIL_DIR/install/sabayon.sh";; *slackware*) . "$QMK_FIRMWARE_UTIL_DIR/install/slackware.sh";; *solus*) @@ -36,9 +32,9 @@ case $(uname -a) in *void*) . "$QMK_FIRMWARE_UTIL_DIR/install/void.sh";; *) - echo "Sorry, we don't recognize your distribution. Help us by contributing support!" + echo "Sorry, we don't recognize your distribution. Try using the docker image instead:" echo - echo "https://docs.qmk.fm/#/contributing" + echo "https://docs.qmk.fm/#/getting_started_docker" exit 1;; esac -- cgit v1.2.1