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

cros_workon: store cros_workon state outside of /build

Browse Source 
This solves the problem of cros_workon list of packages being clobbered
by a new setup_board.

BUG=5641
TEST=Verified all cases work correctly.

1. Verified that a pre-existing list of workon packages continues to work.
2. Verified that the package.unmask symlink is created correctly.
3. Verified that a new package can be worked on.
4. Verified that an existing package continues to be worked on.

Change-Id: I566ac898ac4f74bdd5beb532c1ef0f70d4c02cec

Review URL: http://codereview.chromium.org/3151039
This commit is contained in:
Mandeep Singh Baines 2010-08-25 17:21:14 -07:00 committed by David James
parent 8216bd952c
commit 7d25eedbb6
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cros_workon
View File

@ -61,20 +61,28 @@ else
EBUILDCMD=ebuild EBUILDCMD=ebuild
fi fi
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
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
sudo mkdir -p "${KEYWORDS_DIR}" "${UNMASK_DIR}" || \ # TODO(msb): remove the backward compatibility after 09/01/2010
die "mkdir -p ${KEYWORDS_DIR} ${UNMASK_DIR}" sudo mkdir -p "${WORKON_DIR}" "${KEYWORDS_DIR}" "${UNMASK_DIR}" || \
die "mkdir -p ${WORKON_DIR} ${KEYWORDS_DIR} ${UNMASK_DIR}"
if [ ! -L "${KEYWORDS_FILE}" ]; then if [ ! -L "${KEYWORDS_FILE}" ]; then
sudo rm -f "${KEYWORDS_FILE}" sudo rm -f "${KEYWORDS_FILE}"
sudo ln -s "${UNMASK_FILE}" "${KEYWORDS_FILE}" || \ sudo ln -s "${WORKON_FILE}" "${KEYWORDS_FILE}" || \
die "ln -s ${UNMASK_FILE} ${KEYWORDS_FILE}" die "ln -s ${WORKON_FILE} ${KEYWORDS_FILE}"
fi fi
sudo touch "${UNMASK_FILE}" || \ if [ ! -L "${UNMASK_FILE}" ]; then
die "touch ${UNMASK_FILE}" [ -f "${UNMASK_FILE}" ] && sudo mv "${UNMASK_FILE}" "${WORKON_FILE}"
sudo ln -s "${WORKON_FILE}" "${UNMASK_FILE}" || \
die "ln -s ${WORKON_FILE} ${UNMASK_FILE}"
fi
sudo touch "${WORKON_FILE}" || \
die "touch ${WORKON_FILE}"
# Canonicalize package name to category/package. # Canonicalize package name to category/package.
canonicalize_name () { canonicalize_name () {
@ -113,7 +121,7 @@ canonicalize_names () {
# Display ebuilds currently part of the live branch and open for development. # Display ebuilds currently part of the live branch and open for development.
show_live_ebuilds () { show_live_ebuilds () {
sed -n 's/^[~=]\(.*\)-9999$/\1/p' "${UNMASK_FILE}" sed -n 's/^[~=]\(.*\)-9999$/\1/p' "${WORKON_FILE}"
} }
find_repo_dir () { find_repo_dir () {
@ -171,8 +179,8 @@ ebuild_to_live () {
local atoms=$1 local atoms=$1
for atom in ${atoms}; do for atom in ${atoms}; do
if ! grep -qx "[~=]${atom}-9999" "${UNMASK_FILE}" ; then if ! grep -qx "[~=]${atom}-9999" "${WORKON_FILE}" ; then
sudo bash -c "echo \"=${atom}-9999\" >> \"${UNMASK_FILE}\"" sudo bash -c "echo \"=${atom}-9999\" >> \"${WORKON_FILE}\""
else else
warn "Already working on ${atom}" warn "Already working on ${atom}"
fi fi
@ -184,10 +192,10 @@ ebuild_to_stable () {
local atoms=$1 local atoms=$1
for atom in ${atoms}; do for atom in ${atoms}; do
if grep -qx "[~=]${atom}-9999" "${UNMASK_FILE}" ; then if grep -qx "[~=]${atom}-9999" "${WORKON_FILE}" ; then
sudo bash -c "grep -v '^[~=]${atom}-9999\$' \"${UNMASK_FILE}\" > \ sudo bash -c "grep -v '^[~=]${atom}-9999\$' \"${WORKON_FILE}\" > \
\"${UNMASK_FILE}+\"" \"${WORKON_FILE}+\""
sudo mv "${UNMASK_FILE}+" "${UNMASK_FILE}" sudo mv "${WORKON_FILE}+" "${WORKON_FILE}"
else else
warn "Not working on ${atom}" warn "Not working on ${atom}"
fi fi