build_image: use --usepkg instead of --usepkgonly

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 232 matching lines @@
     -s "${STATEFUL_FS_DIR}"
 
   # Determine the root dir for developer packages.
   local root_dev_dir="${ROOT_FS_DIR}"
   [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ] && \
     root_dev_dir="${ROOT_FS_DIR}/usr/local"
 
   # Install developer packages described in chromeos-dev.
   sudo INSTALL_MASK="${INSTALL_MASK}" ${EMERGE_BOARD_CMD} \
       --root="${root_dev_dir}" --root-deps=rdeps \
-      --usepkgonly chromeos-dev ${EMERGE_JOBS}
+      --usepkg chromeos-dev ${EMERGE_JOBS}
 
   # Re-run ldconfig to fix /etc/ldconfig.so.cache.
   sudo /sbin/ldconfig -r "${ROOT_FS_DIR}"
 
   # Mark the image as a developer image (input to chromeos_startup).
   sudo mkdir -p "${ROOT_FS_DIR}/root"
   sudo touch "${ROOT_FS_DIR}/root/.dev_mode"
 
   # Additional changes to developer image.
 
@@ skipping 27 matching lines @@
   echo "Adding recovery packages to ${image_name}"
 
   # Create stateful partition of the same size as the rootfs.
   trap "mount_gpt_cleanup \"${ROOT_FS_DIR}\" \"${STATEFUL_FS_DIR}\"" EXIT
 
   ${SCRIPTS_DIR}/mount_gpt_image.sh --from "${OUTPUT_DIR}" \
     --image "$( basename ${image_name} )" -r "${ROOT_FS_DIR}" \
     -s "${STATEFUL_FS_DIR}"
 
   # Install recovery installer.
-  sudo ${EMERGE_BOARD_CMD} --root=${ROOT_FS_DIR} --usepkgonly \
+  sudo ${EMERGE_BOARD_CMD} --root=${ROOT_FS_DIR} --usepkg \
       --root-deps=rdeps --nodeps chromeos-recovery
 
   # Re-run ldconfig to fix /etc/ldconfig.so.cache.
   sudo /sbin/ldconfig -r "${ROOT_FS_DIR}"
 
   # Mark the image as a developer image (input to chromeos_startup).
   sudo mkdir -p "${ROOT_FS_DIR}/root"
   sudo touch "${ROOT_FS_DIR}/root/.recovery_installer"
 
   trap - EXIT
@@ skipping 99 matching lines @@
 
   # 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_FS_DIR}/var" "${ROOT_FS_DIR}/var"
   sudo mkdir -p "${ROOT_FS_DIR}/dev"
 
-  # We "emerge --root=${ROOT_FS_DIR} --root-deps=rdeps --usepkgonly" all of the
+  # We "emerge --root=${ROOT_FS_DIR} --root-deps=rdeps --usepkg" all of the
   # runtime packages for chrome os. This builds up a chrome os image from
   # binary packages with runtime dependencies only.  We use INSTALL_MASK to
   # trim the image size as much as possible.
   sudo INSTALL_MASK="${INSTALL_MASK}" ${EMERGE_BOARD_CMD} \
     --root="${ROOT_FS_DIR}" --root-deps=rdeps \
-    --usepkgonly chromeos ${EMERGE_JOBS}
+    --usepkg chromeos ${EMERGE_JOBS}
 
   # 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.
   # NOTE: The size argument for mkfs.vfat is in 1024-byte blocks.
   # We'll hard-code it to 16M for now.
   ESP_BLOCKS=16384
   /usr/sbin/mkfs.vfat -C ${OUTPUT_DIR}/esp.image ${ESP_BLOCKS}
   ESP_LOOP_DEV=$(sudo losetup -f)
   if [ -z "${ESP_LOOP_DEV}" ] ; then
@@ skipping 177 matching lines @@
   echo "Developer image created as ${DEVELOPER_IMAGE_NAME}"
 fi
 
 print_time_elapsed
 
 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."