[OE-core] [PATCH 03/18] kernel-yocto: remove containing branch check

Bruce Ashfield bruce.ashfield at windriver.com
Sat Aug 30 04:38:06 UTC 2014


The bitbake fetcher now enforces that a commit is contained by a branch,
so this code can be dropped from do_validate_branches.

Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
---
 meta/classes/kernel-yocto.bbclass | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 4938712c7cff..357a79b12311 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -351,13 +351,6 @@ do_validate_branches() {
 	    exit 1
 	fi
 
-	containing_branches=`git branch --contains $machine_srcrev | sed 's/^..//'`
-	if [ -z "$containing_branches" ]; then
-		echo "ERROR: SRCREV was set to \"$machine_srcrev\", but no branches"
-		echo "       contain this commit"
-		exit 1
-	fi
-
 	## KMETA branch validation.
 	## We do validation if the meta branch exists, and AUTOREV hasn't been set
  	meta_head=`git show-ref -s --heads ${KMETA}`
-- 
1.8.1.2




More information about the Openembedded-core mailing list