From patchwork Tue Feb 28 05:25:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 28/36] linux-yocto: allow non-branched repositories to check out Date: Tue, 28 Feb 2012 05:25:26 -0000 From: Saul Wold X-Patchwork-Id: 22249 Message-Id: To: openembedded-core@lists.openembedded.org From: Bruce Ashfield 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 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 50ff555..5f3cb63 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"