Skip to content

Commit f922948

Browse files
committed
[nrf fromtree] scripts: ci: check_compliance: Inline creation of HWMv2 temp dirs
The KCONFIG_BINARY_DIR/{boards,soc,arch}/ directories are only relevant for `KconfigCheck.get_v2_model()`, so generate them within this method. Signed-off-by: Grzegorz Swiderski <[email protected]> (cherry picked from commit 37bce60)
1 parent 32a2c2d commit f922948

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

scripts/ci/check_compliance.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,12 @@ def get_v2_model(self, kconfig_dir, settings_file):
493493
This is needed to complete Kconfig sanity tests.
494494
"""
495495
os.environ['HWM_SCHEME'] = 'v2'
496+
os.environ["KCONFIG_BOARD_DIR"] = os.path.join(kconfig_dir, 'boards')
497+
498+
os.makedirs(os.path.join(kconfig_dir, 'boards'), exist_ok=True)
499+
os.makedirs(os.path.join(kconfig_dir, 'soc'), exist_ok=True)
500+
os.makedirs(os.path.join(kconfig_dir, 'arch'), exist_ok=True)
501+
496502
kconfig_file = os.path.join(kconfig_dir, 'boards', 'Kconfig')
497503
kconfig_boards_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.boards')
498504
kconfig_defconfig_file = os.path.join(kconfig_dir, 'boards', 'Kconfig.defconfig')
@@ -601,14 +607,7 @@ def parse_kconfig(self):
601607
# For Kconfig.dts support
602608
self.get_kconfig_dts(os.path.join(kconfiglib_dir, "Kconfig.dts"),
603609
os.path.join(kconfiglib_dir, "settings_file.txt"))
604-
605-
# To make compliance work with old hw model and HWMv2 simultaneously.
606-
kconfiglib_boards_dir = os.path.join(kconfiglib_dir, 'boards')
607-
os.makedirs(kconfiglib_boards_dir, exist_ok=True)
608-
os.makedirs(os.path.join(kconfiglib_dir, 'soc'), exist_ok=True)
609-
os.makedirs(os.path.join(kconfiglib_dir, 'arch'), exist_ok=True)
610-
611-
os.environ["KCONFIG_BOARD_DIR"] = kconfiglib_boards_dir
610+
# For hardware model support (board, soc, arch)
612611
self.get_v2_model(kconfiglib_dir, os.path.join(kconfiglib_dir, "settings_file.txt"))
613612

614613
# Tells Kconfiglib to generate warnings for all references to undefined

0 commit comments

Comments
 (0)