Update make.globals fixing code to point at new location of make.globals.

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 425 matching lines @@
       --usepkgonly -uDNv chromeos-dev ${EMERGE_JOBS}
 
   if [[ $FLAGS_preserve -eq ${FLAGS_TRUE} ]] ; then
     # Clean out unused packages
     sudo INSTALL_MASK="${INSTALL_MASK}" ${EMERGE_BOARD_CMD} \
       --root="${ROOT_FS_DIR}" --root-deps=rdeps \
       --usepkgonly --depclean ${EMERGE_JOBS}
   fi
 
   # Install the bare necessary files so that the "emerge" command works
-  [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ] && \
-    sudo cp ${root_dev_dir}/etc/make.globals ${ROOT_FS_DIR}/etc/
-  sudo sed -i s,/usr/bin/wget,wget, ${ROOT_FS_DIR}/etc/make.globals
+  if [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ]; then
+    sudo ln -sft ${ROOT_FS_DIR}/usr/share ../../usr/local/share/portage
+    sudo sed -i s,/usr/bin/wget,wget, \
+      ${root_dev_dir}/share/portage/config/make.globals
+  fi
   sudo mkdir -p ${ROOT_FS_DIR}/etc/make.profile
 
   # 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 384 matching lines @@
   echo "Developer image created as ${DEVELOPER_IMAGE_NAME}"
 fi
 
 print_time_elapsed
 
 echo "To copy to USB keyfob, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdX"
 echo "To convert to VMWare image, INSIDE the chroot, do something like:"
 echo "  ./image_to_vm.sh --from=${OUTSIDE_OUTPUT_DIR} --board=${BOARD}"
 echo "from the scripts directory where you entered the chroot."