From 84ef82423686d8e213083cc81040353435dfc680 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 29 Sep 2022 10:28:39 -0600
Subject: =?UTF-8?q?Gentoo=20install=20script=20=E2=80=94=20build=20newlib?=
 =?UTF-8?q?=20with=20nano=20USE=20flag=20(#18527)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 util/install/gentoo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/install/gentoo.sh b/util/install/gentoo.sh
index b031fc7629..49e80490be 100755
--- a/util/install/gentoo.sh
+++ b/util/install/gentoo.sh
@@ -19,7 +19,7 @@ _qmk_install() {
 
     sudo touch /etc/portage/package.use/qmkfirmware
     # tee is used here since sudo doesn't apply to >>
-    echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
+    echo "sys-devel/gcc multilib\ncross-arm-none-eabi/newlib nano" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
     sudo emerge -auN sys-devel/gcc
     sudo emerge -au --noreplace \
         app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang \
-- 
cgit v1.2.3


From fe577daf966f34ae056f685c5a260473635c5ec8 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 21 Nov 2022 02:03:38 +0000
Subject: Remove .noci functionality (#19122)

---
 util/list_keyboards.sh | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'util')

diff --git a/util/list_keyboards.sh b/util/list_keyboards.sh
index aa6ed1c6af..0d1dae888f 100755
--- a/util/list_keyboards.sh
+++ b/util/list_keyboards.sh
@@ -1,18 +1,6 @@
 #!/bin/sh
 # Temporary shell script to find keyboards
 #
-# This allows us to exclude keyboards by including a .noci file.
+# This allows us to include DEFAULT_FOLDER targets.
 
-find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | while read keyboard; do
-	if [ "$1" = "noci" ]; then
-		case "$keyboard" in
-			handwired/*)
-				;;
-			*)
-				test -e "keyboards/${keyboard}/.noci" || echo "$keyboard"
-				;;
-		esac
-	else
-		echo "$keyboard"
-	fi
-done
+find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!'
-- 
cgit v1.2.3


From ad7b095da6b2a51a310725c1c0fcb6571b46e7e7 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 27 Nov 2022 04:16:08 +1100
Subject: Fixup installation procedure for different Fedora versions. (#19159)

---
 util/install/fedora.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/install/fedora.sh b/util/install/fedora.sh
index 6380f6d33f..03e05a42fe 100755
--- a/util/install/fedora.sh
+++ b/util/install/fedora.sh
@@ -8,7 +8,12 @@ _qmk_install() {
         clang diffutils git gcc glibc-headers kernel-devel kernel-headers \
         make unzip wget zip python3 avr-binutils avr-gcc avr-gcc-c++ avr-libc \
         arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-gcc-cs-c++ \
-        arm-none-eabi-newlib avrdude dfu-programmer dfu-util hidapi libusb-devel
+        arm-none-eabi-newlib avrdude dfu-programmer dfu-util hidapi
+
+    # Handle discrepancies between different Fedora versions
+    sudo dnf $SKIP_PROMPT install libusb-devel \
+        || sudo dnf $SKIP_PROMPT install libusb1-devel libusb-compat-0.1-devel \
+        || sudo dnf $SKIP_PROMPT install libusb0-devel
 
     python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
 }
-- 
cgit v1.2.3