OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

scripts: xtensa-build-zephyr.py fix for windows 

West tool returns on windows OS different white characters
than on Linux OS. Paths outputted from west tool had been
stripped for any trailing whitespaces.
Fixes "xtensa-build-zephyr.py: use west manifest"
(608833cf27)

Signed-off-by: Andrey Borisovich <andrey.borisovich@intel.com>
This commit is contained in:
Andrey Borisovich 2022-08-11 02:44:10 +02:00 committed by Liam Girdwood
parent 167e62df0d
commit ecbbd1b5d1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/xtensa-build-zephyr.py
View File

@ -325,13 +325,13 @@ def west_init_if_needed():
if result_rootdir.returncode != 0:
execute_command(["west", "init", "-l", f"{SOF_TOP}"], cwd=west_top)
return
west_root_dir = pathlib.Path(result_rootdir.stdout.decode().strip('\n')).resolve()
west_root_dir = pathlib.Path(result_rootdir.stdout.decode().rstrip()).resolve()
result_manifest_dir = execute_command(["west", "config", "manifest.path"], capture_output=True,
cwd=west_top, timeout=10, check=True)
west_manifest_dir = pathlib.Path(west_root_dir, result_manifest_dir.stdout.decode().strip('\n')).resolve()
west_manifest_dir = pathlib.Path(west_root_dir, result_manifest_dir.stdout.decode().rstrip()).resolve()
manifest_file_result = execute_command(["west", "config", "manifest.file"], capture_output=True,
cwd=west_top, timeout=10, check=True)
returned_manifest_path = pathlib.Path(west_manifest_dir, manifest_file_result.stdout.decode().strip('\n'))
returned_manifest_path = pathlib.Path(west_manifest_dir, manifest_file_result.stdout.decode().rstrip())
if not returned_manifest_path.samefile(west_manifest_path):
west_reinitialize(west_root_dir, returned_manifest_path)
else: