diff options
| -rwxr-xr-x | scripts/image_signing/sign_official_build.sh | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh index 61bdffd6..14300d05 100755 --- a/scripts/image_signing/sign_official_build.sh +++ b/scripts/image_signing/sign_official_build.sh @@ -575,30 +575,36 @@ resign_firmware_payload() { $(md5sum ${bios_path} | awk '{print $1}') if [[ -n ${brand_code} ]]; then - # Resign the RO_GSCVD FMAP area. - if [[ -z ${shellball_keyset_dir} ]]; then - extra_args=() - else - extra_args=( --gscvd_out + local arv_root="${KEY_DIR}/arv_root.vbpubk" + + if [[ -f ${arv_root} ]]; then + # Resign the RO_GSCVD FMAP area. + if [[ -z ${shellball_keyset_dir} ]]; then + extra_args=() + else + extra_args=( --gscvd_out "${shellball_keyset_dir}/gscvd.${output_name}" ) + fi + echo "Setting RO_GSCVD with: ${FUTILITY} gscvd" \ + --keyblock "${KEY_DIR}/arv_platform.keyblock" \ + --platform_priv "${KEY_DIR}/arv_platform.vbprivk" \ + --board_id "${brand_code}" \ + --root_pub_key "${arv_root}" \ + "${extra_args[@]}" \ + "${bios_path}" + ${FUTILITY} gscvd \ + --keyblock "${KEY_DIR}/arv_platform.keyblock" \ + --platform_priv "${KEY_DIR}/arv_platform.vbprivk" \ + --board_id "${brand_code}" \ + --root_pub_key "${arv_root}" \ + "${extra_args[@]}" \ + "${bios_path}" + + echo "After signing RO_GSCVD on ${bios_path}: md5 =" \ + "$(md5sum "${bios_path}" | awk '{print $1}')" + else + echo "No AP RO verification keys, skipping GSCVD signing" fi - echo "Setting RO_GSCVD with: ${FUTILITY} gscvd" \ - --keyblock "${KEY_DIR}/arv_platform.keyblock" \ - --platform_priv "${KEY_DIR}/arv_platform.vbprivk" \ - --board_id "${brand_code}" \ - --root_pub_key "${KEY_DIR}/arv_root.vbpubk" \ - "${extra_args[@]}" \ - "${bios_path}" - ${FUTILITY} gscvd \ - --keyblock "${KEY_DIR}/arv_platform.keyblock" \ - --platform_priv "${KEY_DIR}/arv_platform.vbprivk" \ - --board_id "${brand_code}" \ - --root_pub_key "${KEY_DIR}/arv_root.vbpubk" \ - "${extra_args[@]}" \ - "${bios_path}" - - echo "After signing RO_GSCVD on ${bios_path}: md5 =" \ - "$(md5sum "${bios_path}" | awk '{print $1}')" else warn "No brand code for ${bios_path} in signer_config.csv" fi |