| Submitter | Bruce Ashfield |
|---|---|
| Date | Feb. 27, 2012, 7:34 p.m. |
| Message ID | <92c5d2e6843fdac90c2b41a454919ff5a8d29274.1330371008.git.bruce.ashfield@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/22185/ |
| State | Accepted |
| Commit | fb2b3c7c10df1b44679a20e7dffd37f07fd01aba |
| Headers | show |
Comments
Patch
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"
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 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)