Update build_image to link to make.globals directly, instead of to directory.

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.

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

[anush, 2011-02-23 20:01:05]

On Wed, Feb 23, 2011 at 11:03 AM, <davidjames@chromium.org> wrote:

> Reviewers: Daniel Kurtz, sosa, marcheu,
>
> Description:
> 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.
>
>
> Please review this at http://codereview.chromium.org/6583001/
>
> 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
>
0f0d2bec98fd5735a34cc9a4e25f1bc7c6fc7f55..2a1fd72788efe1ab1a9959ddcdf54c59149198bc
> 100755
> --- a/build_image
> +++ b/build_image
> @@ -444,7 +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 mkdir -p ${ROOT_FS_DIR}/usr/share/portage/config
> +    sudo ln -sf /usr/local/share/portage/config/make.globals \
> +                ${ROOT_FS_DIR}/usr/share/portage/config
>


I missed the original reason we changed it from a copy to a symlink. Do we
have a reference to the original CL ?


>     sudo sed -i s,/usr/bin/wget,wget, \
>       ${root_dev_dir}/share/portage/config/make.globals
>   fi
>
>
>

[davidjames, 2011-02-23 20:15:41]

> I missed the original reason we changed it from a copy to a symlink. Do we
> have a reference to the original CL ?

It works just as well with a copy as it does with a symlink. In case you prefer
the copy, I've updated the CL to use a copy instead.

Original CL fixing make.globals for new location of file is here:
http://codereview.chromium.org/6532038

[marcheu, 2011-02-23 22:21:23]

LGTM.