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

cros_sdk: always pull shflags from local tree

Browse Source 
Since we need this anyways (can't assume the host outside of the chroot
provides shflags), always source the local copy rather than searching
for versions provided by the chroot.

BUG=chromium-os:21742
TEST=`cros_sdk --enter` works
TEST=`./build_packages --board=amd64-generic` works
Change-Id: Ia390042131f59948472b124cfe4e273483eada6a
Reviewed-on: http://gerrit.chromium.org/gerrit/10231
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2011-10-18 13:52:19 -04:00 committed by Gerrit
parent 43a3213f33
commit 9aa80dc457
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common.sh
View File

@ -112,13 +112,7 @@ if [ -f "$CHROMEOS_DEV_SETTINGS" ]; then
fi
# Load shflags
if [[ -f /usr/lib/shflags ]]; then
. /usr/lib/shflags
elif [ -f ./lib/shflags/shflags ]; then
. ./lib/shflags/shflags
else
. "${SRC_ROOT}/scripts/lib/shflags/shflags"
fi
. "${SCRIPTS_DIR}"/lib/shflags/shflags || exit 1
# Our local mirror
DEFAULT_CHROMEOS_SERVER=${CHROMEOS_SERVER:-"http://build.chromium.org/mirror"}