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

cros_workon: Fix for chromeos-chrome in minilayout

Browse Source 
The cros_workon script did not support chromeos-chrome in a
minilayout. This appears to result from the usual oddities of
chromeos-chrome and some assumptions in cros_workon's support for
CHROME_ORIGIN=GERRIT_SOURCE.

BUG=None
TEST=Tested on full and minilayout with x86-alex.
  cros_workon start and stop succeed, and both equery w and
  ~/trunk/.config/cros_workon/x86-alex show the correct behavior.

Change-Id: Ic239f08ebedc02e6faea36d54c46ae219bfeb044
Reviewed-on: https://gerrit.chromium.org/gerrit/16995
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
Reviewed-by: Ryan Cui <rcui@chromium.org>
Tested-by: Chris Wolfe <cwolfe@chromium.org>
Commit-Ready: Chris Wolfe <cwolfe@chromium.org>
This commit is contained in:
Chris Wolfe 2012-02-28 15:41:58 -05:00 committed by David James
parent 3482223936
commit 3ffa197ac4
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cros_workon
View File

@ -245,21 +245,38 @@ regen_manifest_and_sync() {
return
fi
local need_repo_sync=
local pkgname
for pkgname in $(show_live_ebuilds); do
eval $(${EBUILDCMD} $(${EQUERYCMD} which ${pkgname}) info)
local pkgpath="$(${EQUERYCMD} which "${pkgname}")"
local pkginfo="$(${EBUILDCMD} "${pkgpath}" info |
grep -v 'pkg_info() is not defined')"
if [ -z "${pkginfo}" ]; then
continue # No package information available
fi
eval "${pkginfo}"
local srcdir=$(readlink -m ${CROS_WORKON_SRCDIR})
local trunkdir=$(readlink -m ${CHROOT_TRUNK_DIR})
local project_path=${srcdir#${trunkdir}/}
loman add --workon "${CROS_WORKON_PROJECT}" "${project_path}"
need_repo_sync='yes'
done
echo "Please run \"repo sync\" now."
if [ -n "${need_repo_sync}" ]; then
echo "Please run \"repo sync\" now."
fi
}
chrome_to_live () {
# Switch to using repo manifest checkout of chromium src.
# Run chrome_set_ver to set DEPS
# No chromium directory checked out in this repo; probably a minilayout.
if [ ! -d "${CHROOT_TRUNK_DIR}/chromium" ]; then
return
fi
info "Setting Chrome dependencies to the correct revision."
${CHROME_SET_VER}
if [ -n "${CHROME_ORIGIN}" ] && [ "${CHROME_ORIGIN}" != GERRIT_SOURCE ]; then