mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-29 14:31:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't set CHROME_ORIGIN environment variable

Browse Source 
CL http://gerrit.chromium.org/gerrit/#change,10530 removes dependency of
chrome ebuild on CHROME_ORIGIN being set to GERRIT_SOURCE when user runs
cros_workon.  So remove this functionality.

BUG=chromium-os:21969
TEST=Ran cros_workon start/stop for chrome and cros-devutil

Change-Id: I04f7093b45f8e2871f369331bdafbba36443e21d
Reviewed-on: http://gerrit.chromium.org/gerrit/10531
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Ryan Cui <rcui@chromium.org>
Tested-by: Ryan Cui <rcui@chromium.org>
This commit is contained in:
Ryan Cui 2011-10-21 16:03:23 -07:00 committed by David James
parent 36770c8eed
commit 0ddc35067b
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cros_workon
View File

@ -70,7 +70,6 @@ fi
WORKON_DIR=${CHROOT_TRUNK_DIR}/.config/cros_workon 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
CHROMITE_DIR=${CHROOT_TRUNK_DIR}/chromite 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
@ -259,23 +258,11 @@ regen_manifest_and_sync() {
chrome_to_live () { chrome_to_live () {
# Switch to using repo manifest checkout of chromium src. # Switch to using repo manifest checkout of chromium src.
# TODO(rcui): Remove this when CHROME_ORIGIN defaults to GERRIT_SOURCE.
# Tracked in chromium-os:19259.
env_dir=${PACKAGE_ENV_DIR}/chromeos-base
sudo mkdir -p ${env_dir}
sudo_clobber "${env_dir}/chromeos-chrome" <<EOF
CHROME_ORIGIN=GERRIT_SOURCE
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 () {
env_file=${PACKAGE_ENV_DIR}/${CHROME_ATOM}
sudo rm ${env_file}
}
# Move a stable ebuild to the live development catgeory. The ebuild # Move a stable ebuild to the live development catgeory. The ebuild
# src_unpack step fetches the package source for local development. # src_unpack step fetches the package source for local development.
ebuild_to_live () { ebuild_to_live () {
@ -309,11 +296,6 @@ ebuild_to_stable () {
if grep -qx "=${atom}-9999" "${WORKON_FILE}" ; then if grep -qx "=${atom}-9999" "${WORKON_FILE}" ; then
if sudo sed -e "/^=${atom/\//\\/}-9999\$/d" -i "${WORKON_FILE}"; then if sudo sed -e "/^=${atom/\//\\/}-9999\$/d" -i "${WORKON_FILE}"; then
atoms_success="${atoms_success} ${atom}" atoms_success="${atoms_success} ${atom}"
# TODO(rcui): Remove special case when CHROME_ORIGIN defaults to
# GERRIT_SOURCE. Tracked in chromium-os:19259.
if [ "${atom}" = "${CHROME_ATOM}" ]; then
chrome_to_stable
fi
fi fi
else else
warn "Not working on ${atom}" warn "Not working on ${atom}"