[oe-commits] Bruce Ashfield : kernel-yocto: remove SRC_URI kbranch validation

git at git.openembedded.org git at git.openembedded.org
Mon Sep 1 14:11:51 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: a9b6550d3e2f5bf21fd05a17bca3e57c5b74e057
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a9b6550d3e2f5bf21fd05a17bca3e57c5b74e057

Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date:   Tue Mar 18 21:08:33 2014 -0400

kernel-yocto: remove SRC_URI kbranch validation

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 357a79b..3bef841 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/%%'`;



More information about the Openembedded-commits mailing list