mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 05:56:58 +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, and under sudo.

Review URL: http://codereview.chromium.org/6265028

Review URL: http://codereview.chromium.org/6344016
This commit is contained in:
Anton Staaf 2011-01-26 16:00:20 -08:00
parent e0b7551f7b
commit 30acb0b926
1 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
common.sh
View File

@ -17,20 +17,44 @@ 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)}"
# Find root of source tree # Detect whether we're inside a chroot or not
if [ "x$GCLIENT_ROOT" != "x" ] if [ -e /etc/debian_chroot ]
then then
# GCLIENT_ROOT already set, so we're done INSIDE_CHROOT=1
true
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 else
INSIDE_CHROOT=0
fi
# Construct a list of possible locations for the source tree. This list is
# based on various environment variables and globals that may have been set
# by the calling script.
function get_gclient_root_list() {
if [ $INSIDE_CHROOT -eq 1 ]; then
echo "/home/${USER}/trunk"
if [ -n "${SUDO_USER}" ]; then echo "/home/${SUDO_USER}/trunk"; fi
fi
if [ -n "${COMMON_SH}" ]; then echo "$(dirname "$COMMON_SH")/../.."; fi
if [ -n "${BASH_SOURCE}" ]; then echo "$(dirname "$BASH_SOURCE")/../.."; fi
}
# Based on the list of possible source locations we set GCLIENT_ROOT if it is
# not already defined by looking for a src directory in each seach path
# location. If we do not find a valid looking root we error out.
function get_gclient_root() {
if [ -n "${GCLIENT_ROOT}" ]; then
return
fi
for path in $(get_gclient_root_list); do
if [ -d "${path}/src" ]; then
GCLIENT_ROOT=${path}
break
fi
done
if [ -z "${GCLIENT_ROOT}" ]; then
# Using dash or sh, we don't know where we are. $0 refers to the calling # Using dash or sh, we don't know where we are. $0 refers to the calling
# script, not ourselves, so that doesn't help us. # script, not ourselves, so that doesn't help us.
echo "Unable to determine location for common.sh. If you are sourcing" echo "Unable to determine location for common.sh. If you are sourcing"
@ -41,7 +65,11 @@ else
echo "where the first line is the relative path from your script to" echo "where the first line is the relative path from your script to"
echo "common.sh." echo "common.sh."
exit 1 exit 1
fi fi
}
# Find root of source tree
get_gclient_root
# Canonicalize the directories for the root dir and the calling script. # Canonicalize the directories for the root dir and the calling script.
# readlink is part of coreutils and should be present even in a bare chroot. # readlink is part of coreutils and should be present even in a bare chroot.
@ -116,14 +144,6 @@ 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"