[OE-core] [CONSOLIDATED PULL 28/36] linux-yocto: allow non-branched repositories to check out
Saul Wold
sgw at linux.intel.com
Tue Feb 28 05:25:26 UTC 2012
From: Bruce Ashfield <bruce.ashfield at windriver.com>
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 at windriver.com>
---
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"
--
1.7.7.6
More information about the Openembedded-core
mailing list