Skip to content

Commit 1688700

Browse files
andy31415pull[bot]
authored andcommitted
Fix telink examples on vscode image (#22911)
* Fix telink builds on vscode: force more env variables set * Fix unit tests
1 parent bcf3f3b commit 1688700

2 files changed

Lines changed: 31 additions & 17 deletions

File tree

scripts/build/builders/telink.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,26 @@ def __init__(self,
6767
self.app = app
6868
self.board = board
6969

70-
def generate(self):
71-
if os.path.exists(self.output_dir):
72-
return
73-
70+
def get_cmd_prefixes(self):
7471
if not self._runner.dry_run:
7572
# Zephyr base
7673
if 'TELINK_ZEPHYR_BASE' not in os.environ:
7774
raise Exception("Telink builds require TELINK_ZEPHYR_BASE")
7875

79-
cmd = 'export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"\n'
76+
cmd = 'export ZEPHYR_TOOLCHAIN_VARIANT=zephyr\n'
77+
cmd += 'export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"\n'
8078

8179
if 'TELINK_ZEPHYR_SDK_DIR' in os.environ:
8280
cmd += 'export ZEPHYR_SDK_INSTALL_DIR="$TELINK_ZEPHYR_SDK_DIR"\n'
8381

82+
return cmd
83+
84+
def generate(self):
85+
if os.path.exists(self.output_dir):
86+
return
87+
88+
cmd = self.get_cmd_prefixes()
8489
cmd += '''
85-
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
8690
source "$ZEPHYR_BASE/zephyr-env.sh";
8791
west build --cmake-only -d {outdir} -b {board} {sourcedir}
8892
'''.format(
@@ -97,8 +101,9 @@ def generate(self):
97101
def _build(self):
98102
logging.info('Compiling Telink at %s', self.output_dir)
99103

100-
self._Execute(['ninja', '-C', self.output_dir],
101-
title='Building ' + self.identifier)
104+
cmd = self.get_cmd_prefixes() + ("ninja -C %s" % self.output_dir)
105+
106+
self._Execute(['bash', '-c', cmd], title='Building ' + self.identifier)
102107

103108
def build_outputs(self):
104109
return {

scripts/build/testdata/build_all_except_host.txt

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,23 +1163,23 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa
11631163
gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/shell/qpg '--args=qpg_target_ic="qpg6105"' {out}/qpg-shell
11641164

11651165
# Generating telink-tlsr9518adk80d-light
1166-
bash -c 'export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"
1166+
bash -c 'export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
1167+
export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"
11671168
export ZEPHYR_SDK_INSTALL_DIR="$TELINK_ZEPHYR_SDK_DIR"
1168-
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
11691169
source "$ZEPHYR_BASE/zephyr-env.sh";
11701170
west build --cmake-only -d {out}/telink-tlsr9518adk80d-light -b tlsr9518adk80d {root}/examples/lighting-app/telink'
11711171

11721172
# Generating telink-tlsr9518adk80d-light-switch
1173-
bash -c 'export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"
1173+
bash -c 'export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
1174+
export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"
11741175
export ZEPHYR_SDK_INSTALL_DIR="$TELINK_ZEPHYR_SDK_DIR"
1175-
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
11761176
source "$ZEPHYR_BASE/zephyr-env.sh";
11771177
west build --cmake-only -d {out}/telink-tlsr9518adk80d-light-switch -b tlsr9518adk80d {root}/examples/light-switch-app/telink'
11781178

11791179
# Generating telink-tlsr9518adk80d-ota-requestor
1180-
bash -c 'export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"
1180+
bash -c 'export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
1181+
export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"
11811182
export ZEPHYR_SDK_INSTALL_DIR="$TELINK_ZEPHYR_SDK_DIR"
1182-
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
11831183
source "$ZEPHYR_BASE/zephyr-env.sh";
11841184
west build --cmake-only -d {out}/telink-tlsr9518adk80d-ota-requestor -b tlsr9518adk80d {root}/examples/ota-requestor-app/telink'
11851185

@@ -2402,13 +2402,22 @@ ninja -C {out}/qpg-persistent-storage
24022402
ninja -C {out}/qpg-shell
24032403

24042404
# Building telink-tlsr9518adk80d-light
2405-
ninja -C {out}/telink-tlsr9518adk80d-light
2405+
bash -c 'export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
2406+
export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"
2407+
export ZEPHYR_SDK_INSTALL_DIR="$TELINK_ZEPHYR_SDK_DIR"
2408+
ninja -C {out}/telink-tlsr9518adk80d-light'
24062409

24072410
# Building telink-tlsr9518adk80d-light-switch
2408-
ninja -C {out}/telink-tlsr9518adk80d-light-switch
2411+
bash -c 'export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
2412+
export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"
2413+
export ZEPHYR_SDK_INSTALL_DIR="$TELINK_ZEPHYR_SDK_DIR"
2414+
ninja -C {out}/telink-tlsr9518adk80d-light-switch'
24092415

24102416
# Building telink-tlsr9518adk80d-ota-requestor
2411-
ninja -C {out}/telink-tlsr9518adk80d-ota-requestor
2417+
bash -c 'export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
2418+
export ZEPHYR_BASE="$TELINK_ZEPHYR_BASE"
2419+
export ZEPHYR_SDK_INSTALL_DIR="$TELINK_ZEPHYR_SDK_DIR"
2420+
ninja -C {out}/telink-tlsr9518adk80d-ota-requestor'
24122421

24132422
# Building tizen-arm-all-clusters
24142423
ninja -C {out}/tizen-arm-all-clusters

0 commit comments

Comments
 (0)