[oe-commits] Bruce Ashfield : kernel-yocto: clean overly complex branch checkout
git at git.openembedded.org
git at git.openembedded.org
Sat Aug 30 09:17:56 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: a571fdbb86281e0bf42a091d622115d90d9b7f57
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a571fdbb86281e0bf42a091d622115d90d9b7f57
Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date: Tue Mar 18 21:41:29 2014 -0400
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 at windriver.com>
---
meta/classes/kernel-yocto.bbclass | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 9209f42..69620f0 100644
--- 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}"
More information about the Openembedded-commits
mailing list