[oe-commits] Bruce Ashfield : kernel-yocto: remove containing branch check

git at git.openembedded.org git at git.openembedded.org
Mon Sep 1 14:11:38 UTC 2014


Module: openembedded-core.git
Branch: master
Commit: 9e473d348d9e0db34e03446065c6c48d36964e1e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9e473d348d9e0db34e03446065c6c48d36964e1e

Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date:   Mon Mar 17 22:30:11 2014 -0400

kernel-yocto: remove containing branch check

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 4938712..357a79b 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}`



More information about the Openembedded-commits mailing list