update_engine: fix verify for brillo major version
Currently since the major version is checked before the apply
payload (for brillo_update_payload verify), then it fails if there are
more or less than two partitions. This patch forces the major version to
whatever the target image is. This will not impact any production
procedure.
BUG=none
TEST=brillo_update_payload verify --payload=payload.delta --source_image=25-4k-gzip.img --target_image=61-4k-gzip.img
Change-Id: I0af9a56f9ad52c6b0670f7ace6c307d6071a1d7a
Reviewed-on: https://chromium-review.googlesource.com/629638
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>
(cherry picked from commit 70fce1e37af598f1bd28ae2bcdb62d597b64930d)
diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index 911d622..868e723 100755
--- a/scripts/brillo_update_payload
+++ b/scripts/brillo_update_payload
@@ -715,6 +715,10 @@
)
fi
+ if [[ -n "${FORCE_MAJOR_VERSION}" ]]; then
+ GENERATOR_ARGS+=( --major_version="${FORCE_MAJOR_VERSION}" )
+ fi
+
echo "Running delta_generator to verify ${payload_type} payload with args: \
${GENERATOR_ARGS[@]}"
"${GENERATOR}" "${GENERATOR_ARGS[@]}"