aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorJames Forcier <csssuf@users.noreply.github.com>2020-04-12 02:13:45 -0400
committerGitHub <noreply@github.com>2020-04-12 16:13:45 +1000
commitf538b2273a4b9126b5dbfb54218dc40df047b249 (patch)
tree44f6c7f940c82254d66c58fe1cec1921272b5e3c /util
parent50e85f91e87f7fdb2e64b2d79c49c742f2f6e768 (diff)
downloadqmk_firmware-f538b2273a4b9126b5dbfb54218dc40df047b249.tar.gz
qmk_firmware-f538b2273a4b9126b5dbfb54218dc40df047b249.zip
Upgrade gcc version/tweak package installs in Gentoo installation (#8757)
GCC 4.9.4 is no longer available on Gentoo (or Sabayon), which causes problems when attempting to install on either of these platforms. Since QMK is not particularly sensitive to its GCC version, modify the version restriction to <9 so newer versions of GCC may be installed. Since the toolchain for arm-none-eabi isn't currently installed as part of setup, add that as well. Additionally, drop the Python installation as part of the Gentoo installation process. Python is a core system package on Gentoo and can therefore be assumed to be present; in addition, the slot restriction of 3.5 which was present is also no longer available in Gentoo. Finally, separate the gcc rebuild invocation of `emerge` from the new packages that may need to be installed, and apply the `--noreplace` flag to new packages so that they are not rebuilt if already present.
Diffstat (limited to 'util')
-rwxr-xr-xutil/linux_install.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/util/linux_install.sh b/util/linux_install.sh
index 048b2f318..9ef064157 100755
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -105,17 +105,17 @@ elif grep ID /etc/os-release | grep -q gentoo; then
105 sudo touch /etc/portage/package.use/qmkfirmware 105 sudo touch /etc/portage/package.use/qmkfirmware
106 # tee is used here since sudo doesn't apply to >> 106 # tee is used here since sudo doesn't apply to >>
107 echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null 107 echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
108 sudo emerge -auN \ 108 sudo emerge -auN sys-devel/gcc
109 sudo emerge -au --noreplace \
109 app-arch/unzip \ 110 app-arch/unzip \
110 app-arch/zip \ 111 app-arch/zip \
111 app-mobilephone/dfu-util \ 112 app-mobilephone/dfu-util \
112 dev-embedded/avrdude \ 113 dev-embedded/avrdude \
113 dev-lang/python:3.5 \
114 net-misc/wget \ 114 net-misc/wget \
115 sys-devel/clang \ 115 sys-devel/clang \
116 sys-devel/gcc \
117 sys-devel/crossdev 116 sys-devel/crossdev
118 sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr 117 sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr
118 sudo crossdev -s4 --stable --g \<9 --portage --verbose --target arm-none-eabi
119 echo "Done!" 119 echo "Done!"
120 else 120 else
121 echo "Quitting..." 121 echo "Quitting..."
@@ -132,7 +132,8 @@ elif grep ID /etc/os-release | grep -q sabayon; then
132 sys-devel/clang \ 132 sys-devel/clang \
133 sys-devel/gcc \ 133 sys-devel/gcc \
134 sys-devel/crossdev 134 sys-devel/crossdev
135 sudo crossdev -s4 --stable --g =4.9.4 --portage --verbose --target avr 135 sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr
136 sudo crossdev -s4 --stable --g \<9 --portage --verbose --target arm-none-eabi
136 echo "Done!" 137 echo "Done!"
137 138
138elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then 139elif grep ID /etc/os-release | grep -qE "opensuse|tumbleweed"; then