Merge branch 'qmk:master' into master

Ardakilic · Feb 17, 2025 · 48d811e · 48d811e
2 parents 51bec16 + ad2c0f3
commit 48d811e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -45,7 +45,7 @@ jobs:
           stale-pr-label: stale
           days-before-pr-stale: 45
           days-before-pr-close: 30
-          exempt-pr-labels: bug,awaiting review,breaking_change,in progress,on hold
+          exempt-pr-labels: bug,awaiting review,breaking_change,in progress,on hold,needs-core-wireless,crippled-firmware
 
           stale-pr-message: >
             Thank you for your contribution!

diff --git a/lib/python/qmk/cli/format/text.py b/lib/python/qmk/cli/format/text.py
@@ -18,7 +18,7 @@ def _get_chunks(it, size):
 def dos2unix_run(files):
     """Spawn multiple dos2unix subprocess avoiding too long commands on formatting everything
     """
-    for chunk in _get_chunks(files, 10):
+    for chunk in _get_chunks([normpath(file).as_posix() for file in files], 10):
         dos2unix = cli.run(['dos2unix', *chunk])
 
         if dos2unix.returncode:

diff --git a/util/install/gentoo.sh b/util/install/gentoo.sh
@@ -22,7 +22,7 @@ _qmk_install() {
     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 \
+        app-arch/unzip app-arch/zip net-misc/wget llvm-core/clang \
         sys-devel/crossdev \>=dev-lang/python-3.7 dev-embedded/avrdude \
         dev-embedded/dfu-programmer app-mobilephone/dfu-util sys-apps/hwloc \
         dev-libs/hidapi