]> code.ossystems Code Review - openembedded-core.git/commitdiff
linux-yocto: allow non-branched repositories to check out
authorBruce Ashfield <bruce.ashfield@windriver.com>
Mon, 27 Feb 2012 18:20:41 +0000 (13:20 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 28 Feb 2012 12:14:51 +0000 (12:14 +0000)
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>
meta/classes/kernel-yocto.bbclass

index 50ff555efebea54ea34e34f4dabbb81c8e4456f7..5f3cb63fb4575d593bb1ad6c7211444cb7f6109e 100644 (file)
@@ -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"