commit b6cbcf17e5a3528c7c3ade329bf25c0fab46aa7d
author Ting Shen <phoenixshen@google.com> Mon Jul 13 18:14:51 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Tue Jul 21 14:43:51 2020 +0000
tree b5d9cd059220caa2720df9795260d08d792d6bfd
parent 32fd8f841f33bbdfad21e11fde9b3f0e2e5ffe94

mod_image_for_recovery: don't build kernel when --kernel_image specified

If --kernel_image is specified, the script still creates a kernel image
and doesn't use it at all. Move the build kernel step under if clause
to save a few minutes.

Also fixed some lint error

BUG=None
TEST=Run the script manually

Change-Id: Ia73c10cb1166e55d252af7c0dc5f048a349f0d59
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/2294782
Tested-by: Ting Shen <phoenixshen@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

mod_image_for_recovery.sh

diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh
index 685bb9d..ca07f2a 100755
--- a/mod_image_for_recovery.sh
+++ b/mod_image_for_recovery.sh
@@ -411,13 +411,14 @@
   die "Could not copy the vblock from stateful."
 fi
 
-# Build the recovery kernel.
 FACTORY_ROOT="${BOARD_ROOT}/factory-root"
-RECOVERY_KERNEL_FLAGS="recovery_ramfs tpm i2cdev vfat kernel_compress_xz -kernel_afdo"
-USE="${USE} ${RECOVERY_KERNEL_FLAGS}" emerge_custom_kernel "$FACTORY_ROOT" ||
-  die "Cannot emerge custom kernel"
 
-if [ -z "$FLAGS_kernel_image" ]; then
+if [ -z "${FLAGS_kernel_image}" ]; then
+  # Build the recovery kernel.
+  RECOVERY_KERNEL_FLAGS="recovery_ramfs tpm i2cdev vfat kernel_compress_xz"
+  RECOVERY_KERNEL_FLAGS="${RECOVERY_KERNEL_FLAGS} -kernel_afdo"
+  USE="${USE} ${RECOVERY_KERNEL_FLAGS}" emerge_custom_kernel "$FACTORY_ROOT" ||
+    die "Cannot emerge custom kernel"
   create_recovery_kernel_image
   echo "Recovery kernel created at $RECOVERY_KERNEL_IMAGE"
 else