From f46ee8c332604d24389d8cc369bcc1044be6d2d4 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 26 Jul 2013 22:28:05 -0400
Subject: [PATCH] fix(build_image): Fix building dev and prod without base

Ever since adding prod it hasn't been possible to build just dev and
prod without explicitly building base. Base is always built but usually
there is no point to keeping it around. Add some logic to make dev not
conflict with prod and make sure base is deleted and not uploaded if it
wasn't explicitly requested.
---
 build_image | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/build_image b/build_image
index dd73979b01..58f883a091 100755
--- a/build_image
+++ b/build_image
@@ -151,7 +151,9 @@ mkdir -p "${BUILD_DIR}"
 # Create the base image.
 create_base_image ${PRISTINE_IMAGE_NAME} ${FLAGS_enable_rootfs_verification} \
   ${FLAGS_enable_bootcache}
-upload_image "${BUILD_DIR}/${PRISTINE_IMAGE_NAME}"
+if should_build_image ${PRISTINE_IMAGE_NAME}; then
+  upload_image "${BUILD_DIR}/${PRISTINE_IMAGE_NAME}"
+fi
 
 # Running board-specific setup if any exists.
 if type board_setup &>/dev/null; then
@@ -161,7 +163,12 @@ fi
 # Create a developer image if an image that is based on it is requested.
 if should_build_image ${CHROMEOS_DEVELOPER_IMAGE_NAME} \
     ${CHROMEOS_TEST_IMAGE_NAME}; then
-  copy_image ${CHROMEOS_BASE_IMAGE_NAME} ${CHROMEOS_DEVELOPER_IMAGE_NAME}
+  if should_build_image ${COREOS_PRODUCTION_IMAGE_NAME}; then
+    cp "${BUILD_DIR}/${PRISTINE_IMAGE_NAME}" \
+        "${BUILD_DIR}/${CHROMEOS_DEVELOPER_IMAGE_NAME}"
+  else
+    copy_image ${PRISTINE_IMAGE_NAME} ${CHROMEOS_DEVELOPER_IMAGE_NAME}
+  fi
   install_dev_packages ${CHROMEOS_DEVELOPER_IMAGE_NAME}
   upload_image "${BUILD_DIR}/${CHROMEOS_DEVELOPER_IMAGE_NAME}"
 fi
@@ -178,6 +185,10 @@ if should_build_image ${COREOS_PRODUCTION_IMAGE_NAME}; then
   upload_image "${BUILD_DIR}/${COREOS_PRODUCTION_IMAGE_NAME}"
 fi
 
+if ! should_build_image ${PRISTINE_IMAGE_NAME}; then
+  rm -f "${BUILD_DIR}/${PRISTINE_IMAGE_NAME}"
+fi
+
 # From a developer image create a test|factory_test image.
 if should_build_image ${CHROMEOS_TEST_IMAGE_NAME}; then
   copy_image  ${CHROMEOS_DEVELOPER_IMAGE_NAME} ${CHROMEOS_TEST_IMAGE_NAME}