From a27a826eb10e2d463130431da9e72b804da72241 Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Sat, 26 Jun 2021 04:13:14 +0800 Subject: 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 Change-Id: Ief610387fc1b6d72fe8674b0e4d51d74e6173ddd Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2989637 Tested-by: Joel Kitching Commit-Queue: Joel Kitching Reviewed-by: Mike Frysinger Reviewed-by: Julius Werner --- scripts/image_signing/sign_official_build.sh | 14 +++----------- 1 file 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 < input_image /path/to/keys/dir [output_image] [version_file] where 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" \ -- cgit v1.2.1