From 93a97ec6e5a8f193bb96bba1636b7f67cd47d3fc Mon Sep 17 00:00:00 2001 From: zvecr Date: Tue, 14 May 2019 20:05:09 +0100 Subject: Fix arch installs as 8.1 is unavailable and #5456 has been merged (#5857) --- util/linux_install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'util/linux_install.sh') diff --git a/util/linux_install.sh b/util/linux_install.sh index 5e2afe999..df7039e09 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -54,8 +54,7 @@ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then zip elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then - # install avr-gcc 8.1 until 8.3 is available. See #3657 for details of the bug. - sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.1.0-1-x86_64.pkg.tar.xz + sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz sudo pacman -S \ arm-none-eabi-binutils \ arm-none-eabi-gcc \ -- cgit v1.2.3 From 7fbb253f88b6a87f5d39662273b4d6e57619de53 Mon Sep 17 00:00:00 2001 From: chax Date: Tue, 21 May 2019 12:01:11 +0200 Subject: Add Solus support to linux_install.sh script --- util/linux_install.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'util/linux_install.sh') diff --git a/util/linux_install.sh b/util/linux_install.sh index df7039e09..fb003270b 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -6,6 +6,8 @@ GENTOO_WARNING="This script will make a USE change in order to ensure that that SLACKWARE_WARNING="You will need the following packages from slackbuilds.org:\n\tarm-binutils\n\tarm-gcc\n\tavr-binutils\n\tavr-gcc\n\tavr-libc\n\tavrdude\n\tdfu-programmer\n\tdfu-util\n\tnewlib\nThese packages will be installed with sudo and sboinstall, so ensure that your user is added to sudoers and that sboinstall is configured." +SOLUS_INFO="Your tools are now installed. To start using them, open new terminal or source these scripts:\n\t/usr/share/defaults/etc/profile.d/50-arm-toolchain-path.sh\n\t/usr/share/defaults/etc/profile.d/50-avr-toolchain-path.sh" + if grep ID /etc/os-release | grep -qE "fedora"; then sudo dnf install \ arm-none-eabi-binutils-cs \ @@ -155,6 +157,25 @@ elif grep ID /etc/os-release | grep -q slackware; then echo "Quitting..." fi +elif grep ID /etc/os-release | grep -q solus; then + sudo eopkg it \ + -c system.devel \ + arm-none-eabi-gcc \ + arm-none-eabi-binutils \ + arm-none-eabi-newlib \ + avr-libc \ + avr-binutils \ + avr-gcc \ + avrdude \ + dfu-util \ + dfu-programmer \ + python3 \ + git \ + wget \ + zip \ + unzip + printf "\n$SOLUS_INFO\n" + else echo "Sorry, we don't recognize your OS. Help us by contributing support!" echo -- cgit v1.2.3 From 0d12627f0b7fb3ea6438234b775b0c63a656891a Mon Sep 17 00:00:00 2001 From: chax Date: Wed, 22 May 2019 14:08:35 +0200 Subject: Add Solus support to linux_install.sh script added update-repo command before install command --- util/linux_install.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'util/linux_install.sh') diff --git a/util/linux_install.sh b/util/linux_install.sh index fb003270b..3df7c0b2a 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -158,6 +158,7 @@ elif grep ID /etc/os-release | grep -q slackware; then fi elif grep ID /etc/os-release | grep -q solus; then + sudo eopkg ur sudo eopkg it \ -c system.devel \ arm-none-eabi-gcc \ -- cgit v1.2.3 From 5f69ca47ffa5cfe18d68196a2d689e3a5e8d2e04 Mon Sep 17 00:00:00 2001 From: Yusuke Nakamura Date: Sun, 16 Jun 2019 03:32:06 +0900 Subject: Install avrdude in Arch/Manjaro Linux (#6132) avrdude is require package but not installed by script when arch linux. --- util/linux_install.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'util/linux_install.sh') diff --git a/util/linux_install.sh b/util/linux_install.sh index 3df7c0b2a..efb2ee774 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -61,6 +61,7 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then arm-none-eabi-binutils \ arm-none-eabi-gcc \ arm-none-eabi-newlib \ + avrdude \ avr-binutils \ avr-libc \ avr-gcc \ -- cgit v1.2.3 From 78b9922fc427aabe5e0b2f3376982d43be878935 Mon Sep 17 00:00:00 2001 From: Kenny Hung Date: Fri, 5 Jul 2019 12:52:54 +0100 Subject: Fix linux_install.sh script for OpenSuse v 15.1 (#6251) --- util/linux_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/linux_install.sh') diff --git a/util/linux_install.sh b/util/linux_install.sh index efb2ee774..a1ee79205 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -118,7 +118,7 @@ elif grep ID /etc/os-release | grep -q sabayon; then elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then CROSS_AVR_GCC=cross-avr-gcc8 CROSS_ARM_GCC=cross-arm-none-gcc8 - if grep ID /etc/os-release | grep -q "15.0"; then + if grep ID /etc/os-release | grep -q "15."; then CROSS_AVR_GCC=cross-avr-gcc7 CROSS_ARM_GCC=cross-arm-none-gcc7 fi -- cgit v1.2.3 From 607f6f5c1605afd7ed64160d4e7bb11db38c3e38 Mon Sep 17 00:00:00 2001 From: zjp Date: Wed, 10 Jul 2019 23:22:23 -0500 Subject: Fix typo in Gentoo docstring (#6303) --- util/linux_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/linux_install.sh') diff --git a/util/linux_install.sh b/util/linux_install.sh index a1ee79205..4731ec015 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -2,7 +2,7 @@ # Note: This file uses tabs to indent. Please don't mix tabs and spaces. -GENTOO_WARNING="This script will make a USE change in order to ensure that that QMK works on your system. All changes will be sent to the the file /etc/portage/package.use/qmk_firmware -- please review it, and read Portage's output carefully before installing any packages on your system. You will also need to ensure that your kernel is compiled with support for the keyboard chip that you are using (e.g. enable Arduino for the Pro Micro). Further information can be found on the Gentoo wiki." +GENTOO_WARNING="This script will make a USE change in order to ensure that that QMK works on your system. All changes will be sent to the the file /etc/portage/package.use/qmkfirmware -- please review it, and read Portage's output carefully before installing any packages on your system. You will also need to ensure that your kernel is compiled with support for the keyboard chip that you are using (e.g. enable Arduino for the Pro Micro). Further information can be found on the Gentoo wiki." SLACKWARE_WARNING="You will need the following packages from slackbuilds.org:\n\tarm-binutils\n\tarm-gcc\n\tavr-binutils\n\tavr-gcc\n\tavr-libc\n\tavrdude\n\tdfu-programmer\n\tdfu-util\n\tnewlib\nThese packages will be installed with sudo and sboinstall, so ensure that your user is added to sudoers and that sboinstall is configured." -- cgit v1.2.3