diff options
author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2011-11-17 08:12:54 +0700 |
---|---|---|
committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2011-11-17 08:12:54 +0700 |
commit | e942e1d931c19a17bdefb85e3c3ce612010ac222 (patch) | |
tree | b7338e9f65d19b1e91493a2fd5dce3fa20fba112 | |
parent | f819142b444c4b3b36257afc8cb997154dd093c7 (diff) | |
download | device_samsung_aries-common-e942e1d931c19a17bdefb85e3c3ce612010ac222.zip device_samsung_aries-common-e942e1d931c19a17bdefb85e3c3ce612010ac222.tar.gz device_samsung_aries-common-e942e1d931c19a17bdefb85e3c3ce612010ac222.tar.bz2 |
Initial releasetool fix
-rwxr-xr-x | releasetools/aries_img_from_target_files | 4 | ||||
-rwxr-xr-x | releasetools/aries_ota_from_target_files | 17 |
2 files changed, 7 insertions, 14 deletions
diff --git a/releasetools/aries_img_from_target_files b/releasetools/aries_img_from_target_files index 1a6d82e..f2c3c49 100755 --- a/releasetools/aries_img_from_target_files +++ b/releasetools/aries_img_from_target_files @@ -159,9 +159,7 @@ def main(argv): common.Usage(__doc__) sys.exit(1) - OPTIONS.input_tmp = common.UnzipTemp(args[0]) - - input_zip = zipfile.ZipFile(args[0], "r") + OPTIONS.input_tmp, input_zip = common.UnzipTemp(args[0]) OPTIONS.info_dict = common.LoadInfoDict(input_zip) output_zip = zipfile.ZipFile(args[1], "w", compression=zipfile.ZIP_DEFLATED) diff --git a/releasetools/aries_ota_from_target_files b/releasetools/aries_ota_from_target_files index 9d702c7..35728bc 100755 --- a/releasetools/aries_ota_from_target_files +++ b/releasetools/aries_ota_from_target_files @@ -76,8 +76,6 @@ def WriteFullOTAPackage(input_zip, output_zip): AppendAssertions(script, input_zip) device_specific.FullOTA_Assertions() - if OPTIONS.backuptool: - script.RunBackup("backup") script.ShowProgress(0.5, 0) @@ -89,22 +87,19 @@ def WriteFullOTAPackage(input_zip, output_zip): script.UnpackPackageDir("recovery", "/system") script.UnpackPackageDir("system", "/system") - symlinks = CopySystemFiles(input_zip, output_zip) + (symlinks, retouch_files) = CopySystemFiles(input_zip, output_zip) script.MakeSymlinks(symlinks) + if OPTIONS.aslr_mode: + script.RetouchBinaries(retouch_files) + else: + script.UndoRetouchBinaries(retouch_files) + Item.GetMetadata(input_zip) Item.Get("system").SetPermissions(script) script.ShowProgress(0.2, 0) - if OPTIONS.backuptool: - script.ShowProgress(0.2, 10) - script.RunBackup("restore") - - script.RunModelidCfg() - - script.RunVerifyCachePartitionSize() - CopyBootFiles(input_zip, output_zip) CopyBMLoverMTD(output_zip) |