Revert "sdm710-common: releasetools: Fix on incremental updates"

This reverts commit 01254bd847.
This commit is contained in:
Roker2 2023-10-15 15:21:03 +02:00 committed by CakesTwix
parent ef2362021f
commit 05959f652a
Signed by: CakesTwix
GPG key ID: 7B11051D5CE19825

View file

@ -18,15 +18,13 @@ import common
import re import re
def FullOTA_InstallEnd(info): def FullOTA_InstallEnd(info):
input_zip = info.input_zip
OTA_UpdateFirmware(info) OTA_UpdateFirmware(info)
OTA_InstallEnd(info, input_zip) OTA_InstallEnd(info)
return return
def IncrementalOTA_InstallEnd(info): def IncrementalOTA_InstallEnd(info):
input_zip = info.target_zip
OTA_UpdateFirmware(info) OTA_UpdateFirmware(info)
OTA_InstallEnd(info, input_zip) OTA_InstallEnd(info)
return return
def OTA_UpdateFirmware(info): def OTA_UpdateFirmware(info):
@ -59,14 +57,14 @@ def OTA_UpdateFirmware(info):
info.script.AppendExtra('package_extract_file("install/firmware-update/xbl.elf", "/dev/block/bootdevice/by-name/xblbak");') info.script.AppendExtra('package_extract_file("install/firmware-update/xbl.elf", "/dev/block/bootdevice/by-name/xblbak");')
info.script.AppendExtra('package_extract_file("install/firmware-update/NON-HLOS.bin", "/dev/block/bootdevice/by-name/modem");') info.script.AppendExtra('package_extract_file("install/firmware-update/NON-HLOS.bin", "/dev/block/bootdevice/by-name/modem");')
def AddImage(info, input_zip, basename, dest): def AddImage(info, basename, dest):
name = basename name = basename
data = input_zip.read("IMAGES/" + basename) data = info.input_zip.read("IMAGES/" + basename)
common.ZipWriteStr(info.output_zip, name, data) common.ZipWriteStr(info.output_zip, name, data)
info.script.Print("Patching {} image unconditionally...".format(dest.split('/')[-1])) info.script.Print("Patching {} image unconditionally...".format(dest.split('/')[-1]))
info.script.AppendExtra('package_extract_file("%s", "%s");' % (name, dest)) info.script.AppendExtra('package_extract_file("%s", "%s");' % (name, dest))
def OTA_InstallEnd(info, input_zip): def OTA_InstallEnd(info):
AddImage(info, input_zip, "vbmeta.img", "/dev/block/bootdevice/by-name/vbmeta") AddImage(info, "vbmeta.img", "/dev/block/bootdevice/by-name/vbmeta")
AddImage(info, input_zip, "dtbo.img", "/dev/block/bootdevice/by-name/dtbo") AddImage(info, "dtbo.img", "/dev/block/bootdevice/by-name/dtbo")
return return