Various image build improvements for ARM

src/scripts/build_image.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 build a bootable keyfob-based chromeos system image.
 # It uses debootstrap (see https://wiki.ubuntu.com/DebootstrapChroot) to
 # create a base file system. It then cusotmizes the file system and adds
 # Ubuntu and chromeos specific packages. Finally, it creates a bootable USB
@@ skipping 15 matching lines @@
 DEFINE_integer build_attempt 1                                \
   "The build attempt for this image build."
 DEFINE_string output_root "${DEFAULT_BUILD_ROOT}/images"      \
   "Directory in which to place image result directories (named by version)"
 DEFINE_string build_root "$DEFAULT_BUILD_ROOT"                \
   "Root of build output"
 DEFINE_boolean replace $FLAGS_FALSE "Overwrite existing output, if any."
 DEFINE_boolean increment $FLAGS_FALSE \
   "Picks the latest build and increments the minor version by one."
 
+DEFINE_string arch "x86" \
+  "The target architecture to build for. One of { x86, armel }."
 DEFINE_string mirror "$DEFAULT_IMG_MIRROR" "Repository mirror to use."
 DEFINE_string suite "$DEFAULT_IMG_SUITE" "Repository suite to base image on."
+DEFINE_string mirror2 "" "Additional repository mirror to use (URL only)."
+DEFINE_string suite2 "" "Repository suite for additional mirror."
 DEFINE_string pkglist "$DEFAULT_PKGLIST" \
   "Name of file listing packages to install from repository."
 DEFINE_boolean with_dev_pkgs $FLAGS_TRUE \
   "Include additional developer-friendly packages in the image."
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # Die on any errors.
@@ skipping 73 matching lines @@
 # -- Install packages and customize root file system. --
 PKGLIST="$FLAGS_pkglist"
 if [ $FLAGS_with_dev_pkgs -eq $FLAGS_TRUE ]; then
   PKGLIST="$PKGLIST,${SRC_ROOT}/package_repo/package-list-debug.txt"
 fi
 "${SCRIPTS_DIR}/install_packages.sh"  \
   --build_root="${FLAGS_build_root}"  \
   --root="$ROOT_FS_DIR"               \
   --output_dir="${OUTPUT_DIR}"        \
   --package_list="$PKGLIST"           \
+  --arch="$FLAGS_arch"                \
   --mirror="$FLAGS_mirror"            \
-  --suite="$FLAGS_suite"
+  --suite="$FLAGS_suite"              \
+  --mirror2="$FLAGS_mirror2"          \
+  --suite2="$FLAGS_suite2"
 
 "${SCRIPTS_DIR}/customize_rootfs.sh" --root="${ROOT_FS_DIR}"
 
 # -- Turn root file system into bootable image --
 
 # Setup extlinux configuration.
 # TODO: For some reason the /dev/disk/by-uuid is not being generated by udev
 # in the initramfs. When we figure that out, switch to root=UUID=$UUID.
 cat <<EOF | sudo dd of="$ROOT_FS_DIR"/boot/extlinux.conf
 DEFAULT chromeos-usb
@@ skipping 31 matching lines @@
 EOF
 
 OUTSIDE_OUTPUT_DIR="${EXTERNAL_TRUNK_PATH}/src/build/images/${IMAGE_SUBDIR}"
 echo "Done.  Image created in ${OUTPUT_DIR}"
 echo "To copy to USB keyfob, outside the chroot, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdb"
 echo "To convert to VMWare image, outside the chroot, do something like:"
 echo "  ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
 
 trap - EXIT