diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 9209f423cf..69620f0a42 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -221,17 +221,16 @@ do_kernel_checkout() { | |||
221 | fi | 221 | fi |
222 | fi | 222 | fi |
223 | 223 | ||
224 | machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" | ||
225 | 224 | ||
226 | # Create a working tree copy of the kernel by checking out a branch | 225 | # Create a working tree copy of the kernel by checking out a branch |
226 | machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}" | ||
227 | git show-ref --quiet --verify -- "refs/heads/${machine_branch}" | 227 | git show-ref --quiet --verify -- "refs/heads/${machine_branch}" |
228 | if [ $? -eq 0 ]; then | 228 | if [ $? -eq 0 ]; then |
229 | # checkout and clobber any unimportant files | 229 | machine_branch = "master" |
230 | git checkout -f ${machine_branch} | ||
231 | else | ||
232 | echo "Not checking out ${machine_branch}, it will be created later" | ||
233 | git checkout -f master | ||
234 | fi | 230 | fi |
231 | |||
232 | # checkout and clobber any unimportant files | ||
233 | git checkout -f ${machine_branch} | ||
235 | } | 234 | } |
236 | do_kernel_checkout[dirs] = "${S}" | 235 | do_kernel_checkout[dirs] = "${S}" |
237 | 236 | ||