diff options
| author | Joel Kitching <kitching@google.com> | 2021-06-26 04:13:14 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-07-03 07:14:55 +0000 |
| commit | a27a826eb10e2d463130431da9e72b804da72241 (patch) | |
| tree | c13d1c43f4282e1de308900104b99d8e333ddca4 | |
| parent | 3630bf05545003d57d329d1fbb8385e8eaaa8226 (diff) | |
| download | vboot-a27a826eb10e2d463130431da9e72b804da72241.tar.gz | |
vboot/sign_official_build: merge ssd+base and remove usb
Merge aliases "ssd" and "base", since they do the same thing but
only "base" is used in chromite scripts.
Remove "usb" since it is not used anywhere.
BUG=b:188121855
TEST=make clean && make runtests
BRANCH=none
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: Ief610387fc1b6d72fe8674b0e4d51d74e6173ddd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2989637
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rwxr-xr-x | scripts/image_signing/sign_official_build.sh | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh index 6167f0be..9da51bf8 100755 --- a/scripts/image_signing/sign_official_build.sh +++ b/scripts/image_signing/sign_official_build.sh @@ -27,15 +27,13 @@ usage() { cat <<EOF Usage: $PROG <type> input_image /path/to/keys/dir [output_image] [version_file] where <type> is one of: - ssd (sign an SSD image) - base (sign a base image, similar to an SSD image) + base (sign a base image) recovery (sign a USB recovery image) factory (sign a factory install image) update_payload (sign a delta update hash) kernel (sign a kernel image) recovery_kernel (sign a recovery_kernel image) firmware (sign a firmware image) - usb (sign an image to boot directly from USB) verify (verify an image including rootfs hashes) accessory_usbpd (sign USB-PD accessory firmware) accessory_rwsig (sign accessory RW firmware) @@ -1077,16 +1075,10 @@ info "Using firmware version: ${FIRMWARE_VERSION}" info "Using kernel version: ${KERNEL_VERSION}" # Make all modifications on output copy. -if [[ "${TYPE}" == "ssd" || "${TYPE}" == "base" ]]; then - sign_image_file "SSD" "${INPUT_IMAGE}" "${OUTPUT_IMAGE}" 2 \ +if [[ "${TYPE}" == "base" ]]; then + sign_image_file "base" "${INPUT_IMAGE}" "${OUTPUT_IMAGE}" 2 \ "${KEY_DIR}/kernel.keyblock" "${KEY_DIR}/kernel_data_key.vbprivk" \ "${KEY_DIR}/kernel.keyblock" "${KEY_DIR}/kernel_data_key.vbprivk" -elif [[ "${TYPE}" == "usb" ]]; then - sign_image_file "USB" "${INPUT_IMAGE}" "${OUTPUT_IMAGE}" 2 \ - "${KEY_DIR}/recovery_kernel.keyblock" \ - "${KEY_DIR}/recovery_kernel_data_key.vbprivk" \ - "${KEY_DIR}/kernel.keyblock" \ - "${KEY_DIR}/kernel_data_key.vbprivk" elif [[ "${TYPE}" == "recovery" ]]; then sign_image_file "recovery" "${INPUT_IMAGE}" "${OUTPUT_IMAGE}" 4 \ "${KEY_DIR}/recovery_kernel.keyblock" \ |