build_image: Merge x86 and ARM where possible.

image_to_usb.sh

 #!/bin/bash
 
 # Copyright (c) 2009 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 convert the output of build_image.sh to a usb image.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 225 matching lines @@
 
   if [ ${FLAGS_install} -ne ${FLAGS_TRUE} ]; then
     echo "Copying ${SRC_IMAGE} to ${FLAGS_to}..."
     sudo dd if="${SRC_IMAGE}" of="${FLAGS_to}" bs=4M
     sync
   else
     if [ ${INSIDE_CHROOT} -ne 1 ]; then
       echo "Installation must be done from inside the chroot."
       exit 1
     fi
-    #TODO(kwaters): fix when verified root works on ARM
-    [ "${FLAGS_arch}" = "ARM" ] && SKIP_VBLOCK="--skip_vblock"
 
     echo "Installing ${SRC_IMAGE} to ${FLAGS_to}..."
     "${FLAGS_build_root}/${FLAGS_board}/usr/sbin/chromeos-install" \
       --yes \
       --skip_src_removable \
       --skip_dst_removable \
-      ${SKIP_VBLOCK:-} \
       --arch="${FLAGS_arch}" \
       --payload_image="${SRC_IMAGE}" \
       --dst="${FLAGS_to}"
   fi
   echo "Done."
 else
   # Output to a file, so just make a copy.
   echo "Copying ${SRC_IMAGE} to ${FLAGS_to}..."
   cp -f "${SRC_IMAGE}" "${FLAGS_to}"
 
   echo "Done.  To copy to a USB drive, outside the chroot, do something like:"
   echo "   sudo dd if=${FLAGS_to} of=/dev/sdX bs=4M"
   echo "where /dev/sdX is the entire drive."
   if [ ${INSIDE_CHROOT} -eq 1 ]
   then
     example=$(basename "${FLAGS_to}")
     echo "NOTE: Since you are currently inside the chroot, and you'll need to"
     echo "run dd outside the chroot, the path to the USB image will be"
     echo "different (ex: ~/chromeos/trunk/src/build/images/SOME_DIR/$example)."
   fi
 fi