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

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

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=4952343

[zbehan, 2011-02-17 23:09:01]

LGTM!

On Thu, Feb 17, 2011 at 11:37 PM, <davidjames@chromium.org> wrote:

> Reviewers: rochberg, zbehan, Paul Stewart,
>
> Description:
> 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
>
> Please review this at http://codereview.chromium.org/6532038/
>
> SVN Base: http://git.chromium.org/git/crosutils.git@master
>
> Affected files:
>  M build_image
>
>
> Index: build_image
> diff --git a/build_image b/build_image
> index
>
271ef62b7174e6626bfec44a1d0b05b002b429c0..70b459cb70f65d4b8e920db0bccfe23a2af05e13
> 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 -s ../../usr/local/share/portage ${ROOT_FS_DIR}/usr/share
> +    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.
>
>
>

[rochberg, 2011-02-18 01:44:20]

LGTM