mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 13:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 856799a47f.

TBR=Anton for pfq.

Change-Id: Id592ee7a68c5f77300f5bf4f55192a372dd8a9da
This commit is contained in:
Chris Sosa 2011-01-26 12:47:49 -08:00
parent 91c39378e0
commit fd38b5bdfe
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common.sh
View File

@ -17,24 +17,11 @@ NUM_JOBS=`grep -c "^processor" /proc/cpuinfo`
# Store location of the calling script. # Store location of the calling script.
TOP_SCRIPT_DIR="${TOP_SCRIPT_DIR:-$(dirname $0)}" 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 # Find root of source tree
if [ "x$GCLIENT_ROOT" != "x" ] if [ "x$GCLIENT_ROOT" != "x" ]
then then
# GCLIENT_ROOT already set, so we're done # GCLIENT_ROOT already set, so we're done
true 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" ] elif [ "x$COMMON_SH" != "x" ]
then then
# COMMON_SH set, so assume that's us # COMMON_SH set, so assume that's us
@ -129,6 +116,14 @@ DEFAULT_BOARD=$(echo $ALL_BOARDS | awk '{print $NF}')
# Enable --fast by default. # Enable --fast by default.
DEFAULT_FAST="${FLAGS_TRUE}" 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 # Directory locations inside the dev chroot
CHROOT_TRUNK_DIR="/home/$USER/trunk" CHROOT_TRUNK_DIR="/home/$USER/trunk"