Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3168)

Unified Diff: build_image

Issue 6532038: Update make.globals fixing code to point at new location of make.globals. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: Update to replace existing symlink in --preserve case. Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_image
diff --git a/build_image b/build_image
index 271ef62b7174e6626bfec44a1d0b05b002b429c0..0f0d2bec98fd5735a34cc9a4e25f1bc7c6fc7f55 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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698