Install elf2tab in its own directory.

This commit is contained in:
Guillaume Endignoux
2020-09-29 12:42:48 +02:00
parent af4d554d01
commit 70482a2f21
4 changed files with 14 additions and 11 deletions

View File

@@ -404,9 +404,9 @@ class OpenSKInstaller:
assert self.args.application
info("Generating Tock TAB file for application/example {}".format(
self.args.application))
elf2tab_ver = self.checked_command_output(["bin/elf2tab",
"--version"]).split(
"\n", maxsplit=1)[0]
elf2tab_ver = self.checked_command_output(
["elf2tab/bin/elf2tab", "--version"]).split(
"\n", maxsplit=1)[0]
if elf2tab_ver != "elf2tab 0.6.0":
error(
("Detected unsupported elf2tab version {!a}. The following "
@@ -415,7 +415,7 @@ class OpenSKInstaller:
tab_filename = os.path.join(self.tab_folder,
"{}.tab".format(self.args.application))
elf2tab_args = [
"bin/elf2tab", "--deterministic", "--package-name",
"elf2tab/bin/elf2tab", "--deterministic", "--package-name",
self.args.application, "-o", tab_filename
]
if self.args.verbose_build: