Split out installation of packages from customize_rootfs into a separate script.

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 48 matching lines @@
 
 # Use canonical path since some tools (e.g. mount) do not like symlinks
 # Append build attempt to output directory
 IMAGE_SUBDIR="${CHROMEOS_VERSION_STRING}-a${FLAGS_build_attempt}"
 OUTPUT_DIR="${FLAGS_output_root}/${IMAGE_SUBDIR}"
 ROOT_FS_DIR="${OUTPUT_DIR}/rootfs"
 ROOT_FS_IMG="${OUTPUT_DIR}/rootfs.image"
 MBR_IMG="${OUTPUT_DIR}/mbr.image"
 OUTPUT_IMG="${OUTPUT_DIR}/usb.img"
 
+ROOTFS_PACKAGE_INSTALL_SCRIPT="install_packages.sh"
 ROOTFS_CUSTOMIZE_SCRIPT="customize_rootfs.sh"
 ROOTFS_SETUP_DIR="/tmp/chromeos_setup"
 SETUP_DIR="${ROOT_FS_DIR}/${ROOTFS_SETUP_DIR}"
 
 LOOP_DEV=
 
 # Handle existing directory
 if [ -e "$OUTPUT_DIR" ]
 then
   if [ $FLAGS_replace -eq $FLAGS_TRUE ]
@@ skipping 93 matching lines @@
 
 # Set up bind mount for trunk, so we can get to package repository
 # TODO: also use this instead of SETUP_DIR for other things below?
 sudo mkdir -p "$ROOT_FS_DIR/trunk"
 sudo mount --bind "$GCLIENT_ROOT" "$ROOT_FS_DIR/trunk"
 
 # Create setup directory and copy over scripts, config files, and locally
 # built packages.
 mkdir -p "$SETUP_DIR"
 mkdir -p "${SETUP_DIR}/local_packages"
+cp "${SCRIPTS_DIR}/${ROOTFS_PACKAGE_INSTALL_SCRIPT}" "$SETUP_DIR"
 cp "${SCRIPTS_DIR}/${ROOTFS_CUSTOMIZE_SCRIPT}" "$SETUP_DIR"
 cp "$FLAGS_pkglist" "${SETUP_DIR}/package-list-prod.txt"
 cp "${FLAGS_build_root}/x86/local_packages"/* "${SETUP_DIR}/local_packages"
 
 if [ -n "$FLAGS_pkglist2" ]
 then
   cp "$FLAGS_pkglist2" "${SETUP_DIR}/package-list-2.txt"
 fi
 
 # Set up repository for local packages to install in the rootfs via apt-get.
@@ skipping 13 matching lines @@
 SETUP_DIR="$ROOTFS_SETUP_DIR"
 KERNEL_VERSION="$KERNEL_VERSION"
 SERVER="$MIRROR_INSIDE"
 SUITE="$FLAGS_suite"
 SERVER2="$MIRROR2_INSIDE"
 SUITE2="$FLAGS_suite2"
 EOF
 # ...and all CHROMEOS_ vars
 set | grep "^CHROMEOS_" >> $CUST_OPTS
 
-# Run the setup script
+# Run the package install script
+sudo chroot "$ROOT_FS_DIR" \
+  "${ROOTFS_SETUP_DIR}/${ROOTFS_PACKAGE_INSTALL_SCRIPT}"
+
+# Run the script to customize the resulting root file system.
 sudo chroot "$ROOT_FS_DIR" "${ROOTFS_SETUP_DIR}/${ROOTFS_CUSTOMIZE_SCRIPT}"
 
+# No longer need the setup directory in the rootfs.
+rm -rf "$SETUP_DIR"
+
 # Move package lists from the image into the output dir
 sudo mv "$ROOT_FS_DIR"/etc/package_list_*.txt "$OUTPUT_DIR"
 
 # Unmount mounts within the rootfs so it is ready to be imaged.
 cleanup_rootfs_mounts
 
 # -- 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
@@ skipping 34 matching lines @@
 EOF
 
 OUTSIDE_OUTPUT_DIR="~/chromeos/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