Merge pull request #59 from marineam/updates

coreos-base/update_engine + cros-workon.eclass
This commit is contained in:
Brandon Philips 2013-07-09 06:42:12 -07:00
commit 384798d512
6 changed files with 16 additions and 12 deletions

View File

@ -2,10 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
CROS_WORKON_COMMIT="6637138caa93696a2d623a384d181ae1a89806a8"
CROS_WORKON_COMMIT="4e0cb998c116723013cedcfc40d1e4737b57ec2c"
CROS_WORKON_PROJECT="coreos/dev-util"
CROS_WORKON_REPO="git://github.com"
CROS_WORKON_LOCALNAME="dev"
CROS_WORKON_LOCALDIR="src/platform"
inherit cros-workon multilib python

View File

@ -2,8 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
CROS_WORKON_PROJECT="chromiumos/platform/dev-util"
CROS_WORKON_PROJECT="coreos/dev-util"
CROS_WORKON_REPO="git://github.com"
CROS_WORKON_LOCALNAME="dev"
CROS_WORKON_LOCALDIR="src/platform"
inherit cros-workon multilib python

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
CROS_WORKON_COMMIT="08a60bd76c1a4ad8e59cf3e29b43a11c857e1bcd"
CROS_WORKON_COMMIT="ad72179b09afc085d51c7c0723a125c0f398e2b9"
CROS_WORKON_PROJECT="coreos/update_engine"
CROS_WORKON_REPO="git://github.com"

View File

@ -20,7 +20,7 @@
# - one item as default for all
# - no items as the cros-workon default
# The exception is CROS_WORKON_PROJECT which has to have all items specified.
ARRAY_VARIABLES=( CROS_WORKON_{SUBDIR,REPO,PROJECT,LOCALNAME,DESTDIR,COMMIT,TREE} )
ARRAY_VARIABLES=( CROS_WORKON_{SUBDIR,REPO,PROJECT,LOCALDIR,LOCALNAME,DESTDIR,COMMIT,TREE} )
# @ECLASS-VARIABLE: CROS_WORKON_SUBDIR
# @DESCRIPTION:
@ -37,9 +37,15 @@ ARRAY_VARIABLES=( CROS_WORKON_{SUBDIR,REPO,PROJECT,LOCALNAME,DESTDIR,COMMIT,TREE
# Git project name which is suffixed to CROS_WORKON_REPO
: ${CROS_WORKON_PROJECT:=${PN}}
# @ECLASS-VARIABLE: CROS_WORKON_LOCALDIR
# @DESCRIPTION:
# Repo checkout directory which is prefixed to CROS_WORKON_LOCALNAME
# Generally is either src/third_party or src/platform
: ${CROS_WORKON_LOCALDIR:=src/third_party}
# @ECLASS-VARIABLE: CROS_WORKON_LOCALNAME
# @DESCRIPTION:
# Temporary local name in third_party
# Directory name which is suffixed to CROS_WORKON_LOCALDIR
: ${CROS_WORKON_LOCALNAME:=${PN}}
# @ECLASS-VARIABLE: CROS_WORKON_DESTDIR
@ -182,16 +188,11 @@ get_paths() {
pathbase="/mnt/host/source"
fi
if [[ "${CATEGORY}" == "chromeos-base" ]] ; then
pathbase+=/src/platform
else
pathbase+=/src/third_party
fi
path=()
local pathelement i
for (( i = 0; i < project_count; ++i )); do
pathelement="${pathbase}/${CROS_WORKON_LOCALNAME[i]}"
pathelement="${pathbase}/${CROS_WORKON_LOCALDIR[i]}"
pathelement+="/${CROS_WORKON_LOCALNAME[i]}"
if [[ -n "${CROS_WORKON_SUBDIR[i]}" ]]; then
pathelement+="/${CROS_WORKON_SUBDIR[i]}"
fi