diff options
| -rw-r--r-- | documentation/kernel-manual/kernel-concepts.xml | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml index 2fef32aee5..830042a495 100644 --- a/documentation/kernel-manual/kernel-concepts.xml +++ b/documentation/kernel-manual/kernel-concepts.xml | |||
| @@ -44,13 +44,13 @@ | |||
| 44 | management techniques.</para></listitem> | 44 | management techniques.</para></listitem> |
| 45 | <listitem><para>Deliver the most up-to-date kernel possible while still ensuring that | 45 | <listitem><para>Deliver the most up-to-date kernel possible while still ensuring that |
| 46 | the baseline kernel is the most stable official release.</para></listitem> | 46 | the baseline kernel is the most stable official release.</para></listitem> |
| 47 | <listitem><para>Include major technological features as part of Yocto Project's up-rev | 47 | <listitem><para>Include major technological features as part of Yocto Project's |
| 48 | strategy.</para></listitem> | 48 | upward revision strategy.</para></listitem> |
| 49 | <listitem><para>Present a kernel Git repository that, similar to the upstream | 49 | <listitem><para>Present a kernel Git repository that, similar to the upstream |
| 50 | <filename>kernel.org</filename> tree, | 50 | <filename>kernel.org</filename> tree, |
| 51 | has a clear and continuous history.</para></listitem> | 51 | has a clear and continuous history.</para></listitem> |
| 52 | <listitem><para>Deliver a key set of supported kernel types, where each type is tailored | 52 | <listitem><para>Deliver a key set of supported kernel types, where each type is tailored |
| 53 | to a specific use case (e.g. networking, consumer, devices, and so forth).</para></listitem> | 53 | to meet a specific use (e.g. networking, consumer, devices, and so forth).</para></listitem> |
| 54 | <listitem><para>Employ a Git branching strategy that, from a developer's point of view, | 54 | <listitem><para>Employ a Git branching strategy that, from a developer's point of view, |
| 55 | results in a linear path from the baseline <filename>kernel.org</filename>, | 55 | results in a linear path from the baseline <filename>kernel.org</filename>, |
| 56 | through a select group of features and | 56 | through a select group of features and |
| @@ -78,7 +78,7 @@ | |||
| 78 | </para> | 78 | </para> |
| 79 | <para> | 79 | <para> |
| 80 | This balance allows the team to deliver the most up-to-date kernel | 80 | This balance allows the team to deliver the most up-to-date kernel |
| 81 | as possible, while still ensuring that the team has a stable official release as | 81 | as possible, while still ensuring that the team has a stable official release for |
| 82 | the baseline kernel version. | 82 | the baseline kernel version. |
| 83 | </para> | 83 | </para> |
| 84 | <para> | 84 | <para> |
| @@ -94,8 +94,8 @@ | |||
| 94 | </para> | 94 | </para> |
| 95 | <para> | 95 | <para> |
| 96 | Once a Yocto Project kernel is officially released, the Yocto Project team goes into | 96 | Once a Yocto Project kernel is officially released, the Yocto Project team goes into |
| 97 | their next development cycle, or "uprev" cycle, while still continuing maintenance on the | 97 | their next development cycle, or upward revision (uprev) cycle, while still |
| 98 | released kernel. | 98 | continuing maintenance on the released kernel. |
| 99 | It is important to note that the most sustainable and stable way | 99 | It is important to note that the most sustainable and stable way |
| 100 | to include feature development upstream is through a kernel uprev process. | 100 | to include feature development upstream is through a kernel uprev process. |
| 101 | Back-porting hundreds of individual fixes and minor features from various | 101 | Back-porting hundreds of individual fixes and minor features from various |
| @@ -148,7 +148,8 @@ | |||
| 148 | <section id='architecture-overview'> | 148 | <section id='architecture-overview'> |
| 149 | <title>Overview</title> | 149 | <title>Overview</title> |
| 150 | <para> | 150 | <para> |
| 151 | As mentioned earlier, a key goal of Yocto Project is to present the developer with | 151 | As mentioned earlier, a key goal of the Yocto Project is to present the |
| 152 | developer with | ||
| 152 | a kernel that has a clear and continuous history that is visible to the user. | 153 | a kernel that has a clear and continuous history that is visible to the user. |
| 153 | The architecture and mechanisms used achieve that goal in a manner similar to the | 154 | The architecture and mechanisms used achieve that goal in a manner similar to the |
| 154 | upstream <filename>kernel.org</filename>. | 155 | upstream <filename>kernel.org</filename>. |
| @@ -176,7 +177,7 @@ | |||
| 176 | <imagedata fileref="figures/kernel-architecture-overview.png" width="6in" depth="7in" align="center" scale="100" /> | 177 | <imagedata fileref="figures/kernel-architecture-overview.png" width="6in" depth="7in" align="center" scale="100" /> |
| 177 | </para> | 178 | </para> |
| 178 | <para> | 179 | <para> |
| 179 | In the illustration, the "<filename>kernel.org</filename> Branch Point" | 180 | In the illustration, the "Kernel.org Branch Point" |
| 180 | marks the specific spot (or release) from | 181 | marks the specific spot (or release) from |
| 181 | which the Yocto Project kernel is created. | 182 | which the Yocto Project kernel is created. |
| 182 | From this point "up" in the tree, features and differences are organized and tagged. | 183 | From this point "up" in the tree, features and differences are organized and tagged. |
| @@ -291,8 +292,8 @@ | |||
| 291 | "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#git'>Git</ulink>" | 292 | "<ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#git'>Git</ulink>" |
| 292 | section in <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html'>The | 293 | section in <ulink url='http://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html'>The |
| 293 | Yocto Project Development Manual</ulink>. | 294 | Yocto Project Development Manual</ulink>. |
| 294 | This section overviews Git and describes a minimal set of commands that allow you to be | 295 | These referenced sections overview Git and describe a minimal set of |
| 295 | functional using Git. | 296 | commands that allow you to be functional using Git. |
| 296 | <note> | 297 | <note> |
| 297 | You can use as much, or as little, of what Git has to offer to accomplish what | 298 | You can use as much, or as little, of what Git has to offer to accomplish what |
| 298 | you need for your project. | 299 | you need for your project. |
