| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-01 06:43:39 (GMT) |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2018-11-01 06:43:39 (GMT) |
| commit | 64bc3b285adffe51e42a93c3f3055c888c8a6350 (patch) | |
| tree | 9a38d6a7e7feaf765d91c12f37ecf67b377d230c | |
| parent | 98ab49af5a0d03f064c66375fdc74af1a08f7fd1 (diff) | |
| parent | df8668660b38d9dac0da89e6d7992a0cbe8415dc (diff) | |
| download | common-64bc3b285adffe51e42a93c3f3055c888c8a6350.zip common-64bc3b285adffe51e42a93c3f3055c888c8a6350.tar.gz common-64bc3b285adffe51e42a93c3f3055c888c8a6350.tar.bz2 | |
Merge "ota: fixed incremental ota upgrade failed[1/1]" into p-tv-dev
| -rw-r--r-- | factory.mk | 2 | ||||
| -rwxr-xr-x | releasetools.py | 9 |
2 files changed, 8 insertions, 3 deletions
@@ -324,6 +324,7 @@ ifeq ($(NO_AMLOGIC_FACTORY_ZIP),) cp $(AML_TARGET)/IMAGES/system.img $(PRODUCT_OUT)/system.img cp $(AML_TARGET)/IMAGES/vendor.img $(PRODUCT_OUT)/vendor.img cp $(AML_TARGET)/IMAGES/vbmeta.img $(PRODUCT_OUT)/vbmeta.img + cp $(AML_TARGET)/IMAGES/boot.img $(PRODUCT_OUT)/boot.img $(hide) $(foreach file,$(UPGRADE_FILES), \ echo cp $(file) $(PRODUCT_UPGRADE_OUT)/$(notdir $(file)); \ cp -f $(file) $(PRODUCT_UPGRADE_OUT)/$(notdir $(file)); \ @@ -386,6 +387,7 @@ $(INSTALLED_AML_FASTBOOT_ZIP): $(addprefix $(PRODUCT_OUT)/,$(FASTBOOT_IMAGES)) $ cp $(AML_TARGET)/IMAGES/system.img $(PRODUCT_OUT)/system.img cp $(AML_TARGET)/IMAGES/vendor.img $(PRODUCT_OUT)/vendor.img cp $(AML_TARGET)/IMAGES/vbmeta.img $(PRODUCT_OUT)/vbmeta.img + cp $(AML_TARGET)/IMAGES/boot.img $(PRODUCT_OUT)/boot.img rm -rf $(PRODUCT_OUT)/fastboot mkdir -p $(PRODUCT_OUT)/fastboot cd $(PRODUCT_OUT); cp $(FASTBOOT_IMAGES) fastboot/; diff --git a/releasetools.py b/releasetools.py index 17582fe..5eca124 100755 --- a/releasetools.py +++ b/releasetools.py @@ -282,7 +282,7 @@ def IncrementalOTA_InstallBegin(info): def IncrementalOTA_ImageCheck(info, name): source_image = False; target_image = False; updating_image = False; - image_path = name.upper() + "/" + name + image_path = "IMAGES/" + name + ".img" image_name = name + ".img" if HasTargetImage(info.source_zip, image_path): @@ -301,7 +301,7 @@ def IncrementalOTA_ImageCheck(info, name): message_process = "install " + name + " image..." info.script.Print(message_process); common.ZipWriteStr(info.output_zip, image_name, target_image.data) - if name == "dtb": + if name == "dt": info.script.WriteDtbImage(image_name) else: info.script.WriteRawImage("/" + name, image_name) @@ -316,5 +316,8 @@ def IncrementalOTA_ImageCheck(info, name): def IncrementalOTA_InstallEnd(info): print "amlogic extensions:IncrementalOTA_InstallEnd" IncrementalOTA_ImageCheck(info, "logo"); - IncrementalOTA_ImageCheck(info, "dtb"); + IncrementalOTA_ImageCheck(info, "dt"); + IncrementalOTA_ImageCheck(info, "recovery"); + IncrementalOTA_ImageCheck(info, "vbmeta"); + info.script.FormatPartition("/metadata") IncrementalOTA_ImageCheck(info, "bootloader"); |