From: Theodor Gherzan <theodor@resin.io>
Date: Thu, 15 Jan 2015 17:47:44 +0000 (+0000)
Subject: kernel-yocto.bbclass: Bug Fix inside do_kernel_checkout()
X-Git-Tag: 2015-4~624
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=cc95da21914d08bfbf1936830985f824e8813904;p=openembedded-core.git

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>

Signed-off-by: Ross Burton <ross.burton@intel.com>
---

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() {
 	# Create a working tree copy of the kernel by checking out a branch
 	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 	git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
-	if [ $? -eq 0 ]; then
+	if [ $? -ne 0 ]; then
 		machine_branch="master"
 	fi