build: Build Chrome in out_$BOARD rather than $BOARD_out.

chromeos-base/chromeos-chrome/chromeos-chrome-8.0.552.308.ebuild

Index: chromeos-base/chromeos-chrome/chromeos-chrome-8.0.552.308.ebuild
diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-8.0.552.308.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-8.0.552.308.ebuild
index dd05be10f49bbab8939474e5398b191cd53a6a86..a89e59b7da7539f7f1fd3eb0870a5e34019c94a3 100755
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-8.0.552.308.ebuild
+++ b/chromeos-base/chromeos-chrome/chromeos-chrome-8.0.552.308.ebuild
@@ -90,9 +90,9 @@ BUILD_TOOL=make
 BUILD_DEFINES="sysroot=$ROOT python_ver=2.6 swig_defines=-DOS_CHROMEOS linux_use_tcmalloc=0 chromeos=1 linux_sandbox_path=${CHROME_DIR}/chrome-sandbox ${EXTRA_BUILD_ARGS}"
 BUILDTYPE="${BUILDTYPE:-Release}"
 BOARD="${BOARD:-${SYSROOT##/build/}}"
-BUILD_OUT="${BUILD_OUT:-${BOARD}_out}"
-# WARNING: We are using a symlink now for the build directory to work around 
-# command line length limits. This will cause problems if you are doing 
+BUILD_OUT="${BUILD_OUT:-out_${BOARD}}"
+# WARNING: We are using a symlink now for the build directory to work around
+# command line length limits. This will cause problems if you are doing
 # parallel builds of different boards/variants.
 # Unsetting BUILD_OUT_SYM will revert this behavior
 BUILD_OUT_SYM="c"
@@ -373,6 +373,15 @@ src_prepare() {
 	elog "${CHROME_ROOT} should be set here properly"
 	cd "${CHROME_ROOT}/src" || die "Cannot chdir to ${CHROME_ROOT}"
 
+	# If there's already a build directory in the old location, rename it to the

[kliegs, 2010/12/03 19:44:19]

Keep comments <80 chars please

[Daniel Erat, 2010/12/03 19:50:35]

They are (well, one line is exactly 80 columns).  ebuilds use 4-character tabs
but Rietveld doesn't understand this.

+	# new location.
+	# TODO(derat): Remove this in January 2011.

[kliegs, 2010/12/03 19:44:19]

I'd rather see this as a specific week or date.  removing this Jan 1 is
potentially troublesome given potential holiday schedules and such.
Although all removing it seems to do is cause some wasted disk space so not a
big deal if it goes early as I think on it more.

[Daniel Erat, 2010/12/03 19:50:35]

I didn't add a date since it doesn't really matter when this gets removed, or
even if it gets removed.  No sense it keeping it around forever, but I've fine
with choosing some arbitrary date in February if you're worried that there are
some people who might not do any builds between now and whenever in January I
take this out.

+	OLD_BUILD_OUT="${BOARD}_out"
+	if [[ -d "${OLD_BUILD_OUT}" && ! -e "${BUILD_OUT}" ]]; then
+		elog "Renaming output directory ${OLD_BUILD_OUT} to ${BUILD_OUT}"
+		mv "${OLD_BUILD_OUT}" "${BUILD_OUT}"
+	fi
+
 	# We do symlink creation here if appropriate
 	if [ ! -z "${BUILD_OUT_SYM}" ]; then
 		if [ -h "${BUILD_OUT_SYM}" ]; then  # remove if an existing symlink