From fb2b3c7c10df1b44679a20e7dffd37f07fd01aba Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 27 Feb 2012 13:20:41 -0500 Subject: 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 --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/kernel-yocto.bbclass') diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 50ff555efeb..5f3cb63fb45 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" -- cgit 1.2.3-korg