scripts: allow calling cros_generate_update_payload from outside the chroot

scripts: allow calling cros_generate_update_payload from outside the chroot

This was broken by 798d75f3be614af161d5687d9335956730d28e45 and there
isn't a proper way to fix it right now, as that commit generally moves
everything inside the chroot. The few remaining scripts that need to be
called from outside need to do a path magic here or there to survive.

BUG=n0ne
TEST=below
1) generate_au_zip.py, unzip it outside the chroot and try running the script
2) cros_au_test_harness

Change-Id: I14bf0267ba2864d7946d657b23812b3dcd512f48

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

[zbehan, 2011-02-28 23:21:56]

Ran through cros_au_test_harness to make sure this doesn't break inside the
chroot runs.

On Mon, Feb 28, 2011 at 11:59 PM, <zbehan@chromium.org> wrote:

> Reviewers: djmm, Raja Aluri, scottz, anush, Greg Spencer (Chromium),
>
> Description:
> scripts: allow calling cros_generate_update_payload from outside the chroot
>
> This was broken by 798d75f3be614af161d5687d9335956730d28e45 and there
> isn't a proper way to fix it right now, as that commit generally moves
> everything inside the chroot. The few remaining scripts that need to be
> called from outside need to do a path magic here or there to survive.
>
> BUG=n0ne
> TEST=generate_au_zip.py, unzip it outside the chroot and try running the
> script
>
> Change-Id: I14bf0267ba2864d7946d657b23812b3dcd512f48
>
> Please review this at http://codereview.chromium.org/6602018/
>
> SVN Base: ssh://git@gitrw.chromium.org:9222/crosutils.git@master
>
> Affected files:
>  M cros_generate_update_payload
>
>
> Index: cros_generate_update_payload
> diff --git a/cros_generate_update_payload b/cros_generate_update_payload
> index
>
b55f438526109e2db548938d8d5b588a5ede0ec9..4f5d86c12acbb5256384e209e012cca0eed71862
> 100755
> --- a/cros_generate_update_payload
> +++ b/cros_generate_update_payload
> @@ -12,7 +12,8 @@
>  # /usr/lib/crosutils.  Outside the chroot we find it relative to the
> script's
>  # location.
>  find_common_sh() {
> -  local common_paths=(/usr/lib/crosutils $(dirname "$(readlink -f "$0")"))
> +  local thisdir="$(dirname "$(readlink -f "$0")")"
> +  local common_paths=(/usr/lib/crosutils "${thisdir}")
>   local path
>
>   SCRIPT_ROOT=
> @@ -22,17 +23,22 @@ find_common_sh() {
>       break
>     fi
>   done
> +
> +  # HACK(zbehan): We have to fake GCLIENT_ROOT in case we're running
> inside
> +  # au_zip enviroment. GCLIENT_ROOT detection became fatal...
> +  [ "${SCRIPT_ROOT}" == "${thisdir}" ] && \
> +    export GCLIENT_ROOT="."
>  }
>
>  find_common_sh
>  . "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit
> 1)
>  # --- END COMMON.SH BOILERPLATE ---
>
> -# Need to be inside the chroot to load chromeos-common.sh
> -assert_inside_chroot
> -
>  # Load functions and constants for chromeos-install
> -. "/usr/lib/installer/chromeos-common.sh" || \
> +# NOTE: Needs to be called from outside the chroot.
> +. "/usr/lib/installer/chromeos-common.sh" &> /dev/null || \
> +. "${SRC_ROOT}/platform/installer/chromeos-common.sh" &> /dev/null || \
> +. "./chromeos-common.sh" || \
>   die "Unable to load /usr/lib/installer/chromeos-common.sh"
>
>  SRC_MNT=""
>
>
>

[djmm, 2011-02-28 23:28:57]

LGTM