[oe-commits] Theodor Gherzan : kernel-yocto.bbclass: Bug Fix inside do_kernel_checkout( )

git at git.openembedded.org git at git.openembedded.org
Thu Jan 29 10:38:36 UTC 2015


Module: openembedded-core.git
Branch: master-next
Commit: cc95da21914d08bfbf1936830985f824e8813904
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cc95da21914d08bfbf1936830985f824e8813904

Author: Theodor Gherzan <theodor at resin.io>
Date:   Thu Jan 15 17:47:44 2015 +0000

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 at resin.io>

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

---

 meta/classes/kernel-yocto.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 9c50d52..223825e 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
 



More information about the Openembedded-commits mailing list