commit e8c754f7fa590feeed765a3387601193ab89648d
author Gabe Black <gabeblack@chromium.org> Tue Aug 12 13:41:03 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Aug 15 17:59:29 2014 +0000
tree 8090a14a357ef8afff7f731a4343830451c36083
parent e57f6293ce9dd18cbcbceb89d67bd4d32015bc29

Stop saving off the vblock when building a recovery image.

Nobody seems to use it, and generating a separate vblock is something we're
trying to deprecate.

BUG=chromium:403031
TEST=Ran a trybot for butterfly with --hwtest. Built a recovery image for
lumpy locally.

Change-Id: I9cb921cdc11d72c11ae89306fbab41a564582b7b
Reviewed-on: https://chromium-review.googlesource.com/212183
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>

mod_image_for_recovery.sh

diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh
index 10f9510..0a21e7b 100755
--- a/mod_image_for_recovery.sh
+++ b/mod_image_for_recovery.sh
@@ -135,7 +135,6 @@
     --board="${FLAGS_board}" \
     --arch="${ARCH}" \
     --to="$RECOVERY_KERNEL_IMAGE" \
-    --hd_vblock="$RECOVERY_KERNEL_VBLOCK" \
     --vmlinuz="$vmlinuz" \
     --working_dir="${IMAGE_DIR}" \
     --boot_args="noinitrd panic=60 cros_recovery kern_b_hash=$kern_hash" \
@@ -353,7 +352,6 @@
 RECOVERY_IMAGE="${FLAGS_to:-$IMAGE_DIR/$CHROMEOS_RECOVERY_IMAGE_NAME}"
 RECOVERY_KERNEL_IMAGE=\
 "${FLAGS_kernel_outfile:-$IMAGE_DIR/$RECOVERY_KERNEL_NAME}"
-RECOVERY_KERNEL_VBLOCK="${RECOVERY_KERNEL_IMAGE}.vblock"
 STATEFUL_DIR="$IMAGE_DIR/stateful_partition"
 SCRIPTS_DIR=${SCRIPT_ROOT}