ceres-sees-all/qmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Fix USER_PATH resolution on case-insensitive filesystems (#25853)

Browse source 
When QMK_USERSPACE is empty, the wildcard check in build_keyboard.mk
incorrectly matches user home directories on case-insensitive filesystems
(macOS/Windows), causing USER_PATH to resolve to an absolute path instead
of a relative path.

This only affects users whose username matches their user directory name
(e.g., username 'psycher' with home '/Users/psycher' and QMK user dir
'users/psycher').

Fix by checking if QMK_USERSPACE is non-empty before performing the
wildcard check.
This commit is contained in:
psych3r 2025-12-06 00:25:48 +02:00 • committed by GitHub
parent 1322922c42
commit 08e5fcfdf4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
builddefs/build_keyboard.mk
View file

@ -474,8 +474,10 @@ ifneq ($(wildcard $(QMK_USERSPACE)),)
endif endif
# If the equivalent users directory exists in userspace, use that in preference to anything currently in the main repo # If the equivalent users directory exists in userspace, use that in preference to anything currently in the main repo
ifneq ($(wildcard $(QMK_USERSPACE)/$(USER_PATH)),) ifneq ($(QMK_USERSPACE),)
USER_PATH := $(QMK_USERSPACE)/$(USER_PATH) ifneq ($(wildcard $(QMK_USERSPACE)/$(USER_PATH)),)
USER_PATH := $(QMK_USERSPACE)/$(USER_PATH)
endif
endif endif
# Pull in user level rules.mk # Pull in user level rules.mk