alex/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Avoid duplication in generated community modules rules.mk (#25135)

Browse Source
This commit is contained in:
Joel Challis
2025-04-23 01:27:47 +01:00
committed by GitHub
parent 7a2cd0fa96
commit 8cd71917ce
4 changed files with 72 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/python/qmk/info.py
View File

@@ -1066,23 +1066,13 @@ def get_modules(keyboard, keymap_filename):
"""
modules = []
kb_info_json = info_json(keyboard)
modules.extend(kb_info_json.get('modules', []))
if keymap_filename:
keymap_json = parse_configurator_json(keymap_filename)
if keymap_json:
kb = keymap_json.get('keyboard', None)
if not kb:
kb = keyboard
if kb:
kb_info_json = info_json(kb)
if kb_info_json:
modules.extend(kb_info_json.get('modules', []))
modules.extend(keymap_json.get('modules', []))
elif keyboard:
kb_info_json = info_json(keyboard)
modules.extend(kb_info_json.get('modules', []))
return list(dict.fromkeys(modules)) # remove dupes