From e8875485ea40f77f98c3d13063ef4e9f30e9511f Mon Sep 17 00:00:00 2001 From: David James Date: Wed, 23 Feb 2011 15:24:14 -0800 Subject: [PATCH] Update build_image to link to make.globals directly, instead of to directory. The xorg-server ebuild creates /usr/share/portage on the rootfs partition. This breaks build_image which wants to point the same directory at the stateful partition. To work around this we just link to make.globals directly. This workaround fixes gmerge but doesn't address the problem that there might be more files inside /usr/share/portage. A better fix should be addressed as part of crosbug.com/11502 BUG=chromium-os:12441 TEST=Run build_image and verify /usr/share/portage/config/make.globals points to /usr/local/share/portage/config/make.globals and that the latter also exists. Review URL: http://codereview.chromium.org/6583001 Change-Id: I52fd9d34bf29573fbf6ca013ba49d1c8608e066d --- build_image | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_image b/build_image index 0f0d2bec98..ea0000ef99 100755 --- a/build_image +++ b/build_image @@ -444,9 +444,9 @@ update_dev_packages() { # Install the bare necessary files so that the "emerge" command works if [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ]; then - sudo ln -sft ${ROOT_FS_DIR}/usr/share ../../usr/local/share/portage + sudo cp -a ${root_dev_dir}/share/portage ${ROOT_FS_DIR}/usr/share sudo sed -i s,/usr/bin/wget,wget, \ - ${root_dev_dir}/share/portage/config/make.globals + ${ROOT_FS_DIR}/usr/share/portage/config/make.globals fi sudo mkdir -p ${ROOT_FS_DIR}/etc/make.profile