summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-03-18 21:41:29 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-01 14:35:40 +0100
commitba7614b0e6c22e240f62373aad2ec2d124df6682 (patch)
treeec295eb7e64e1450529e1f6f565b91fa4665bd16
parent2aa75224b5a03cc115db37b46409b3faaa305423 (diff)
downloadpoky-ba7614b0e6c22e240f62373aad2ec2d124df6682.tar.gz
kernel-yocto: clean overly complex branch checkout
Since the git fetcher ensures that branches exist, we no longer need to validate the branch and have a conditional checkout of the source. We can remove some checks and ensure that whenever we exit the do_kernel_checkout routine that a branch is always checked out. (From OE-Core rev: 2ffa3f8be6996877cd552ff22260de35c19c413d) 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.bbclass11
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 9209f423cf..69620f0a42 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -221,17 +221,16 @@ do_kernel_checkout() {
221 fi 221 fi
222 fi 222 fi
223 223
224 machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
225 224
226 # Create a working tree copy of the kernel by checking out a branch 225 # Create a working tree copy of the kernel by checking out a branch
226 machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
227 git show-ref --quiet --verify -- "refs/heads/${machine_branch}" 227 git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
228 if [ $? -eq 0 ]; then 228 if [ $? -eq 0 ]; then
229 # checkout and clobber any unimportant files 229 machine_branch = "master"
230 git checkout -f ${machine_branch}
231 else
232 echo "Not checking out ${machine_branch}, it will be created later"
233 git checkout -f master
234 fi 230 fi
231
232 # checkout and clobber any unimportant files
233 git checkout -f ${machine_branch}
235} 234}
236do_kernel_checkout[dirs] = "${S}" 235do_kernel_checkout[dirs] = "${S}"
237 236