Remove old logic ... and don't needlessly modifiy dev image.

archive_build.sh

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to archive build results.  Used by the buildbots.
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
@@ skipping 48 matching lines @@
 DEFINE_string acl "private" \
     "ACL to set on GSD archives"
 DEFINE_string gsutil_archive "" \
     "Optional datastore archive location"
 DEFINE_integer keep_max 0 "Maximum builds to keep in archive (0=all)"
 DEFINE_boolean official_build $FLAGS_FALSE \
     "Set CHROMEOS_OFFICIAL=1 for release builds."
 DEFINE_string test_tarball "" "Optional path to test tarball to archive"
 DEFINE_boolean test_mod $FLAGS_TRUE "Modify image for testing purposes"
 DEFINE_boolean prebuilt_upload $FLAGS_FALSE "Upload prebuilt binary packages."
+DEFINE_boolean remove_dev $FLAGS_TRUE "Remove the de image during archive."
 DEFINE_string to "$DEFAULT_TO" "Directory of build archive"
 DEFINE_string zipname "image.zip" "Name of zip file to create."
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # Set if default from path is used
 DEFAULT_USED=
 
@@ skipping 52 matching lines @@
 # Create the output directory
 OUTDIR="${FLAGS_to}/${LAST_CHANGE}"
 ZIPFILE="${OUTDIR}/${FLAGS_zipname}"
 FACTORY_ZIPFILE="${OUTDIR}/factory_${FLAGS_zipname}"
 echo "archive to dir: $OUTDIR"
 echo "archive to file: $ZIPFILE"
 
 rm -rf "$OUTDIR"
 mkdir -p "$OUTDIR"
 
-
-SRC_IMAGE="${FLAGS_from}/chromiumos_image.bin"
-BACKUP_IMAGE="${FLAGS_from}/chromiumos_image_bkup.bin"
-
-# Apply mod_image_for_test to the developer image, and store the
-# result in a new location. Usage:
-# do_chroot_mod "$OUTPUT_IMAGE" "--flags_to_mod_image_for_test"
-function do_chroot_mod() {
-  MOD_ARGS=$2
-  OUTPUT_IMAGE=$1
-  cp -f "${SRC_IMAGE}" "${BACKUP_IMAGE}"
-  ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board \
-      --yes ${MOD_ARGS}
-  mv "${SRC_IMAGE}" "${OUTPUT_IMAGE}"
-  mv "${BACKUP_IMAGE}" "${SRC_IMAGE}"
-}
-
 # Modify image for test if flag set.
 if [ $FLAGS_test_mod -eq $FLAGS_TRUE ]; then
   echo "Modifying image for test"
-  do_chroot_mod "${FLAGS_from}/chromiumos_test_image.bin" ""
+  ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board \
+      --noinplace --yes
 
   pushd "${FLAGS_chroot}/build/${FLAGS_board}/usr/local"
   echo "Archiving autotest build artifacts"
   tar cjf "${FLAGS_from}/autotest.tar.bz2" --checkpoint=1000 autotest
   popd
 fi
 
 if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ]; then
   echo "Modifying image for factory test"
-  do_chroot_mod "${FLAGS_from}/chromiumos_factory_image.bin" \
-      "--factory"
+  ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board \
+      --yes --noinplace --factory
 fi
 
 # Modify for recovery
 if [ $FLAGS_official_build -eq $FLAGS_TRUE ]; then
   BUILDVER="$(readlink ${IMAGES_DIR}/${FLAGS_board}/latest)"
   CHROOT_IMAGE_DIR=/home/$USER/trunk/src/build/images/$FLAGS_board/$BUILDVER
   ./enter_chroot.sh -- ./mod_image_for_recovery.sh --board $FLAGS_board \
     --image $CHROOT_IMAGE_DIR/chromiumos_base_image.bin
 fi
 
 # Remove the developer build if test image is also built.
-if [ $FLAGS_test_mod -eq $FLAGS_TRUE ] ; then
-  rm -f ${SRC_IMAGE}
+if [ $FLAGS_remove_dev -eq $FLAGS_TRUE ]; then
+  rm -f "${FLAGS_from}/${CHROMEOS_IMAGE_NAME}"

[sjg, 2011/02/16 02:04:51]

Yes this seems much better.

I guess you are wanting to remove the original image and just leave the test and
factory images, right?

 fi
 
 # Build differently sized shims. Currently only factory install shim is
 # supported, TODO(tgao): Add developer shim.
 if [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ]; then
   echo "Building factory install shim."
   # HACK: The build system can't currently handle more than one image size
   # at a time. Therefor eit's necessary to do another round of build after
   # archiving the original build. This should be fixed in Chromite.
 
@@ skipping 141 matching lines @@
 # Purge old builds if necessary
 if [ $FLAGS_keep_max -gt 0 ]; then
   echo "Deleting old builds (all but the newest ${FLAGS_keep_max})..."
   cd "$FLAGS_to"
   # +2 because line numbers start at 1 and need to skip LATEST file
   rm -rf `ls -t1 | tail --lines=+$(($FLAGS_keep_max + 2))`
   cd -
 fi
 
 echo "Done."