Add 'usb' option back to sign_official_build.sh script

scripts/image_signing/sign_official_build.sh

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Sign the final build image using the "official" keys.
 #
 # Prerequisite tools needed in the system path:
 #
@@ skipping 10 matching lines @@
 . "$(dirname "$0")/common.sh"
 
 # Print usage string
 usage() {
   cat <<EOF
 Usage: $PROG <type> input_image /path/to/keys/dir [output_image]
 where <type> is one of:
              ssd  (sign an SSD image)
              recovery (sign a USB recovery image)
              install (sign a factory install image)
+             usb  (sign an image to boot directly from USB)
              verify (verify an image including rootfs hashes)
 
 If you are signing an image, you must specify an [output_image].
 EOF
 }
 
 if [ $# -ne 3 ] && [ $# -ne 4 ]; then
   usage
   exit 1
 fi
@@ skipping 268 matching lines @@
 }
 
 # Generate the SSD image
 sign_for_ssd() {
   ${SCRIPT_DIR}/resign_image.sh ${INPUT_IMAGE} ${OUTPUT_IMAGE} \
     ${KEY_DIR}/kernel_data_key.vbprivk \
     ${KEY_DIR}/kernel.keyblock
   echo "Signed SSD image output to ${OUTPUT_IMAGE}"
 }
 
+# Generate the USB image (direct boot)
+sign_for_usb() {
+  ${SCRIPT_DIR}/resign_image.sh ${INPUT_IMAGE} ${OUTPUT_IMAGE} \
+    ${KEY_DIR}/recovery_kernel_data_key.vbprivk \
+    ${KEY_DIR}/recovery_kernel.keyblock
+  echo "Signed USB image output to ${OUTPUT_IMAGE}"
+}
+
 # Generate the USB (recovery + install) image
 sign_for_recovery() {
   # Update the Kernel B hash in Kernel A command line
   temp_kimageb=$(make_temp_file)
   extract_image_partition ${INPUT_IMAGE} 4 ${temp_kimageb}
   local kern_a_config=$(grab_kernel_config "${INPUT_IMAGE}" 2)
   local kern_b_hash=$(sha1sum ${temp_kimageb} | cut -f1 -d' ')
 
   temp_configa=$(make_temp_file)
   echo "$kern_a_config" | 
@@ skipping 55 matching lines @@
 fi
 
 
 if [ "${TYPE}" == "ssd" ]; then
   resign_firmware_payload ${INPUT_IMAGE}
   update_rootfs_hash ${INPUT_IMAGE} \
     ${KEY_DIR}/kernel.keyblock \
     ${KEY_DIR}/kernel_data_key.vbprivk \
     2
   sign_for_ssd
+elif [ "${TYPE}" == "usb" ]; then
+  resign_firmware_payload ${INPUT_IMAGE}
+  update_rootfs_hash ${INPUT_IMAGE} \
+    ${KEY_DIR}/recovery_kernel.keyblock \
+    ${KEY_DIR}/recovery_kernel_data_key.vbprivk \
+    2
+  sign_for_usb
 elif [ "${TYPE}" == "recovery" ]; then
   resign_firmware_payload ${INPUT_IMAGE}
   # Both kernel command lines must have the correct rootfs hash
   update_rootfs_hash ${INPUT_IMAGE} \
     ${KEY_DIR}/recovery_kernel.keyblock \
     ${KEY_DIR}/recovery_kernel_data_key.vbprivk \
     4
   update_rootfs_hash ${INPUT_IMAGE} \
     ${KEY_DIR}/recovery_kernel.keyblock \
     ${KEY_DIR}/recovery_kernel_data_key.vbprivk \
     2
   sign_for_recovery
 elif [ "${TYPE}" == "install" ]; then
   resign_firmware_payload ${INPUT_IMAGE}
   update_rootfs_hash ${INPUT_IMAGE} \
     ${KEY_DIR}/installer_kernel.keyblock \
     ${KEY_DIR}/recovery_kernel_data_key.vbprivk \
     2
   sign_for_factory_install
 else
   echo "Invalid type ${TYPE}"
   exit 1
 fi