From bae28d9e863cdc51cbb26ccaefe8143bc2f4eda3 Mon Sep 17 00:00:00 2001 From: Sorixelle Date: Mon, 1 Apr 2019 20:33:04 +1100 Subject: [PATCH 1/5] Add support for Void Linux systems to the qmk_install.sh script --- util/linux_install.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/util/linux_install.sh b/util/linux_install.sh index d21cd3c1c9f2..1450b72c9763 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -180,6 +180,29 @@ elif grep ID /etc/os-release | grep -q solus; then unzip printf "\n$SOLUS_INFO\n" +elif grep ID /etc/os-release | grep -q void; then + # musl Void systems don't have glibc cross compilers avaliable in their repos. + # glibc Void systems do have musl cross compilers though, for some reason. + # So, default to musl, and switch to glibc is glibc is detected. + CROSS_ARM=cross-arm-linux-musleabi + if xbps-query glibc > /dev/null; then # Check is glibc is installed + CROSS_ARM=cross-arm-linux-gnueabi + fi + + sudo xbps-install \ + avr-binutils \ + avr-gcc \ + avr-libc \ + make \ + gcc \ + zip \ + unzip \ + wget \ + git \ + dfu-programmer \ + dfu-util \ + $CROSS_ARM + else echo "Sorry, we don't recognize your OS. Help us by contributing support!" echo From 1bc886b32f234631f8f7587d18834f9389b25cba Mon Sep 17 00:00:00 2001 From: Sorixelle Date: Mon, 1 Apr 2019 20:42:54 +1100 Subject: [PATCH 2/5] Fix typos + grammatical edits in comments --- util/linux_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/linux_install.sh b/util/linux_install.sh index 1450b72c9763..18f0165294a0 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -183,9 +183,9 @@ elif grep ID /etc/os-release | grep -q solus; then elif grep ID /etc/os-release | grep -q void; then # musl Void systems don't have glibc cross compilers avaliable in their repos. # glibc Void systems do have musl cross compilers though, for some reason. - # So, default to musl, and switch to glibc is glibc is detected. + # So, default to musl, and switch to glibc if it is installed. CROSS_ARM=cross-arm-linux-musleabi - if xbps-query glibc > /dev/null; then # Check is glibc is installed + if xbps-query glibc > /dev/null; then # Check is glibc if installed CROSS_ARM=cross-arm-linux-gnueabi fi From 8df19dcd503e582313da26c4d5142ef0bf8bd559 Mon Sep 17 00:00:00 2001 From: Sorixelle Date: Tue, 2 Apr 2019 20:13:19 +1100 Subject: [PATCH 3/5] Sort distributions by alphabetical order in linux_install.sh --- util/linux_install.sh | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/util/linux_install.sh b/util/linux_install.sh index 18f0165294a0..8a691b42f2a9 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -16,11 +16,10 @@ if grep ID /etc/os-release | grep -qE "fedora"; then arm-none-eabi-gcc-cs \ arm-none-eabi-newlib \ avr-binutils \ - avr-gcc \ avr-libc \ - binutils-avr32-linux-gnu \ + avr-gcc \ + base-devel \ dfu-util \ - dfu-programmer \ diffutils \ git \ gcc \ @@ -33,6 +32,10 @@ if grep ID /etc/os-release | grep -qE "fedora"; then unzip \ wget \ zip + git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer + cd /tmp/dfu-programmer || exit 1 + makepkg -sic + rm -rf /tmp/dfu-programmer/ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then DEBIAN_FRONTEND=noninteractive @@ -65,21 +68,23 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then arm-none-eabi-newlib \ avrdude \ avr-binutils \ - avr-libc \ avr-gcc \ - base-devel \ + avr-libc \ + binutils-avr32-linux-gnu \ dfu-util \ + dfu-programmer \ diffutils \ - gcc \ git \ + gcc \ + glibc-headers \ + kernel-devel \ + kernel-headers \ + make \ + perl \ python \ unzip \ wget \ zip - git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer - cd /tmp/dfu-programmer || exit 1 - makepkg -sic - rm -rf /tmp/dfu-programmer/ elif grep ID /etc/os-release | grep -q gentoo; then echo "$GENTOO_WARNING" | fmt From 41ecda84f78fb29d0eddff7674637a0f2dafd478 Mon Sep 17 00:00:00 2001 From: Sorixelle Date: Wed, 3 Apr 2019 08:49:51 +1100 Subject: [PATCH 4/5] Revert previous commit and sort Void packages in alphabetical order --- util/linux_install.sh | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) mode change 100755 => 100644 util/linux_install.sh diff --git a/util/linux_install.sh b/util/linux_install.sh old mode 100755 new mode 100644 index 8a691b42f2a9..16a22edc35d8 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -16,10 +16,11 @@ if grep ID /etc/os-release | grep -qE "fedora"; then arm-none-eabi-gcc-cs \ arm-none-eabi-newlib \ avr-binutils \ - avr-libc \ avr-gcc \ - base-devel \ + avr-libc \ + binutils-avr32-linux-gnu \ dfu-util \ + dfu-programmer \ diffutils \ git \ gcc \ @@ -32,10 +33,6 @@ if grep ID /etc/os-release | grep -qE "fedora"; then unzip \ wget \ zip - git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer - cd /tmp/dfu-programmer || exit 1 - makepkg -sic - rm -rf /tmp/dfu-programmer/ elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then DEBIAN_FRONTEND=noninteractive @@ -68,23 +65,21 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then arm-none-eabi-newlib \ avrdude \ avr-binutils \ - avr-gcc \ avr-libc \ - binutils-avr32-linux-gnu \ + avr-gcc \ + base-devel \ dfu-util \ - dfu-programmer \ diffutils \ - git \ gcc \ - glibc-headers \ - kernel-devel \ - kernel-headers \ - make \ - perl \ + git \ python \ unzip \ wget \ zip + git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer + cd /tmp/dfu-programmer || exit 1 + makepkg -sic + rm -rf /tmp/dfu-programmer/ elif grep ID /etc/os-release | grep -q gentoo; then echo "$GENTOO_WARNING" | fmt @@ -198,15 +193,15 @@ elif grep ID /etc/os-release | grep -q void; then avr-binutils \ avr-gcc \ avr-libc \ - make \ - gcc \ - zip \ - unzip \ - wget \ - git \ + $CROSS_ARM \ dfu-programmer \ dfu-util \ - $CROSS_ARM + gcc \ + git \ + make \ + wget \ + unzip \ + zip else echo "Sorry, we don't recognize your OS. Help us by contributing support!" From 629d32353ac7928d5f3424950eafb1305b0104c1 Mon Sep 17 00:00:00 2001 From: Sorixelle Date: Sat, 4 May 2019 19:54:14 +1000 Subject: [PATCH 5/5] Fix permissions on `util/linux_install.sh` --- util/linux_install.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 util/linux_install.sh diff --git a/util/linux_install.sh b/util/linux_install.sh old mode 100644 new mode 100755