From 8c0e84d3c74c2109a8e55411bdb2268d8cf0775b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 22 Aug 2019 00:17:44 -0400 Subject: image_signing: clean up more oci references We deleted the script the oci-container target needs, so remove some remaining dead references. BUG=chromium:976916 TEST=signing image w/key deletes it, and signing image w/out key passes BRANCH=None Change-Id: I54624a1241a7b7326a746514aa32644fd94ec525 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1762462 Reviewed-by: LaMont Jones Tested-by: Mike Frysinger Commit-Queue: Mike Frysinger --- scripts/image_signing/sign_official_build.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh index c87c4bb3..e8dd9e61 100755 --- a/scripts/image_signing/sign_official_build.sh +++ b/scripts/image_signing/sign_official_build.sh @@ -40,7 +40,6 @@ where is one of: nv_lp0_firmware (sign nvidia lp0 firmware) accessory_usbpd (sign USB-PD accessory firmware) accessory_rwsig (sign accessory RW firmware) - oci-container (sign an OCI container) cr50_firmware (sign a cr50 firmware image) output_image: File name of the signed output image @@ -821,17 +820,6 @@ verify_uefi_signatures() { fi } -# Sign an oci container with the given keys. -# Args: CONTAINER KEY_DIR [OUTPUT_CONTAINER] -sign_oci_container() { - local image=$1 - local key_dir=$2 - local output=$3 - - "${SCRIPT_DIR}/sign_oci_container.sh" \ - "${image}" "${key_dir}" --output "${output}" -} - # Sign a cr50 firmware image with the given keys. # Args: CONTAINER KEY_DIR [OUTPUT_CONTAINER] sign_cr50_firmware() { @@ -1161,8 +1149,6 @@ elif [[ "${TYPE}" == "accessory_rwsig" ]]; then cp "${INPUT_IMAGE}" "${OUTPUT_IMAGE}" futility sign --type rwsig --prikey "${KEY_NAME}" \ --version "${FIRMWARE_VERSION}" "${OUTPUT_IMAGE}" -elif [[ "${TYPE}" == "oci-container" ]]; then - sign_oci_container "${INPUT_IMAGE}" "${KEY_DIR}" "${OUTPUT_IMAGE}" elif [[ "${TYPE}" == "cr50_firmware" ]]; then sign_cr50_firmware "${INPUT_IMAGE}" "${KEY_DIR}" "${OUTPUT_IMAGE}" else -- cgit v1.2.1