kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install a local elf2tab binary within the repo itself

Browse Source
This commit is contained in:
coelner
2020-08-18 17:01:50 +02:00
parent 55c9053baf
commit ef40657c27
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
bin/
target/ target/
Cargo.lock Cargo.lock

7
deploy.py
View File

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

2
setup.sh
View File

@@ -42,4 +42,4 @@ pip3 install --user --upgrade 'tockloader==1.5' six intelhex
rustup target add thumbv7em-none-eabi rustup target add thumbv7em-none-eabi
# Install dependency to create applications. # Install dependency to create applications.
cargo install elf2tab --version 0.6.0 cargo install elf2tab --version 0.6.0 --root .