commit 216b83e2faae04feeeb524284263e82385e4d13c
author Amey Deshpande <ameyd@google.com> Thu Mar 31 17:51:46 2016 -0700
committer chrome-bot <chrome-bot@chromium.org> Mon Apr 25 21:04:45 2016 -0700
tree 6b3d2c63d77c8663ef3280a74e40dd282a7bac88
parent 6f4e50e980ab9391d3548c245b9a27f9abe22d1f

cros_make_image_bootable: add board-specific hook

This patch adds a board-specific hook so that individual boards can
apply custom changes such as bootloader configuration tweaks.

TEST=build_image succeeds
BUG=chromium:604967

Change-Id: I0d9c00942c4691cafc00c1f03acd32e27cb178d5
Reviewed-on: https://chromium-review.googlesource.com/336724
Commit-Ready: Amey Deshpande <ameyd@google.com>
Tested-by: Amey Deshpande <ameyd@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

bin/cros_make_image_bootable

diff --git a/bin/cros_make_image_bootable b/bin/cros_make_image_bootable
index 98f8b69..6e3be0c 100755
--- a/bin/cros_make_image_bootable
+++ b/bin/cros_make_image_bootable
@@ -146,7 +146,10 @@
 
 [ -z "${FLAGS_verity_salt}" ] && FLAGS_verity_salt=$(make_salt)
 
+# board_options.sh relies on ${SRC_IMAGE} environment variable.
+SRC_IMAGE="${IMAGE}"
 . "${BUILD_LIBRARY_DIR}/board_options.sh" || exit 1
+load_board_specific_script "board_specific_setup.sh"
 
 # Only now can we die on error.  shflags functions leak non-zero error codes,
 # so will die prematurely if 'switch_to_strict_mode' is specified before now.
@@ -425,6 +428,9 @@
 mkdir -p ${FLAGS_espfs_mountpoint}
 
 make_image_bootable "${IMAGE}"
+if type -p board_make_image_bootable; then
+  board_make_image_bootable "${IMAGE}"
+fi
 if [ ${FLAGS_fsck_rootfs} -eq ${FLAGS_TRUE} ]; then
   verify_image_rootfs "${IMAGE}"
 fi