summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorTheodor Gherzan <theodor@resin.io>2015-01-15 17:47:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:49 +0000
commitaf691920c0e289fd0eb13d94cad03c799375af21 (patch)
tree4d7209a89b71148b97f8abe74e4df66a4f10b29a /meta/classes
parent3bf5b6de3edb0d6589155fc1e2cd284c05532c52 (diff)
downloadpoky-af691920c0e289fd0eb13d94cad03c799375af21.tar.gz
kernel-yocto.bbclass: Bug Fix inside do_kernel_checkout()
--047d7b3a7fac0eebee050cb47483 Content-Type: text/plain; charset="UTF-8" After we check the existence of 'machine_branch' with 'git show-ref' the following if statement should change the 'machine_branch' to the default (i.e. master) if the 'git show-ref' has returned an exit code that is not 0, not the other way around. Signed-off-by: Theodor Gherzan <theodor@resin.io> (From OE-Core rev: cc95da21914d08bfbf1936830985f824e8813904) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel-yocto.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 9c50d52507..223825e546 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -211,7 +211,7 @@ do_kernel_checkout() {
211 # Create a working tree copy of the kernel by checking out a branch 211 # Create a working tree copy of the kernel by checking out a branch
212 machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" 212 machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
213 git show-ref --quiet --verify -- "refs/heads/${machine_branch}" 213 git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
214 if [ $? -eq 0 ]; then 214 if [ $? -ne 0 ]; then
215 machine_branch="master" 215 machine_branch="master"
216 fi 216 fi
217 217