Skip to content

Commit af38d0b

Browse files
57300nordicjm
authored andcommitted
[nrf fromlist] scripts: Undo Board.{dir -> directories[0]} renames
Upstream PR: zephyrproject-rtos/zephyr#72857 `Board.dir` can be used in place of `Board.directories[0]` for brevity. Signed-off-by: Grzegorz Swiderski <[email protected]> (cherry picked from commit 103f7b59548cf5d809d1f105c5c0e2e94396cdfc)
1 parent a51f1aa commit af38d0b

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

doc/_extensions/zephyr/kconfig/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ def kconfig_load(app: Sphinx) -> Tuple[kconfiglib.Kconfig, Dict[str, str]]:
127127
board_str = 'BOARD_' + re.sub(r"[^a-zA-Z0-9_]", "_", qualifier).upper()
128128
f.write('config ' + board_str + '\n')
129129
f.write('\t bool\n')
130-
f.write('source "' +
131-
(board.directories[0] / ('Kconfig.' + board.name)).as_posix() + '"\n\n')
130+
f.write('source "' + (board.dir / ('Kconfig.' + board.name)).as_posix() + '"\n\n')
132131

133132
# base environment
134133
os.environ["ZEPHYR_BASE"] = str(ZEPHYR_BASE)

scripts/ci/check_compliance.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,7 @@ def get_v2_model(self, kconfig_dir, settings_file):
479479

480480
with open(kconfig_defconfig_file, 'w') as fp:
481481
for board in v2_boards:
482-
fp.write('osource "' +
483-
(board.directories[0] / 'Kconfig.defconfig').as_posix() + '"\n')
482+
fp.write('osource "' + (Path(board.dir) / 'Kconfig.defconfig').as_posix() + '"\n')
484483

485484
with open(kconfig_boards_file, 'w') as fp:
486485
for board in v2_boards:
@@ -493,16 +492,15 @@ def get_v2_model(self, kconfig_dir, settings_file):
493492
fp.write('config ' + board_str + '\n')
494493
fp.write('\t bool\n')
495494
fp.write(
496-
'source "' +
497-
(board.directories[0] / ('Kconfig.' + board.name)).as_posix() + '"\n\n'
495+
'source "' + (Path(board.dir) / ('Kconfig.' + board.name)).as_posix() + '"\n\n'
498496
)
499497

500498
with open(kconfig_file, 'w') as fp:
501499
fp.write(
502500
'osource "' + (Path(kconfig_dir) / 'boards' / 'Kconfig.syms.v1').as_posix() + '"\n'
503501
)
504502
for board in v2_boards:
505-
fp.write('osource "' + (Path(board.directories[0]) / 'Kconfig').as_posix() + '"\n')
503+
fp.write('osource "' + (Path(board.dir) / 'Kconfig').as_posix() + '"\n')
506504

507505
kconfig_defconfig_file = os.path.join(kconfig_dir, 'soc', 'Kconfig.defconfig')
508506
kconfig_soc_file = os.path.join(kconfig_dir, 'soc', 'Kconfig.soc')

scripts/ci/test_plan.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ def find_boards(self):
242242
for changed in changed_boards:
243243
for board in known_boards:
244244
c = (zephyr_base / changed).resolve()
245-
if c.is_relative_to(board.directories[0].resolve()):
245+
if c.is_relative_to(board.dir.resolve()):
246246
for file in glob.glob(os.path.join(board.dir, f"{board.name}*.yaml")):
247247
with open(file, 'r') as f:
248248
b = yaml.load(f.read(), Loader=SafeLoader)

scripts/list_boards.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ def dump_boards(args):
445445
if args.cmakeformat is not None:
446446
info = args.cmakeformat.format(
447447
NAME='NAME;' + board.name,
448-
DIR='DIR;' + str(board.directories.as_posix()),
448+
DIR='DIR;' + str(board.dir.as_posix()),
449449
HWM='HWM;' + board.hwm,
450450
VENDOR='VENDOR;NOTFOUND',
451451
REVISION_DEFAULT='REVISION_DEFAULT;NOTFOUND',

scripts/west_commands/boards.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,5 @@ def do_run(self, args, _):
9898
for board in list_boards.find_v2_boards(args).values():
9999
if name_re is not None and not name_re.search(board.name):
100100
continue
101-
log.inf(args.format.format(name=board.name, arch='', dir=board.directories[0],
102-
hwm=board.hwm,
101+
log.inf(args.format.format(name=board.name, arch='', dir=board.dir, hwm=board.hwm,
103102
qualifiers=list_boards.board_v2_qualifiers_csv(board)))

0 commit comments

Comments
 (0)