Move to using chromeos-test to emerge test dependencies in mod_image_for_test.

src/scripts/build_image

 #!/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 from within
 # a chromiumos setup. This assumes that all needed packages have been built into
 # the given target's root with binary packages turned on. This script will
 # build the Chrome OS image using only pre-built binary packages.
@@ skipping 21 matching lines @@
 DEFINE_boolean withdev $FLAGS_TRUE \
   "Include useful developer friendly utilities in the image."
 DEFINE_boolean installmask $FLAGS_TRUE \
   "Use INSTALL_MASK to shrink the resulting image."
 DEFINE_integer jobs -1 \
   "How many packages to build in parallel at maximum."
 DEFINE_boolean statefuldev $FLAGS_TRUE \
   "Install development packages on stateful partition rather than the rootfs"
 DEFINE_string to "" \
   "The target image file or device"
-DEFINE_boolean withtest $FLAGS_FALSE \
-  "Include packages required for testing and prepare image for testing"
 DEFINE_string arm_extra_bootargs "" \
   "Additional command line options to pass to the ARM kernel."
 
 # Parse command line.
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # Only now can we die on error.  shflags functions leak non-zero error codes,
 # so will die prematurely if 'set -e' is specified before now.
 set -e
@@ skipping 106 matching lines @@
     echo "Not deleting $OUTPUT_DIR. Note dev server updates will not work" \
       "until you successfully build another image or delete this directory"
   fi
 }
 
 # ${DEV_IMAGE_ROOT} specifies the location of where developer packages will
 # be installed on the stateful dir.  On a Chromium OS system, this will
 # translate to /usr/local
 DEV_IMAGE_ROOT=
 
-# Sets up symlinks for the stateful partition based on the root specified by
-# ${1} and var directory specified by ${2}.
-setup_symlinks_on_root() {
-  echo "Setting up symlinks on the stateful partition rooted at ${1} with"\
-    "var directory located at ${2}"
-
-  for path in usr local; do
-    if [ -h "${DEV_IMAGE_ROOT}/${path}" ] ; then
-      sudo unlink "${DEV_IMAGE_ROOT}/${path}"
-    elif [ -e "${DEV_IMAGE_ROOT}/${path}" ] ; then
-      echo "*** ERROR: ${DEV_IMAGE_ROOT}/${path} should be a symlink if exists"
-      return 1
-    fi
-    sudo ln -s ${1} "${DEV_IMAGE_ROOT}/${path}"
-  done
-
-  # Setup var.  Var is on the stateful partition at /var for both non-developer
-  # builds and developer builds.
-  if [ -h "${DEV_IMAGE_ROOT}/var" ] ; then
-    sudo unlink "${DEV_IMAGE_ROOT}/var"
-  elif [ -e "${DEV_IMAGE_ROOT}/var" ] ; then
-    echo "*** ERROR: ${DEV_IMAGE_ROOT}/var should be a symlink if it exists"
-    return 1
-  fi
-
-  sudo ln -s "${2}" "${DEV_IMAGE_ROOT}/var"
-}
-
 trap "cleanup && delete_prompt" EXIT
 
 mkdir -p "$ROOT_FS_DIR"
 
 # Create and format the root file system.
 
 # Check for loop device before creating image.
 LOOP_DEV=$(sudo losetup -f)
 if [ -z "$LOOP_DEV" ] ; then
   echo "No free loop device.  Free up a loop device or reboot.  exiting. "
@@ skipping 84 matching lines @@
 if [[ $FLAGS_jobs -ne -1 ]]; then
   EMERGE_JOBS="--jobs=$FLAGS_jobs"
 fi
 
 # Prepare stateful partition with some pre-created directories
 sudo mkdir -p "${DEV_IMAGE_ROOT}"
 sudo mkdir -p "${STATEFUL_DIR}/var"
 
 # Create symlinks so that /usr/local/usr based directories are symlinked to
 # /usr/local/ directories e.g. /usr/local/usr/bin -> /usr/local/bin, etc.
-setup_symlinks_on_root "${DEV_IMAGE_ROOT}" "${STATEFUL_DIR}/var"
+setup_symlinks_on_root "${DEV_IMAGE_ROOT}" "${STATEFUL_DIR}/var" \
+  "${STATEFUL_DIR}"
 
 # Perform binding rather than symlinking because directories must exist
 # on rootfs so that we can bind at run-time since rootfs is read-only
 echo "Binding directories from stateful partition onto the rootfs"
 sudo mkdir -p "${ROOT_FS_DIR}/usr/local"
 sudo mount --bind "${DEV_IMAGE_ROOT}" "${ROOT_FS_DIR}/usr/local"
 sudo mkdir -p "${ROOT_FS_DIR}/var"
 sudo mount --bind "${STATEFUL_DIR}/var" "${ROOT_FS_DIR}/var"
 
 # We "emerge --root=$ROOT_FS_DIR --root-deps=rdeps --usepkgonly" all of the
@@ skipping 15 matching lines @@
       --usepkgonly chromeos-dev $EMERGE_JOBS
 
   # TODO(sosa@chromium.org) - Re-hide under statefuldev after switch
   # Flag will mount /usr/local on target device
   sudo mkdir -p "$ROOT_FS_DIR/root"
 
   # The ldd tool is a useful shell script but lives in glibc; just copy it.
   sudo cp -a "$(which ldd)" "${ROOT_DEV_DIR}/usr/bin"
 fi
 
-# Install packages required for testing.
-if [[ $FLAGS_withtest -eq $FLAGS_TRUE ]] ; then
-  sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
-      --root="$ROOT_DEV_DIR" --root-deps=rdeps \
-      --usepkgonly chromeos-test $EMERGE_JOBS
-fi
-
 # Extract the kernel from the root filesystem for use by the GPT image. Legacy
 # BIOS will use the kernel in the rootfs (via syslinux), Chrome OS BIOS will
 # use the kernel partition.
 sudo cp -f "${ROOT_FS_DIR}/boot/vmlinuz" "${OUTPUT_DIR}/vmlinuz.image"
 
 # Create EFI System Partition to boot stock EFI BIOS (but not ChromeOS EFI
 # BIOS). We only need this for x86, but it's simpler and safer to keep the disk
 # images the same for both x86 and ARM.
 ESP_IMG=${OUTPUT_DIR}/esp.image
 # NOTE: The size argument for mkfs.vfat is in 1024-byte blocks. We'll hard-code
@@ skipping 52 matching lines @@
   --board="$BOARD"
 
 # Check that the image has been correctly created.
 "${SCRIPTS_DIR}/test_image" \
   --root="$ROOT_FS_DIR" \
   --target="$ARCH"
 
 # Clean up symlinks so they work on a running target rooted at "/".
 # Here development packages are rooted at /usr/local.  However, do not
 # create /usr/local or /var on host (already exist on target).
-setup_symlinks_on_root "/usr/local" "/var"
+setup_symlinks_on_root "/usr/local" "/var" "${STATEFUL_DIR}"
 
 # Cleanup loop devices.
 cleanup
 
 trap delete_prompt EXIT
 
 # Create the GPT-formatted image
 ${SCRIPTS_DIR}/build_gpt.sh \
   --arch=${ARCH} \
   --board=${FLAGS_board} \
   --arm_extra_bootargs="${FLAGS_arm_extra_bootargs}" \
   "${OUTPUT_DIR}" \
   "${OUTPUT_IMG}"
 
 # Clean up temporary files.
 rm -f "${ROOT_FS_IMG}" "${STATEFUL_IMG}" "${OUTPUT_DIR}/vmlinuz.image" \
   "${ESP_IMG}"
 rmdir "${ROOT_FS_DIR}" "${STATEFUL_DIR}" "${ESP_DIR}"
 
 OUTSIDE_OUTPUT_DIR="../build/images/${FLAGS_board}/${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/sdX"
 echo "To convert to VMWare image, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
 echo "from the scripts directory where you entered the chroot."
 
 trap - EXIT