diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-03-18 21:08:33 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 14:35:40 +0100 |
commit | 254bc3a28348b541dae3599e66014a4da0d39733 (patch) | |
tree | fa3ca52000861105a48cb7dc08ba4c300def1e2a | |
parent | 8a5b1c771a47c7867e98a6e1f641898c01a545b4 (diff) | |
download | poky-254bc3a28348b541dae3599e66014a4da0d39733.tar.gz |
kernel-yocto: remove SRC_URI kbranch validation
We no longer need to check if the KBRANCH matches the branch specified
in the SRC_URI. This is taken care of by the fetcher at the beginning
and SRCREV ancestor validation after patching.
(From OE-Core rev: a9b6550d3e2f5bf21fd05a17bca3e57c5b74e057)
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 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 357a79b123..3bef841ae8 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -230,12 +230,6 @@ do_kernel_checkout() { | |||
230 | 230 | ||
231 | machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" | 231 | machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" |
232 | 232 | ||
233 | if [ "${KBRANCH}" != "${machine_branch}" ]; then | ||
234 | echo "WARNING: The SRC_URI machine branch and KBRANCH are not the same." | ||
235 | echo " KBRANCH will be adjusted to match, but this typically is a" | ||
236 | echo " misconfiguration and should be checked." | ||
237 | fi | ||
238 | |||
239 | # convert any remote branches to local tracking ones | 233 | # convert any remote branches to local tracking ones |
240 | for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do | 234 | for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do |
241 | b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`; | 235 | b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`; |