From 9bd185dccf0f46d0da54dde16a071e37014a0c96 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Tue, 1 Aug 2017 10:09:41 -0700 Subject: signer: do not proceed if usb_updater is not available The script assumes that usb_updater is present in the PPATH, but it is not guaranteed to be available. Use the version from the ec tree or stop if it is not available. BRANCH=none BUG=none TEST=verified that the script uses proper instance of usb_updater Change-Id: I3b861953e8d5d509b99131685e86aaf7a0693d23 Signed-off-by: Vadim Bendebury Reviewed-on: https://chromium-review.googlesource.com/597120 Reviewed-by: Caveh Jalali Reviewed-by: Mary Ruthven (cherry picked from commit 3f2a017f261055145a9fdc91a4ebd70cc9577b21) Reviewed-on: https://chromium-review.googlesource.com/599498 (cherry picked from commit c4dcbf603877bab95c84bf53bd69f067023ac3f0) Reviewed-on: https://chromium-review.googlesource.com/666527 --- util/signer/create_released_image.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/util/signer/create_released_image.sh b/util/signer/create_released_image.sh index 21598e616b..430f58168b 100755 --- a/util/signer/create_released_image.sh +++ b/util/signer/create_released_image.sh @@ -88,7 +88,7 @@ prepare_image() { dd if="${TMPD}/0.bin" of="${RESULT_FILE}" conv=notrunc dd if="${TMPD}/1.bin" of="${RESULT_FILE}" seek=262144 bs=1 conv=notrunc - version="$(usb_updater -b "${RESULT_FILE}" |\ + version="$("${USB_UPDATER}" -b "${RESULT_FILE}" | awk '/^RO_A:/ {gsub(/R[OW]_A:/, ""); print "r" $1 ".w" $2}')" if [ -z "${dest_dir}" ]; then @@ -128,6 +128,12 @@ dest_dir= IMAGE_SIZE='524288' export RESULT_FILE +USB_UPDATER="${EC_ROOT}/extra/usb_updater/usb_updater" +if [[ ! -x "${USB_UPDATER}" ]]; then + echo "${ME}: usb_updater not found, run \"make -C extra/usb_updater\"" >&2 + exit 1 +fi + DEFINE_string cr50_board_id "" \ "Optional string representing Board ID field of the Cr50 RW header. Consists of three fields separated by colon: ::" -- cgit v1.2.1