Revert "Teach build_image to pull from buildbot as necessary..."

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 189 matching lines @@
     --image "$DEVELOPER_IMAGE_NAME" -r "$root_fs_dir" -s "$stateful_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} \
       --root="$root_dev_dir" --root-deps=rdeps \
-      --getbinpkg --usepkg chromeos-dev $EMERGE_JOBS
+      --usepkgonly 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 157 matching lines @@
 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
 # 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} \
   --root="$ROOT_FS_DIR" --root-deps=rdeps \
-  --getbinpkg --usepkg chromeos $EMERGE_JOBS
+  --usepkgonly chromeos $EMERGE_JOBS
 
 # 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
@@ skipping 81 matching lines @@
 echo "Done.  Image created in ${OUTPUT_DIR}"
 echo "Chromium OS image created as $PRISTINE_IMAGE_NAME"
 if [ "$FLAGS_withdev" -eq "$FLAGS_TRUE" ]; then
   echo "Developer image created as $DEVELOPER_IMAGE_NAME"
 fi
 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."