summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-02-27 13:20:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:14:51 +0000
commitfb2b3c7c10df1b44679a20e7dffd37f07fd01aba (patch)
tree9c69ae6abb36dc81cb5b098f084f3edc9ea4f79b
parent97d55a32c7bb7650af59a5bce49cf8409a875f98 (diff)
downloadopenembedded-core-fb2b3c7c10df1b44679a20e7dffd37f07fd01aba.tar.gz
openembedded-core-fb2b3c7c10df1b44679a20e7dffd37f07fd01aba.tar.bz2
openembedded-core-fb2b3c7c10df1b44679a20e7dffd37f07fd01aba.tar.xz
openembedded-core-fb2b3c7c10df1b44679a20e7dffd37f07fd01aba.zip
linux-yocto: allow non-branched repositories to check out
Not all users of the checkout phase of linux-yocto have all branches present. This is normal, and should be supported. By checking for an empty KBRANCH we can avoid validating a branch that isn't supposed to exist. [YOCTO #2032] Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta/classes/kernel-yocto.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 50ff555ef..5f3cb63fb 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -165,7 +165,7 @@ do_kernel_checkout() {
echo "kernel repository"
exit 1
fi
- if [ -z "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then
+ if [ -z "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ] && [ -n "${KBRANCH}" ] ; then
git branch -a | grep -q ${KBRANCH}
if [ $? -ne 0 ]; then
echo "ERROR. The branch '${KBRANCH}' is required and was not"