Patchwork [CONSOLIDATED,PULL,28/36] linux-yocto: allow non-branched repositories to check out

login
register
mail settings
Submitter Saul Wold
Date Feb. 28, 2012, 5:25 a.m.
Message ID <e0d485eb6f0c2607e11ccd9f9eb6adb08a7ced23.1330406574.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/22249/
State New
Headers show

Comments

Saul Wold - Feb. 28, 2012, 5:25 a.m.
From: Bruce Ashfield <bruce.ashfield@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@windriver.com>
---
 meta/classes/kernel-yocto.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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"