From 51c78a4685ce4e0c021b23f6904ea0e7d8531da6 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 24 Jun 2014 14:01:09 -0700
Subject: [PATCH] build_image: generate update tools zip by default

Missed this in 7231b95a, the update zip should still be built when the
usr partition is extracted for generating updates but build_image itself
is not generating and signing the update.
---
 build_image                       |  6 ++++++
 build_library/build_image_util.sh | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/build_image b/build_image
index e308099253..a67bc3163d 100755
--- a/build_image
+++ b/build_image
@@ -171,6 +171,12 @@ if [[ "${PROD_IMAGE}" -eq 1 ]]; then
   fi
 fi
 
+if [[ ${FLAGS_generate_update} -eq ${FLAGS_TRUE} ]] || \
+   [[ ${FLAGS_extract_update} -eq ${FLAGS_TRUE} ]]
+then
+  zip_update_tools
+fi
+
 # Write out a version.txt file, this will be used by image_to_vm.sh
 tee "${BUILD_DIR}/version.txt" <<EOF
 COREOS_BUILD=${COREOS_BUILD}
diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index 36ef234eb0..2157f00d1a 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -64,6 +64,19 @@ extract_update() {
   upload_image "${update_path}"
 }
 
+zip_update_tools() {
+  # There isn't a 'dev' variant of this zip, so always call it production.
+  local update_zip="coreos_production_update.zip"
+
+  info "Generating update tools zip"
+  # Make sure some vars this script needs are exported
+  export REPO_MANIFESTS_DIR SCRIPTS_DIR
+  "${BUILD_LIBRARY_DIR}/generate_au_zip.py" \
+    --output-dir "${BUILD_DIR}" --zip-name "${update_zip}"
+
+  upload_image "${BUILD_DIR}/${update_zip}"
+}
+
 generate_update() {
   local image_name="$1"
   local disk_layout="$2"
@@ -79,12 +92,6 @@ generate_update() {
   delta_generator -private_key "${devkey}" \
     -in_file "${update}.gz" -out_metadata "${update}.meta"
 
-  info "Generating update tools zip"
-  # Make sure some vars this script needs are exported
-  export REPO_MANIFESTS_DIR SCRIPTS_DIR
-  "${BUILD_LIBRARY_DIR}/generate_au_zip.py" \
-    --output-dir "${BUILD_DIR}" --zip-name "${update_prefix}.zip"
-
   upload_image -d "${update}.DIGESTS" "${update}".{bin,gz,meta,zip}
 }