[OE-core] [PATCH 04/18] kernel-yocto: remove SRC_URI kbranch validation

Bruce Ashfield bruce.ashfield at windriver.com
Sat Aug 30 04:38:07 UTC 2014


We no longer need to check if the KBRANCH matches the branch specified
in the SRC_URI. This is taken care of by the fetcher at the beginning
and SRCREV ancestor validation after patching.

Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
---
 meta/classes/kernel-yocto.bbclass | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 357a79b12311..3bef841ae80a 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -230,12 +230,6 @@ do_kernel_checkout() {
 	
 	machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 
-	if [ "${KBRANCH}" != "${machine_branch}" ]; then
-		echo "WARNING: The SRC_URI machine branch and KBRANCH are not the same."
-		echo "	       KBRANCH will be adjusted to match, but this typically is a"
-		echo "	       misconfiguration and should be checked."
-	fi
-
 	# convert any remote branches to local tracking ones
 	for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do
 		b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
-- 
1.8.1.2




More information about the Openembedded-core mailing list