kernel-yocto: Simplify no git repo case in do_kernel_checkout

If the kernel sources are not fetched via git, a local git repository is
created in do_kernel_checkout. In this case we know that there will be
no remote branches and we will already be on the correct branch (since
only one branch will exist). So we can simplify things by skipping these
steps.

This also removes the assumption that the default git branch name will
be "master". Prior to this change, the final git checkout command in
do_kernel_checkout could fail if a local git repo was created and the
user had changed init.defaultBranch in their gitconfig.

Signed-off-by: Paul Barker <paul@pbarker.dev>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 7deadcaedbf4191255df0326964ed4f40a922fc1..549dfd97a4e7b25741765cd60c2566fcd113dd60 100644 (file)
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -358,6 +358,21 @@ do_kernel_checkout() {
                        fi
                fi
                cd ${S}
+
+               # convert any remote branches to local tracking ones
+               for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do
+                       b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
+                       git show-ref --quiet --verify -- "refs/heads/$b"
+                       if [ $? -ne 0 ]; then
+                               git branch $b $i > /dev/null
+                       fi
+               done
+
+               # Create a working tree copy of the kernel by checking out a branch
+               machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
+
+               # checkout and clobber any unimportant files
+               git checkout -f ${machine_branch}
        else
                # case: we have no git repository at all. 
                # To support low bandwidth options for building the kernel, we'll just 
@@ -379,21 +394,6 @@ do_kernel_checkout() {
                git commit -q -m "baseline commit: creating repo for ${PN}-${PV}"
                git clean -d -f
        fi
-
-       # convert any remote branches to local tracking ones
-       for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do
-               b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
-               git show-ref --quiet --verify -- "refs/heads/$b"
-               if [ $? -ne 0 ]; then
-                       git branch $b $i > /dev/null
-               fi
-       done
-
-       # Create a working tree copy of the kernel by checking out a branch
-       machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
-
-       # checkout and clobber any unimportant files
-       git checkout -f ${machine_branch}
 }
 do_kernel_checkout[dirs] = "${S} ${WORKDIR}"