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

fix(cros-workon.eclass): Add support for projects in src/platform

Browse Source 
We no longer have any correlation between ebuild category and whether
the local checkout can be found in src/platform or src/third_party.
Instead provide a new variable to manually specify which it should be.
As-is it isn't possible to build local changes in src/platform trees.
This commit is contained in:
Michael Marineau 2013-07-08 20:34:04 -07:00
parent 12acedc881
commit e155f11fb2
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1.ebuild vendored
View File

@ -6,6 +6,7 @@ CROS_WORKON_COMMIT="6637138caa93696a2d623a384d181ae1a89806a8"
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

4
sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild vendored
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

19
sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass vendored
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