@@ -392,19 +392,18 @@ def create_tab_file(self, binaries):
392
392
assert self .args .application
393
393
info ("Generating Tock TAB file for application/example {}" .format (
394
394
self .args .application ))
395
- package_parameter = "-n"
396
395
elf2tab_ver = self .checked_command_output (["elf2tab" , "--version" ]).split (
397
- " " , maxsplit = 1 )[1 ]
398
- # Starting from v0.5.0-dev the parameter changed.
399
- # Current pyblished crate is 0.4.0 but we don't want developers
400
- # running the HEAD from github to be stuck
401
- if "0.5.0-dev" in elf2tab_ver :
402
- package_parameter = "--package-name"
396
+ "\n " , maxsplit = 1 )[0 ]
397
+ if elf2tab_ver != "elf2tab 0.5.0" :
398
+ error (
399
+ ("Detected unsupported elf2tab version {!a}. The following "
400
+ "commands may fail. Please use 0.5.0 instead." ).format (elf2tab_ver ))
403
401
os .makedirs (self .tab_folder , exist_ok = True )
404
402
tab_filename = os .path .join (self .tab_folder ,
405
403
"{}.tab" .format (self .args .application ))
406
404
elf2tab_args = [
407
- "elf2tab" , package_parameter , self .args .application , "-o" , tab_filename
405
+ "elf2tab" , "--deterministic" , "--package-name" , self .args .application ,
406
+ "-o" , tab_filename
408
407
]
409
408
if self .args .verbose_build :
410
409
elf2tab_args .append ("--verbose" )
0 commit comments