sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

kernel-dev: Intermediary edits to the "branches" section. 

(From yocto-docs rev: d12e98f4b80feb1538b51cd9e3a8c204c86f13fc)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark 2013-01-10 16:27:04 -06:00 committed by Richard Purdie
parent b663741f7f
commit 5b1098dc0b
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
documentation/kernel-dev/kernel-dev-advanced.xml
View File

@ -1377,31 +1377,35 @@ the KTYPE has changed, now set to "tiny".
<title>Working with Branches</title> <title>Working with Branches</title>
<para> <para>
Many linux-yocto-custom derived recipes will be using Linux kernel Many recipes based on the <filename>linux-yocto-custom.bb<filename>
sources with only a single branch: "master". use Linux kernel sources that have only the single branch - "master".
However, when you are working with multiple boards and architectures, However, if you work with multiple boards and architectures,
you are likely to run into the situation where a series of patches you are likely to run into the situation where a series of patches
are needed for one board to boot. are needed for one board to boot.
Sometimes, these patches are works-in-progress or fundamentally wrong, Sometimes, these patches are works-in-progress or fundamentally wrong,
yet still necessary for specific boards. yet still necessary for specific boards.
In these situations, you most likely do not want to include these In these situations, you most likely do not want to include these
patches in every kernel you build. patches in every kernel you build (i.e. have the patches as part of
You have a couple of options. the lone "master" branch).
It is situations like these that give rise to multiple branches used
within a Linux kernel sources Git repository.
</para> </para>
<para> <para>
First, you could encapsulate these patches in a feature description If you are supporting multiple boards and architectures, you have
and only include them in the BSP description for the board(s) that some options as to how you want to isolate your changes:
require them. <itemizedlist>
For more information, see the <listitem><para><emphasis>Include feature patches in the BSP:</emphasis>
"<link linkend='patches'>Patches</link>" and Encapsulate patches in a feature description and only include
"<link linkend='bsp-descriptions'>BSP Descriptions</link>" sections. the patches in the BSP descriptions of the applicable boards.
</para> For more information, see the
"<link linkend='patches'>Patches</link>" and
<para> "<link linkend='bsp-descriptions'>BSP Descriptions</link>"
Alternatively, you can create a branch in your Linux kernel sources sections.</para></listitem>
and apply the patches there. <listitem><para><emphasis>Create a machine branch:</emphasis>
You can then specify this new branch as the You can create a machine branch in your Linux kernel sources
and apply the patches there.
You can then specify this new branch as the
<filename>KBRANCH</filename> to use for this board. <filename>KBRANCH</filename> to use for this board.
You can do this in the recipe with the You can do this in the recipe with the
<filename>KBRANCH</filename> variable: <filename>KBRANCH</filename> variable: