diff options
| author | Alex Deymo <deymo@google.com> | 2015-11-04 00:47:12 -0800 |
|---|---|---|
| committer | Sen Jiang <senj@google.com> | 2015-11-04 12:36:08 -0800 |
| commit | 1617b724243878803c29829604e612387dc5e381 (patch) | |
| tree | 5bfd08bde0a278e632716c0ceb4fa46cc2c71edd | |
| parent | eb3ce61e1870acc23cf863a56f16a6eb5fe157ad (diff) | |
| download | update_engine-1617b724243878803c29829604e612387dc5e381.tar.gz | |
Enable payload v2.brillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
Switch the preferred payload major version to 2.
Bug: 23694580
Test: Deployed signed and unsigned payload to a device.
Change-Id: Ib338883510c1c8ddaad3e4c77a769799ee058b64
| -rw-r--r-- | delta_performer.cc | 5 | ||||
| -rw-r--r-- | update_engine.conf | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/delta_performer.cc b/delta_performer.cc index 0d335a8a..eac4259f 100644 --- a/delta_performer.cc +++ b/delta_performer.cc @@ -64,7 +64,7 @@ const uint64_t DeltaPerformer::kDeltaManifestSizeOffset = const uint64_t DeltaPerformer::kDeltaManifestSizeSize = 8; const uint64_t DeltaPerformer::kDeltaMetadataSignatureSizeSize = 4; const uint64_t DeltaPerformer::kMaxPayloadHeaderSize = 24; -const uint64_t DeltaPerformer::kSupportedMajorPayloadVersion = 1; +const uint64_t DeltaPerformer::kSupportedMajorPayloadVersion = 2; const uint32_t DeltaPerformer::kSupportedMinorPayloadVersion = 2; const unsigned DeltaPerformer::kProgressLogMaxChunks = 10; @@ -418,7 +418,8 @@ DeltaPerformer::MetadataParseResult DeltaPerformer::ParsePayloadMetadata( // switch big endian to host major_payload_version_ = be64toh(major_payload_version_); - if (major_payload_version_ != supported_major_version_) { + if (major_payload_version_ != supported_major_version_ && + major_payload_version_ != kChromeOSMajorPayloadVersion) { LOG(ERROR) << "Bad payload format -- unsupported payload version: " << major_payload_version_; *error = ErrorCode::kUnsupportedMajorPayloadVersion; diff --git a/update_engine.conf b/update_engine.conf index dea31e4b..981887d6 100644 --- a/update_engine.conf +++ b/update_engine.conf @@ -1,2 +1,2 @@ -PAYLOAD_MAJOR_VERSION=1 +PAYLOAD_MAJOR_VERSION=2 PAYLOAD_MINOR_VERSION=2 |