From 3b11b450eaf8834764a746369d6d04e17aca0aec Mon Sep 17 00:00:00 2001 From: Liam McLoughlin Date: Mon, 14 Mar 2011 16:04:07 -0700 Subject: [PATCH] Re-enable chroot passthru for AU server environment variable override Change-Id: I9856fe64942d586281fee09dff15af9d8178b392 BUG=none TEST=manual Review URL: http://codereview.chromium.org/6633009 Patch from Liam McLoughlin . --- enter_chroot.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/enter_chroot.sh b/enter_chroot.sh index b3da25f34d..bca9c68866 100755 --- a/enter_chroot.sh +++ b/enter_chroot.sh @@ -353,6 +353,15 @@ CHROOT_PASSTHRU="BUILDBOT_BUILD=$FLAGS_build_number CHROMEOS_OFFICIAL=$CHROMEOS_ CHROOT_PASSTHRU="${CHROOT_PASSTHRU} \ CHROMEOS_RELEASE_APPID=${CHROMEOS_RELEASE_APPID:-"{DEV-BUILD}"}" +# Set CHROMEOS_VERSION_TRACK, CHROMEOS_VERSION_AUSERVER, +# CHROMEOS_VERSION_DEVSERVER as environment variables to override the default +# assumptions (local AU server). These are used in cros_set_lsb_release, and +# are used by external Chromium OS builders. +CHROOT_PASSTHRU="${CHROOT_PASSTHRU} \ +CHROMEOS_VERSION_TRACK=${CHROMEOS_VERSION_TRACK} \ +CHROMEOS_VERSION_AUSERVER=${CHROMEOS_VERSION_AUSERVER} \ +CHROMEOS_VERSION_DEVSERVER=${CHROMEOS_VERSION_DEVSERVER}" + if [ -d "$HOME/.subversion" ]; then TARGET="/home/${USER}/.subversion" mkdir -p "${FLAGS_chroot}${TARGET}"