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.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 9209f423cff12b4a5f276cde9cc0fb2951920417..69620f0a4275b57379e7cdd156d8fbf4cffdf12b 100644 (file)
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -221,17 +221,16 @@ do_kernel_checkout() {
                fi
        fi
        
-       machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 
        # 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
-               # checkout and clobber any unimportant files
-               git checkout -f ${machine_branch}
-       else
-               echo "Not checking out ${machine_branch}, it will be created later"
-               git checkout -f master
+               machine_branch = "master"
        fi
+
+       # checkout and clobber any unimportant files
+       git checkout -f ${machine_branch}
 }
 do_kernel_checkout[dirs] = "${S}"