Merge pull request #18 from philips/core_upload_update-signing

Core upload update signing
This commit is contained in:
Brandon Philips 2013-07-03 12:20:15 -07:00
commit 61b3560bec
2 changed files with 12 additions and 1 deletions

View File

@ -403,6 +403,14 @@ CHROMEOS_TEST_IMAGE_NAME="chromiumos_test_image.bin"
CHROMEOS_FACTORY_TEST_IMAGE_NAME="chromiumos_factory_image.bin" CHROMEOS_FACTORY_TEST_IMAGE_NAME="chromiumos_factory_image.bin"
CHROMEOS_FACTORY_INSTALL_SHIM_NAME="factory_install_shim.bin" CHROMEOS_FACTORY_INSTALL_SHIM_NAME="factory_install_shim.bin"
COREOS_BASE_IMAGE_NAME=${CHROMEOS_BASE_IMAGE_NAME}
COREOS_IMAGE_NAME=${CHROMEOS_IMAGE_NAME}
COREOS_DEVELOPER_IMAGE_NAME=${CHROMEOS_DEVELOPER_IMAGE_NAME}
COREOS_RECOVERY_IMAGE_NAME=${CHROMEOS_RECOVERY_IMAGE_NAME}
COREOS_TEST_IMAGE_NAME=${CHROMEOS_TEST_IMAGE_NAME}
COREOS_FACTORY_TEST_IMAGE_NAME=${CHROMEOS_FACTORY_TEST_IMAGE_NAME}
COREOS_FACTORY_INSTALL_SHIM_NAME=${CHROMEOS_FACTORY_INSTALL_SHIM_NAME}
# Install make for portage ebuilds. Used by build_image and gmergefs. # Install make for portage ebuilds. Used by build_image and gmergefs.
# TODO: Is /usr/local/autotest-chrome still used by anyone? # TODO: Is /usr/local/autotest-chrome still used by anyone?
COMMON_INSTALL_MASK=" COMMON_INSTALL_MASK="

View File

@ -7,7 +7,7 @@
SCRIPT_ROOT=$(dirname $(readlink -f "$0")) SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
. "${SCRIPT_ROOT}/common.sh" || exit 1 . "${SCRIPT_ROOT}/common.sh" || exit 1
DEFINE_string image "${SRC_ROOT}/build/images/amd64-generic/latest/chromiumos_image.bin" \ DEFINE_string image "${SRC_ROOT}/build/images/amd64-generic/latest/${COREOS_BASE_IMAGE_NAME}" \
"Path to the basic image (not qemu/xen/etc)" "Path to the basic image (not qemu/xen/etc)"
DEFINE_string version "${COREOS_VERSION_STRING}" \ DEFINE_string version "${COREOS_VERSION_STRING}" \
"Version number of this build." "Version number of this build."
@ -42,6 +42,9 @@ switch_to_strict_mode
[[ -z "${FLAGS_private_key}" ]] && die "--private_key is required" [[ -z "${FLAGS_private_key}" ]] && die "--private_key is required"
[[ -z "${FLAGS_public_key}" ]] && die "--public_key is required" [[ -z "${FLAGS_public_key}" ]] && die "--public_key is required"
# Put our public key in a place that update_engine can find it
${SRC_ROOT}/platform/vboot_reference/scripts/image_signing/insert_au_publickey.sh ${FLAGS_image} ${FLAGS_public_key}
# Generate a payload and sign it with our private key # Generate a payload and sign it with our private key
cros_generate_update_payload --image ${FLAGS_image} --output /tmp/update.gz \ cros_generate_update_payload --image ${FLAGS_image} --output /tmp/update.gz \
--private_key ${FLAGS_private_key} --private_key ${FLAGS_private_key}