diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-03-17 22:30:11 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 14:35:39 +0100 |
commit | 8a5b1c771a47c7867e98a6e1f641898c01a545b4 (patch) | |
tree | 1af210ae070658a28789ea1b49576f5e7260c6cf | |
parent | 7097cdf14a1ca06a5e1de8c97db9638b70bc56fd (diff) | |
download | poky-8a5b1c771a47c7867e98a6e1f641898c01a545b4.tar.gz |
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 <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 4938712c7c..357a79b123 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -351,13 +351,6 @@ do_validate_branches() { | |||
351 | exit 1 | 351 | exit 1 |
352 | fi | 352 | fi |
353 | 353 | ||
354 | containing_branches=`git branch --contains $machine_srcrev | sed 's/^..//'` | ||
355 | if [ -z "$containing_branches" ]; then | ||
356 | echo "ERROR: SRCREV was set to \"$machine_srcrev\", but no branches" | ||
357 | echo " contain this commit" | ||
358 | exit 1 | ||
359 | fi | ||
360 | |||
361 | ## KMETA branch validation. | 354 | ## KMETA branch validation. |
362 | ## We do validation if the meta branch exists, and AUTOREV hasn't been set | 355 | ## We do validation if the meta branch exists, and AUTOREV hasn't been set |
363 | meta_head=`git show-ref -s --heads ${KMETA}` | 356 | meta_head=`git show-ref -s --heads ${KMETA}` |