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 121 matching lines @@
 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"
+SRC_IMAGE="${FLAGS_from}/${CHROMEOS_IMAGE_NAME}"
 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}
+      --yes --noinplace ${MOD_ARGS}
   mv "${SRC_IMAGE}" "${OUTPUT_IMAGE}"

[sjg, 2011/02/15 22:25:34]

This overwrites the test 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" ""
 

[sjg, 2011/02/15 22:25:34]

Well in that case I don't really understand this. You are not doing an inplace
modify, so it will create a file called ${CHROMEOS_TEST_IMAGE_NAME}. So maybe
something like:

./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board --yes
--noinplace

is all you need. And no need for the function at all which just confuses things,
since if you happen to pass in ${CHROMEOS_TEST_IMAGE_NAME} as an argument bad
things might happen.

   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"
@@ skipping 164 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."