Support grabbing gpt-style images from buildbot

src/scripts/sync_build_test.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 sync your checkout, build a Chromium OS image, and test it all
 # with one command.  Can also check out a new Chromium OS checkout and
 # perform a subset of the above operations.
 #
@@ skipping 383 matching lines @@
 CHROMEOS_EXT_MIRROR="http://chromeos-deb/ubuntu"
 CHROMEOS_EXT_SUITE="karmic"
 
 # Assume Chrome is checked out nearby
 CHROMEOS_CHROME_DIR="${base_dir}/chrome"
 EOF
   fi
 }
 
 
-function check_rootfs_validity() {
-  echo "Checking rootfs validity"
-  local device=$(sudo losetup -f)
-  local invalid=0
-  sudo losetup "${device}" rootfs.image
-  sudo mount "${device}" rootfs
-  if [[ ! -e rootfs/boot/vmlinuz ]]; then
-    echo "This image has no kernel"
-    invalid=1
-  fi
-  sudo umount rootfs
-  sudo losetup -d "${device}"
-  return ${invalid}
-}
-
-
 # Downloads a buildbot image
 function grab_buildbot() {
   if [[ "${FLAGS_grab_buildbot}" == "LATEST" ]]; then
     local latest=$(curl "${FLAGS_buildbot_uri}/LATEST")
     if [[ -z "${latest}" ]]; then
       echo "Error finding latest."
       exit 1
     fi
     FLAGS_grab_buildbot="${FLAGS_buildbot_uri}/${latest}/image.zip"
   fi
   local dl_dir=$(mktemp -d "/tmp/image.XXXX")
   echo "Grabbing image from ${FLAGS_grab_buildbot} to ${dl_dir}"
   run_phase "Downloading image" curl "${FLAGS_grab_buildbot}" \
       -o "${dl_dir}/image.zip"
   cd "${dl_dir}"
   unzip image.zip
-  check_rootfs_validity
   local image_basename=$(basename $(dirname "${FLAGS_grab_buildbot}"))
   local image_base_dir="${FLAGS_top}/src/build/images/${FLAGS_board}"
   local image_dir="${image_base_dir}/${image_basename}"
   echo "Copying in build image to ${image_dir}"
   rm -rf "${image_dir}"
   mkdir -p "${image_dir}"
-  # Note that if mbr.image does not exist, this image was not successful.
-  mv mbr.image rootfs.image "${image_dir}"
   if [[ ${FLAGS_mod_image_for_test} -eq ${FLAGS_TRUE} ]]; then
     run_phase "Installing buildbot test modified image" \
-      mv rootfs_test.image "${image_dir}/rootfs.image"
+      mv chromiumos_test_image.bin "${image_dir}/chromiumos_image.bin"
     FLAGS_mod_image_for_test=${FLAGS_FALSE}
     if [[ -e "autotest.tgz" || -e "autotest.tar.bz2" ]]; then
       # pull in autotest
       local dir="${FLAGS_chroot}/build/${FLAGS_board}/usr/local"
       local tar_args="xzf"
       local tar_name="${dl_dir}/autotest.tgz"
       if [[ -e "autotest.tar.bz2" ]]; then
         tar_args="xjf"
         tar_name="${dl_dir}/autotest.tar.bz2"
       fi
       sudo rm -rf "${dir}/autotest"
       # Expand in temp directory as current user, then move it as
       # root to keep local user ownership
       run_phase "Unpacking buildbot autotest cross-compiled binaries" \
         tar ${tar_args} "${tar_name}"
       run_phase "Installing buildbot autotest cross-compiled binaries" \
         sudo mv autotest ${dir}
     fi
+  else
+    mv chromiumos_image.bin "${image_dir}"
   fi
   chdir_relative .
   run_phase "Removing downloaded image" rm -rf "${dl_dir}"
 }
 
 
 function main() {
   assert_outside_chroot
   assert_not_root_user
 
@@ skipping 108 matching lines @@
   fi
 
   trap - EXIT
   echo "Successfully used ${FLAGS_top} to:"
   describe_steps
   show_duration
 }
 
 
 main $@