mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-26 16:11:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use absolute path to chrome_set_ver.

Browse Source 
So that users don't need to run gclient to update depot_tools when they
are developing for chrome in the chroot (i.e., using cros_workon and
emerge), since they don't need to run chrome_set_ver manually.

Developing for chrome outside of the chroot (running 'make' by
themselves) still requires the user to run chrome_set_ver manually after
a repo sync.  So they also need to run gclient to get the chrome_set_ver
symlink.

BUG=chromium-os:19112
TEST=ran cros_workon start chromeos-chrome

Change-Id: I93a6db4930ccacfa859d83d8fb19ec45b594dd31
Reviewed-on: http://gerrit.chromium.org/gerrit/6201
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Tested-by: Ryan Cui <rcui@chromium.org>
This commit is contained in:
Ryan Cui 2011-08-17 17:58:52 -07:00 committed by David James
parent e84d24ed03
commit 4a4110b741
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cros_workon
View File

@ -71,10 +71,12 @@ WORKON_DIR=${CHROOT_TRUNK_DIR}/.config/cros_workon
KEYWORDS_DIR=${BOARD_DIR}/etc/portage/package.keywords KEYWORDS_DIR=${BOARD_DIR}/etc/portage/package.keywords
UNMASK_DIR=${BOARD_DIR}/etc/portage/package.unmask UNMASK_DIR=${BOARD_DIR}/etc/portage/package.unmask
PACKAGE_ENV_DIR=${BOARD_DIR}/etc/portage/env PACKAGE_ENV_DIR=${BOARD_DIR}/etc/portage/env
CHROMITE_DIR=${CHROOT_TRUNK_DIR}/chromite
WORKON_FILE=${WORKON_DIR}/${FLAGS_board:-host} WORKON_FILE=${WORKON_DIR}/${FLAGS_board:-host}
KEYWORDS_FILE=${KEYWORDS_DIR}/cros-workon KEYWORDS_FILE=${KEYWORDS_DIR}/cros-workon
UNMASK_FILE=${UNMASK_DIR}/cros-workon UNMASK_FILE=${UNMASK_DIR}/cros-workon
CHROME_ATOM=chromeos-base/chromeos-chrome CHROME_ATOM=chromeos-base/chromeos-chrome
CHROME_SET_VER=${CHROMITE_DIR}/bin/chrome_set_ver.py
# TODO(msb): remove the backward compatibility after 10/01/2010 # TODO(msb): remove the backward compatibility after 10/01/2010
if [ -d "${WORKON_DIR}" ]; then if [ -d "${WORKON_DIR}" ]; then
@ -251,7 +253,7 @@ CHROME_ORIGIN=GERRIT_SOURCE
EOF EOF
# Run chrome_set_ver to set DEPS # Run chrome_set_ver to set DEPS
info "Setting Chrome dependencies to the correct revision." info "Setting Chrome dependencies to the correct revision."
chrome_set_ver ${CHROME_SET_VER}
} }
chrome_to_stable () { chrome_to_stable () {