| Index: bin/cros_make_image_bootable
|
| diff --git a/bin/cros_make_image_bootable b/bin/cros_make_image_bootable
|
| index c1a2d0e2b56926bae6a374b036f2d8dcfef8f77f..6651d7258179380820966d5e3921ea9b568ede4c 100755
|
| --- a/bin/cros_make_image_bootable
|
| +++ b/bin/cros_make_image_bootable
|
| @@ -117,6 +117,10 @@ DEFINE_string espfs_mountpoint "/tmp/espfs" \
|
| DEFINE_boolean use_dev_keys ${FLAGS_FALSE} \
|
| "Use developer keys for signing. (Default: false)"
|
|
|
| +# TODO(clchiou): Remove this flag after arm verified boot is stable
|
| +DEFINE_boolean crosbug12352_arm_kernel_signing ${FLAGS_FALSE} \
|
| + "Sign kernel partition for ARM images (temporary hack)."
|
| +
|
| # TODO(sosa): Remove once known images no longer use this in their config.
|
| DEFINE_string arm_extra_bootargs "" "DEPRECATED FLAG. Do not use."
|
|
|
| @@ -128,6 +132,12 @@ FLAGS "${@}" || exit 1
|
| # so will die prematurely if 'set -e' is specified before now.
|
| set -e -u
|
|
|
| +if [[ ${FLAGS_crosbug12352_arm_kernel_signing} -eq ${FLAGS_TRUE} ]]; then
|
| + crosbug12352_flag="--crosbug12352_arm_kernel_signing"
|
| +else
|
| + crosbug12352_flag="--nocrosbug12352_arm_kernel_signing"
|
| +fi
|
| +
|
| # $1 - Directory where developer rootfs is mounted.
|
| # $2 - Directory where developer stateful_partition is mounted.
|
| # $3 - Directory where the ESP partition is mounted.
|
| @@ -193,6 +203,7 @@ make_image_bootable() {
|
| --verity_error_behavior=${FLAGS_verity_error_behavior} \
|
| --root=${cros_root} \
|
| --keys_dir="${FLAGS_keys_dir}" \
|
| + ${crosbug12352_flag} \
|
| ${use_dev_keys}
|
|
|
| local rootfs_hash_size=$(stat -c '%s' ${FLAGS_rootfs_hash})
|
|
|