From 87dd2be709166f18c5bade969eef17083fa3a8c3 Mon Sep 17 00:00:00 2001 From: Darin Petkov Date: Tue, 1 Mar 2011 09:25:09 -0800 Subject: [PATCH] Remove obsolete CHROMEOS_REVISION setting in enter_chroot. BUG=chromium-os:11647 TEST=enter_chroot, build_image Change-Id: Ib97e27fd0e6292ec7504dbc4312254bc574ba171 Review URL: http://codereview.chromium.org/6598056 --- enter_chroot.sh | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/enter_chroot.sh b/enter_chroot.sh index ac54459e2c..39b7f5dfa6 100755 --- a/enter_chroot.sh +++ b/enter_chroot.sh @@ -351,22 +351,7 @@ chroot_hacks_too trap teardown_env EXIT setup_env -# Get the git revision to pass into the chroot. -# -# This must be determined outside the chroot because (1) there is no -# git inside the chroot, and (2) if there were it would likely be -# the wrong version, which would mess up the .git directories. -# -# Note that this fixes $CHROMEOS_REVISION at the time the chroot is -# entered. That's ok for the main use case of automated builds, -# which pass each command line into a separate call to enter_chroot -# so always have up-to-date info. For developer builds, there may not -# be a single revision, since the developer may have -# hand-sync'd some subdirs and edited files in others. -# In that case, check against origin/HEAD and mark** revision. -# Use git:8 chars of sha1 -REVISION=$(cd ${FLAGS_trunk}/src/scripts ; git rev-parse --short=8 HEAD) -CHROOT_PASSTHRU="CHROMEOS_REVISION=$REVISION BUILDBOT_BUILD=$FLAGS_build_number CHROMEOS_OFFICIAL=$CHROMEOS_OFFICIAL" +CHROOT_PASSTHRU="BUILDBOT_BUILD=$FLAGS_build_number CHROMEOS_OFFICIAL=$CHROMEOS_OFFICIAL" CHROOT_PASSTHRU="${CHROOT_PASSTHRU} \ CHROMEOS_RELEASE_APPID=${CHROMEOS_RELEASE_APPID:-"{DEV-BUILD}"}" CHROOT_PASSTHRU="${CHROOT_PASSTHRU} \