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

am fb8886db: get_stage in updater takes one param, not two.

Browse Source 
* commit 'fb8886db6858388af5082268fd023b8a44fb87ea':
  get_stage in updater takes one param, not two.
This commit is contained in:
Michael Runge
2014-10-23 21:57:12 +00:00
committed by Android Git Automerger
parent 4f072e140b fb8886db68
commit 46fe30eff7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/ota_from_target_files
View File

@@ -528,13 +528,13 @@ def WriteFullOTAPackage(input_zip, output_zip):
bcb_dev = {"bcb_dev": fs.device} bcb_dev = {"bcb_dev": fs.device}
common.ZipWriteStr(output_zip, "recovery.img", recovery_img.data) common.ZipWriteStr(output_zip, "recovery.img", recovery_img.data)
script.AppendExtra(""" script.AppendExtra("""
if get_stage("%(bcb_dev)s", "stage") == "2/3" then if get_stage("%(bcb_dev)s") == "2/3" then
""" % bcb_dev) """ % bcb_dev)
script.WriteRawImage("/recovery", "recovery.img") script.WriteRawImage("/recovery", "recovery.img")
script.AppendExtra(""" script.AppendExtra("""
set_stage("%(bcb_dev)s", "3/3"); set_stage("%(bcb_dev)s", "3/3");
reboot_now("%(bcb_dev)s", "recovery"); reboot_now("%(bcb_dev)s", "recovery");
else if get_stage("%(bcb_dev)s", "stage") == "3/3" then else if get_stage("%(bcb_dev)s") == "3/3" then
""" % bcb_dev) """ % bcb_dev)
device_specific.FullOTA_InstallBegin() device_specific.FullOTA_InstallBegin()
@@ -789,14 +789,14 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
bcb_dev = {"bcb_dev": fs.device} bcb_dev = {"bcb_dev": fs.device}
common.ZipWriteStr(output_zip, "recovery.img", target_recovery.data) common.ZipWriteStr(output_zip, "recovery.img", target_recovery.data)
script.AppendExtra(""" script.AppendExtra("""
if get_stage("%(bcb_dev)s", "stage") == "2/3" then if get_stage("%(bcb_dev)s") == "2/3" then
""" % bcb_dev) """ % bcb_dev)
script.AppendExtra("sleep(20);\n"); script.AppendExtra("sleep(20);\n");
script.WriteRawImage("/recovery", "recovery.img") script.WriteRawImage("/recovery", "recovery.img")
script.AppendExtra(""" script.AppendExtra("""
set_stage("%(bcb_dev)s", "3/3"); set_stage("%(bcb_dev)s", "3/3");
reboot_now("%(bcb_dev)s", "recovery"); reboot_now("%(bcb_dev)s", "recovery");
else if get_stage("%(bcb_dev)s", "stage") != "3/3" then else if get_stage("%(bcb_dev)s") != "3/3" then
""" % bcb_dev) """ % bcb_dev)
script.Print("Verifying current system...") script.Print("Verifying current system...")
@@ -1138,14 +1138,14 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
bcb_dev = {"bcb_dev": fs.device} bcb_dev = {"bcb_dev": fs.device}
common.ZipWriteStr(output_zip, "recovery.img", target_recovery.data) common.ZipWriteStr(output_zip, "recovery.img", target_recovery.data)
script.AppendExtra(""" script.AppendExtra("""
if get_stage("%(bcb_dev)s", "stage") == "2/3" then if get_stage("%(bcb_dev)s") == "2/3" then
""" % bcb_dev) """ % bcb_dev)
script.AppendExtra("sleep(20);\n"); script.AppendExtra("sleep(20);\n");
script.WriteRawImage("/recovery", "recovery.img") script.WriteRawImage("/recovery", "recovery.img")
script.AppendExtra(""" script.AppendExtra("""
set_stage("%(bcb_dev)s", "3/3"); set_stage("%(bcb_dev)s", "3/3");
reboot_now("%(bcb_dev)s", "recovery"); reboot_now("%(bcb_dev)s", "recovery");
else if get_stage("%(bcb_dev)s", "stage") != "3/3" then else if get_stage("%(bcb_dev)s") != "3/3" then
""" % bcb_dev) """ % bcb_dev)
script.Print("Verifying current system...") script.Print("Verifying current system...")