StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "releasetools: Allow using futility-host to sign old TF.zip."

Browse Source 
am: 48a3ccbf1b

Change-Id: I6efee0b3a6c5b4c7d9cf3ca90a0e2e4c39470853
This commit is contained in:
Tao Bao
2017-02-18 22:56:56 +00:00
committed by android-build-merger
parent dc7d29ed86 48a3ccbf1b
commit aa778c7af4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/common.py
View File

@@ -518,7 +518,13 @@ def _BuildBootableImage(sourcedir, fs_config_file, info_dict=None,
elif info_dict.get("vboot", None): elif info_dict.get("vboot", None):
path = "/" + os.path.basename(sourcedir).lower() path = "/" + os.path.basename(sourcedir).lower()
img_keyblock = tempfile.NamedTemporaryFile() img_keyblock = tempfile.NamedTemporaryFile()
cmd = [info_dict["vboot_signer_cmd"], info_dict["futility"], # We have switched from the prebuilt futility binary to using the tool
# (futility-host) built from the source. Override the setting in the old
# TF.zip.
futility = info_dict["futility"]
if futility.startswith("prebuilts/"):
futility = "futility-host"
cmd = [info_dict["vboot_signer_cmd"], futility,
img_unsigned.name, info_dict["vboot_key"] + ".vbpubk", img_unsigned.name, info_dict["vboot_key"] + ".vbpubk",
info_dict["vboot_key"] + ".vbprivk", info_dict["vboot_key"] + ".vbprivk",
info_dict["vboot_subkey"] + ".vbprivk", info_dict["vboot_subkey"] + ".vbprivk",