Fix common.sh to work in it's new location at /usr/lib/crosutils.

common.sh

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Common constants for build scripts
 # This must evaluate properly for both /bin/bash and /bin/sh
 
 # All scripts should die on error unless commands are specifically excepted
 # by prefixing with '!' or surrounded by 'set +e' / 'set -e'.
 # TODO: Re-enable this once shflags is less prone to dying.
 #set -e
 
 # The number of jobs to pass to tools that can run in parallel (such as make
 # and dpkg-buildpackage
 NUM_JOBS=`grep -c "^processor" /proc/cpuinfo`
 
 # Store location of the calling script.
 TOP_SCRIPT_DIR="${TOP_SCRIPT_DIR:-$(dirname $0)}"
 
+# Detect whether we're inside a chroot or not
+if [ -e /etc/debian_chroot ]
+then
+  INSIDE_CHROOT=1
+else
+  INSIDE_CHROOT=0
+fi
+
 # Find root of source tree
 if [ "x$GCLIENT_ROOT" != "x" ]
 then
   # GCLIENT_ROOT already set, so we're done
   true
+elif [ $INSIDE_CHROOT -eq 1 ]
+then
+  # If we are inside the chroot and we haven't been told otherwise, we assume
+  # that the GCLIENT_ROOT is ~/trunk.
+  GCLIENT_ROOT="/home/${SUDO_USER:-$USER}/trunk"

[davidjames, 2011/01/26 21:26:14]

Hmm, so this doesn't work for me.

./enter_chroot.sh -- sh -c 'echo $SUDO_USER' reports root, whereas
./enter_chroot.sh -- sh -c 'echo $USER' reports davidjames.

Here's the output I get for cros_overlay_list with your patch:

$ ./bin/cros_overlay_list --board tegra2 --variant seaboard
ERROR  : There is no variant overlay called 'seaboard'

 elif [ "x$COMMON_SH" != "x" ]
 then
   # COMMON_SH set, so assume that's us
   GCLIENT_ROOT="$(dirname "$COMMON_SH")/../.."
 elif [ "x$BASH_SOURCE" != "x" ]
 then
   # Using bash, so we can find ourselves
   GCLIENT_ROOT="$(dirname "$BASH_SOURCE")/../.."
 else
   # Using dash or sh, we don't know where we are.  $0 refers to the calling
@@ skipping 74 matching lines @@
 fi
 # Strip CR
 ALL_BOARDS=$(echo $ALL_BOARDS)
 # Set a default BOARD
 #DEFAULT_BOARD=x86-generic # or...
 DEFAULT_BOARD=$(echo $ALL_BOARDS | awk '{print $NF}')
 
 # Enable --fast by default.
 DEFAULT_FAST="${FLAGS_TRUE}"
 
-# Detect whether we're inside a chroot or not
-if [ -e /etc/debian_chroot ]
-then
-  INSIDE_CHROOT=1
-else
-  INSIDE_CHROOT=0
-fi
-
 # Directory locations inside the dev chroot
 CHROOT_TRUNK_DIR="/home/$USER/trunk"
 
 # Install make for portage ebuilds.  Used by build_image and gmergefs.
 # TODO: Is /usr/local/autotest-chrome still used by anyone?
 DEFAULT_INSTALL_MASK="
   *.a
   *.la
   /etc/init.d
   /etc/runlevels
@@ skipping 438 matching lines @@
 
   BOARD=$(echo "$flags_board" | cut -d '_' -f 1)
   VARIANT=${flags_variant:-$(echo "$flags_board" | cut -s -d '_' -f 2)}
 
   if [ -n "$VARIANT" ]; then
     BOARD_VARIANT="${BOARD}_${VARIANT}"
   else
     BOARD_VARIANT="${BOARD}"
   fi
 }