mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 19:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
If we are inside the chroot then we assume that the "gclient" root
is ~/trunk.  If we are outside the chroot we continue with the
previous search mechanism to find the "gclient" root.

Change-Id: Ia40de609ea596228fec2644ff3046e376b112b06

BUG=chromium-os:4230
TEST=run "src/scripts/cros_overlay_list --board tegra2 --variant seaboard" inside and outside the chroot.

Review URL: http://codereview.chromium.org/6265028
This commit is contained in:
Anton Staaf 2011-01-26 11:23:50 -08:00
parent 404bfdf073
commit 856799a47f
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common.sh
View File

@ -17,11 +17,24 @@ 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}/trunk"
elif [ "x$COMMON_SH" != "x" ]
then
# COMMON_SH set, so assume that's us
@ -116,14 +129,6 @@ 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"