From: Bruce Ashfield Date: Fri, 23 Oct 2015 20:18:32 +0000 (-0400) Subject: linux-yocto: skip kernel meta data branches when finding machine branch X-Git-Tag: 2015-10~69 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=87363ec019e04b486dee5f07b7226465be7acd6c;p=openembedded-core.git linux-yocto: skip kernel meta data branches when finding machine branch Before the fetcher validated the specified SRCREV was reachable on a specified branch, linux-yocto style kernel's were comparing the value of KBRANCH and branch on the SRC_URI and then allowing a SRC_URI specified branch to override KBRANCH. With the introduction of kernel meta data on the SRC_URI, this routine is incorrectly picking up a kernel-cache repository and then attempting to apply that branch information to the kernel repository. The rationalization of the branch specification is largely no longer required, and will may be removed in the future. But for now, to keep changes minimal, we can simply not return branch information that comes from kernel meta data by checking the 'type' parameter and skipping if it is of type 'kmeta'. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 325f94c735..00d9667fe0 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -52,7 +52,9 @@ def get_machine_branch(d, default): parm = urldata.parm if "branch" in parm: branches = urldata.parm.get("branch").split(',') - return branches[0] + btype = urldata.parm.get("type") + if btype != "kmeta": + return branches[0] return default