From 3b9ff1ea62b6fb7290e36a3e69c37381651639cd Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Tue, 2 Jul 2013 16:13:39 -0700
Subject: [PATCH 1/2] fix(core_upload_update): use the base image

- Use variable for the image name
- add COREOS prefixed variables so we can start weaning ourself off of the
others.
---
 common.sh          | 8 ++++++++
 core_upload_update | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/common.sh b/common.sh
index 69299f06c1..f539c1ee8f 100644
--- a/common.sh
+++ b/common.sh
@@ -397,6 +397,14 @@ CHROMEOS_TEST_IMAGE_NAME="chromiumos_test_image.bin"
 CHROMEOS_FACTORY_TEST_IMAGE_NAME="chromiumos_factory_image.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.
 # TODO: Is /usr/local/autotest-chrome still used by anyone?
 COMMON_INSTALL_MASK="
diff --git a/core_upload_update b/core_upload_update
index d189777ffe..8e870dfd87 100755
--- a/core_upload_update
+++ b/core_upload_update
@@ -7,7 +7,7 @@
 SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${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)"
 DEFINE_string version "${COREOS_VERSION_STRING}" \
     "Version number of this build."

From d85bf2432a1a1ef777a90094629f4cef7f8a4e7f Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.co>
Date: Tue, 2 Jul 2013 16:15:23 -0700
Subject: [PATCH 2/2] feat(core_upload_update): insert the public key

shove the public key into the image so it can be found by update_engine
---
 core_upload_update | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core_upload_update b/core_upload_update
index 8e870dfd87..199a2769ed 100755
--- a/core_upload_update
+++ b/core_upload_update
@@ -42,6 +42,9 @@ switch_to_strict_mode
 [[ -z "${FLAGS_private_key}" ]] && die "--private_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
 cros_generate_update_payload --image ${FLAGS_image} --output /tmp/update.gz \
 	--private_key ${FLAGS_private_key}