author | Dmitry Shmidt <dimitrysh@google.com> | 2018-10-30 17:00:14 (GMT) |
---|---|---|
committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2018-10-30 17:00:14 (GMT) |
commit | 63cb2b9c28caf97aa1463c3a22d6647a77e4616d (patch) | |
tree | c0bb4903431469b0f9a9d35fd0a7f01efa3930c1 | |
parent | 578d9eeae13ff15c45072c572ca47f0992c47c68 (diff) | |
parent | 6506fa849a4e6c65275b66e102c538953cbc4247 (diff) | |
download | common-63cb2b9c28caf97aa1463c3a22d6647a77e4616d.zip common-63cb2b9c28caf97aa1463c3a22d6647a77e4616d.tar.gz common-63cb2b9c28caf97aa1463c3a22d6647a77e4616d.tar.bz2 |
Merge "ota: ota: update bootloader first when partition tab change [3/4]" into p-tv-dev
-rwxr-xr-x | releasetools.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/releasetools.py b/releasetools.py index 3e52136..17582fe 100755 --- a/releasetools.py +++ b/releasetools.py @@ -177,6 +177,14 @@ def BuildCustomerIncrementalImage(info, *par, **dictarg): def FullOTA_Assertions(info): print "amlogic extensions:FullOTA_Assertions" + try: + bootloader_img = info.input_zip.read("RADIO/bootloader.img") + except KeyError: + OPTIONS.ota_partition_change = False + print "no bootloader.img in target_files; skipping install" + else: + OPTIONS.ota_partition_change = True + common.ZipWriteStr(info.output_zip, "bootloader.img", bootloader_img) if OPTIONS.ota_zip_check: info.script.AppendExtra('if ota_zip_check() == "1" then') info.script.AppendExtra('set_bootloader_env("upgrade_step", "3");') @@ -184,6 +192,9 @@ def FullOTA_Assertions(info): info.script.AppendExtra('write_dtb_image(package_extract_file("dt.img"));') info.script.AppendExtra('backup_data_cache(recovery, /cache/recovery/);') info.script.WriteRawImage("/recovery", "recovery.img") + if OPTIONS.ota_partition_change: + info.script.AppendExtra('ui_print("update bootloader.img...");') + info.script.AppendExtra('write_bootloader_image(package_extract_file("bootloader.img"));') info.script.AppendExtra('reboot_recovery();') info.script.AppendExtra('else') @@ -231,12 +242,7 @@ package_extract_file("recovery.img", "/dev/block/recovery"); ui_print("update vbmeta.img..."); package_extract_file("vbmeta.img", "/dev/block/vbmeta");""") - try: - bootloader_img = info.input_zip.read("RADIO/bootloader.img") - except KeyError: - print "no bootloader.img in target_files; skipping install" - else: - common.ZipWriteStr(info.output_zip, "bootloader.img", bootloader_img) + if OPTIONS.ota_partition_change: info.script.AppendExtra('ui_print("update bootloader.img...");') info.script.AppendExtra('write_bootloader_image(package_extract_file("bootloader.img"));') |