From 49523439a1212aa2351ba923b08d0e2728fb143e Mon Sep 17 00:00:00 2001
From: David James <davidjames@google.com>
Date: Thu, 17 Feb 2011 15:19:16 -0800
Subject: [PATCH] Update make.globals fixing code to point at new location of
 make.globals.

BUG=chromium-os:12264
TEST=Ran build_image, verified existence of /usr/share/portage/config/make.globals

Review URL: http://codereview.chromium.org/6532038

Change-Id: I621110738a1e8d789a4f58bdc1db1a7b2251ad29
---
 build_image | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build_image b/build_image
index 271ef62b71..0f0d2bec98 100755
--- a/build_image
+++ b/build_image
@@ -443,9 +443,11 @@ update_dev_packages() {
   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.