From d5e709ec4cc505912f0ec4b2427a68a936b68962 Mon Sep 17 00:00:00 2001
From: Pawit Pornkitprasan
Date: Sun, 1 Apr 2012 14:36:08 +0700
Subject: aries-common: Fix releasetools backup/restore
Also added modelidcfg to keep in sync with global
---
releasetools/aries_edify_generator.py | 3 +++
releasetools/aries_ota_from_target_files | 7 +++++++
2 files changed, 10 insertions(+)
diff --git a/releasetools/aries_edify_generator.py b/releasetools/aries_edify_generator.py
index 3261b44..4685b77 100644
--- a/releasetools/aries_edify_generator.py
+++ b/releasetools/aries_edify_generator.py
@@ -56,6 +56,9 @@ class EdifyGenerator(edify_generator.EdifyGenerator):
def RunBackup(self, command):
edify_generator.EdifyGenerator.RunBackup(self, command)
+ def RunConfig(self, command):
+ edify_generator.EdifyGenerator.RunConfig(self, command)
+
def WriteBMLoverMTD(self, partition, partition_start_block, reservoirpartition, reservoir_start_block, image):
"""Write the given package file into the given partition."""
diff --git a/releasetools/aries_ota_from_target_files b/releasetools/aries_ota_from_target_files
index e5f4acd..6c3b1e3 100755
--- a/releasetools/aries_ota_from_target_files
+++ b/releasetools/aries_ota_from_target_files
@@ -103,6 +103,13 @@ def WriteFullOTAPackage(input_zip, output_zip):
script.ShowProgress(0.15, 5)
Item.Get("system").SetPermissions(script)
+ if OPTIONS.backuptool:
+ script.ShowProgress(0.2, 10)
+ script.RunBackup("restore")
+
+ if OPTIONS.modelidcfg:
+ script.RunConfig("")
+
CopyBootFiles(input_zip, output_zip)
CopyBMLoverMTD(output_zip)
--
cgit v1.1