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
This commit is contained in:
David James 2011-02-17 15:19:16 -08:00
parent 9769c6bc9f
commit 49523439a1

View File

@ -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.