From e155f11fb28bd4d89175e069e0c1eb1f9eaa1453 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 8 Jul 2013 20:34:04 -0700 Subject: [PATCH 1/3] fix(cros-workon.eclass): Add support for projects in src/platform 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. --- .../cros-devutils/cros-devutils-0.0.1.ebuild | 1 + .../cros-devutils/cros-devutils-9999.ebuild | 4 +++- .../coreos-overlay/eclass/cros-workon.eclass | 19 ++++++++++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1.ebuild index 74b952ed95..3a7498fded 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1.ebuild @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild index 8a67fd6674..95028ee812 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass index dddf4220aa..72b4c140bb 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass @@ -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 From 8d95c0cd31bdb5d0c8124f863c3409f0af73c20e Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 8 Jul 2013 20:06:56 -0700 Subject: [PATCH 2/3] bump(coreos-base/cros-devutils): update to latest code This pulls in recent changes to cros_generate_update_payload --- ...vutils-0.0.1-r517.ebuild => cros-devutils-0.0.1-r518.ebuild} | 0 .../coreos-base/cros-devutils/cros-devutils-0.0.1.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/{cros-devutils-0.0.1-r517.ebuild => cros-devutils-0.0.1-r518.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r517.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r518.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r517.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r518.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1.ebuild index 3a7498fded..664c4e436c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1.ebuild @@ -2,7 +2,7 @@ # 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" From 77fb08aa5eb45e028386055bc8135fb91b900537 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 9 Jul 2013 01:49:00 -0400 Subject: [PATCH 3/3] bump(coreos-base/update_engine): Update stable release to latest code The stable ebuild hasn't been bumped to include quote a lot of recent work yet so lets do that. :) --- ...engine-0.0.1-r371.ebuild => update_engine-0.0.1-r372.ebuild} | 0 .../coreos-base/update_engine/update_engine-0.0.1.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r371.ebuild => update_engine-0.0.1-r372.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r371.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r372.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r371.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r372.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild index d4864b6844..b86acf8178 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild @@ -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"