diff options
| author | Amin Hassani <ahassani@chromium.org> | 2019-10-07 11:20:39 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-29 21:28:24 +0000 |
| commit | 55c75417e22d5026971276997924a345d9973bbc (patch) | |
| tree | b53adac63ebb81c3d113734e745f5fe197dc6a5c /scripts/update_payload/common.py | |
| parent | 816193f68604845ad3c66cafb71b68e05e310469 (diff) | |
update_engine: Deprecate major version 1
We have moved away from major version 1 in Chrome OS and already have a
stepping stone for it in M53. So this cleanup makes the code much easier
to understand.
BUG=chromium:1008553
TEST=FEATURES="test" sudo emerge update_engine update_payload
TEST=cros_generate_update_payload --image chromiumos_test_image.bin --check --output delta.bin
Change-Id: I01815dfa5fdf395f8214ef162e01ecca2d42f7fc
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/1857459
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Diffstat (limited to 'scripts/update_payload/common.py')
| -rw-r--r-- | scripts/update_payload/common.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/update_payload/common.py b/scripts/update_payload/common.py index b7b53dc8..dfb8181a 100644 --- a/scripts/update_payload/common.py +++ b/scripts/update_payload/common.py @@ -25,15 +25,12 @@ from update_payload.error import PayloadError # # Constants. # -PSEUDO_EXTENT_MARKER = (1L << 64) - 1 # UINT64_MAX - SIG_ASN1_HEADER = ( '\x30\x31\x30\x0d\x06\x09\x60\x86' '\x48\x01\x65\x03\x04\x02\x01\x05' '\x00\x04\x20' ) -CHROMEOS_MAJOR_PAYLOAD_VERSION = 1 BRILLO_MAJOR_PAYLOAD_VERSION = 2 SOURCE_MINOR_PAYLOAD_VERSION = 2 @@ -162,8 +159,7 @@ def FormatExtent(ex, block_size=0): end_block = ex.start_block + ex.num_blocks if block_size: return '%d->%d * %d' % (ex.start_block, end_block, block_size) - else: - return '%d->%d' % (ex.start_block, end_block) + return '%d->%d' % (ex.start_block, end_block) def FormatSha256(digest): |