diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-12-01 14:48:47 +0000 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-06 17:51:30 -0700 |
| commit | 019509a576a131fb97327c1c815be87773dfdf8e (patch) | |
| tree | fd682ab0c235d39d95ada15052f7ea6a8a8d61ee | |
| parent | f0f601f977c0bd5a97fa6292b659d28dbdf1b0de (diff) | |
| download | build-019509a576a131fb97327c1c815be87773dfdf8e.zip build-019509a576a131fb97327c1c815be87773dfdf8e.tar.gz build-019509a576a131fb97327c1c815be87773dfdf8e.tar.bz2 | |
Revert "otasigcheck: Go back to the key-rewrite check."
sigcheck now returns an explicit abort code
This reverts commit bab150d79c7b9b1f233fc3592b69a42f0b38fbd8.
Change-Id: I2b5860ea427a4db7e29b55cc632b92c6e2910494
| -rw-r--r-- | tools/releasetools/edify_generator.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 6ebf11d..86b9751 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -168,9 +168,8 @@ class EdifyGenerator(object): self.script.append('package_extract_file("system/bin/otasigcheck.sh", "/tmp/otasigcheck.sh");') self.script.append('package_extract_file("META-INF/org/cyanogenmod/releasekey", "/tmp/releasekey");') self.script.append('set_metadata("/tmp/otasigcheck.sh", "uid", 0, "gid", 0, "mode", 0755);') - self.script.append('run_program("/tmp/otasigcheck.sh");') - ## The script changes the key value when it fails, check for "INVALID" - self.script.append('sha1_check(read_file("/tmp/releasekey"),"7241e92725436afc79389d4fc2333a2aa8c20230") && abort("Can\'t install this package on top of incompatible data. Please try another package or run a factory reset");') + # Exit code 124 == abort. run_program returns raw, so left-shift 8bit + self.script.append('run_program("/tmp/otasigcheck.sh") != "31744" || abort("Can\'t install this package on top of incompatible data. Please try another package or run a factory reset");') def ShowProgress(self, frac, dur): """Update the progress bar, advancing it over 'frac' over the next |