summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-02-27 18:20:41 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:50 (GMT)
commit6beb61f3cad0e7368cae2c7ee1dadaa5d2e55af7 (patch)
treee9582c433c780d03db3c8550b7dfd88502944e40
parent84ad6671d5f3f1d9caef8af5235702d41817980f (diff)
downloadpoky-6beb61f3cad0e7368cae2c7ee1dadaa5d2e55af7.tar.gz
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] (From OE-Core rev: fb2b3c7c10df1b44679a20e7dffd37f07fd01aba) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass2
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() {
165 echo "kernel repository" 165 echo "kernel repository"
166 exit 1 166 exit 1
167 fi 167 fi
168 if [ -z "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then 168 if [ -z "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ] && [ -n "${KBRANCH}" ] ; then
169 git branch -a | grep -q ${KBRANCH} 169 git branch -a | grep -q ${KBRANCH}
170 if [ $? -ne 0 ]; then 170 if [ $? -ne 0 ]; then
171 echo "ERROR. The branch '${KBRANCH}' is required and was not" 171 echo "ERROR. The branch '${KBRANCH}' is required and was not"