Add a better Docker build script + update Dockerfile (#4222)

[qmk_firmware.git] / util / linux_install.sh

diff --git a/util/linux_install.sh b/util/linux_install.sh
index 971d4c543c05d3fae63a1c8797580be64d98e1c9..70b389c0da542e3d6e6c571032b1a92fd8c8aec8 100755 (executable)
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -61,9 +61,9 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
                avr-binutils \
                avr-libc \
                avr-gcc \
-    base-devel \
+               base-devel \
                dfu-util \
-               diff-utils \
+               diffutils \
                gcc \
                git \
                unzip \
@@ -112,12 +112,15 @@ 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
                CROSS_AVR_GCC=cross-avr-gcc7
+               CROSS_ARM_GCC=cross-arm-none-gcc7
        fi
        sudo zypper install \
                avr-libc \
                $CROSS_AVR_GCC \
+               $CROSS_ARM_GCC \
                cross-avr-binutils \
                cross-arm-none-newlib-devel \
                cross-arm-binutils cross-arm-none-newlib-devel \