From 1bfa3ec8ddfbd16e3ae46dfb0ddb0b14789e43f8 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 17 Mar 2014 22:30:11 -0400 Subject: [PATCH] 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. (From OE-Core rev: 9e473d348d9e0db34e03446065c6c48d36964e1e) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- 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}` -- 2.7.4