diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-10-23 16:18:32 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-24 12:07:32 +0100 |
| commit | 87363ec019e04b486dee5f07b7226465be7acd6c (patch) | |
| tree | 0f0d836581bbd688498a6e8fd851a563a8488d76 | |
| parent | ed2da98bf3ac798009f58a53b91285b4dac69d5a (diff) | |
| download | openembedded-core-87363ec019e04b486dee5f07b7226465be7acd6c.tar.gz | |
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 <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
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 |