update_engine: brillo_update_payload: Switch to major version 2
Per this CL, we switch the payloads to major version 2 from servers. For more
information regarding this switch refer to the attached issue. We also change
the default major version to 2.
BUG=chromium:794404
TEST=brillo_update_payload
Change-Id: I8403805c07210c3d947100efce74dc184a022cdb
Reviewed-on: https://chromium-review.googlesource.com/1234590
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>
diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index f2f28b9..1b9fcbf 100755
--- a/scripts/brillo_update_payload
+++ b/scripts/brillo_update_payload
@@ -366,12 +366,11 @@
cros_generate_update_payload --extract \
--image "${image}" \
- --kern_path "${kernel}" --root_path "${root}" \
- --work_dir "${FLAGS_work_dir}" --outside_chroot
+ --kern_path "${kernel}" --root_path "${root}"
- # Chrome OS uses major_version 1 payloads for all versions, even if the
- # updater supports a newer major version.
- FORCE_MAJOR_VERSION="1"
+ # Chrome OS now uses major_version 2 payloads for all boards.
+ # See crbug.com/794404 for more information.
+ FORCE_MAJOR_VERSION="2"
eval ${partitions_array}[kernel]=\""${kernel}"\"
eval ${partitions_array}[root]=\""${root}"\"