diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2012-06-14 08:00:48 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-29 14:59:23 +0100 |
commit | 4cd83a91fba75114d9fd747521137a17addba9c4 (patch) | |
tree | 58717273091b193d49e89ef39b4d453655e4257b | |
parent | 953ad50a273bce512e679a9caa5050419989f414 (diff) | |
download | poky-4cd83a91fba75114d9fd747521137a17addba9c4.tar.gz |
documentation/kernel-manual/kernel-concepts.xml: 1.1.2 variables and updates
First pass of implementing the the poky.ent variables. Also made
corrections to text in various places.
(From yocto-docs rev: a7ccdf1a2664e64d6b2a72381d9eb8db2eddcd9c)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/kernel-manual/kernel-concepts.xml | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml index b3a9fed0e3..4b3ee08408 100644 --- a/documentation/kernel-manual/kernel-concepts.xml +++ b/documentation/kernel-manual/kernel-concepts.xml | |||
@@ -1,5 +1,6 @@ | |||
1 | <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" | 1 | <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" |
2 | "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> | 2 | "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" |
3 | [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] > | ||
3 | 4 | ||
4 | <chapter id='kernel-concepts'> | 5 | <chapter id='kernel-concepts'> |
5 | 6 | ||
@@ -44,13 +45,13 @@ | |||
44 | management techniques.</para></listitem> | 45 | management techniques.</para></listitem> |
45 | <listitem><para>Deliver the most up-to-date kernel possible while still ensuring that | 46 | <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> | 47 | 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 | 48 | <listitem><para>Include major technological features as part of Yocto Project's |
48 | strategy.</para></listitem> | 49 | upward revision strategy.</para></listitem> |
49 | <listitem><para>Present a kernel Git repository that, similar to the upstream | 50 | <listitem><para>Present a kernel Git repository that, similar to the upstream |
50 | <filename>kernel.org</filename> tree, | 51 | <filename>kernel.org</filename> tree, |
51 | has a clear and continuous history.</para></listitem> | 52 | has a clear and continuous history.</para></listitem> |
52 | <listitem><para>Deliver a key set of supported kernel types, where each type is tailored | 53 | <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> | 54 | 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, | 55 | <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>, | 56 | results in a linear path from the baseline <filename>kernel.org</filename>, |
56 | through a select group of features and | 57 | through a select group of features and |
@@ -78,7 +79,7 @@ | |||
78 | </para> | 79 | </para> |
79 | <para> | 80 | <para> |
80 | This balance allows the team to deliver the most up-to-date kernel | 81 | 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 | 82 | as possible, while still ensuring that the team has a stable official release for |
82 | the baseline kernel version. | 83 | the baseline kernel version. |
83 | </para> | 84 | </para> |
84 | <para> | 85 | <para> |
@@ -94,8 +95,8 @@ | |||
94 | </para> | 95 | </para> |
95 | <para> | 96 | <para> |
96 | Once a Yocto Project kernel is officially released, the Yocto Project team goes into | 97 | 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 | 98 | their next development cycle, or upward revision (uprev) cycle, while still |
98 | released kernel. | 99 | continuing maintenance on the released kernel. |
99 | It is important to note that the most sustainable and stable way | 100 | It is important to note that the most sustainable and stable way |
100 | to include feature development upstream is through a kernel uprev process. | 101 | to include feature development upstream is through a kernel uprev process. |
101 | Back-porting hundreds of individual fixes and minor features from various | 102 | Back-porting hundreds of individual fixes and minor features from various |
@@ -148,7 +149,8 @@ | |||
148 | <section id='architecture-overview'> | 149 | <section id='architecture-overview'> |
149 | <title>Overview</title> | 150 | <title>Overview</title> |
150 | <para> | 151 | <para> |
151 | As mentioned earlier, a key goal of Yocto Project is to present the developer with | 152 | As mentioned earlier, a key goal of the Yocto Project is to present the |
153 | developer with | ||
152 | a kernel that has a clear and continuous history that is visible to the user. | 154 | 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 | 155 | The architecture and mechanisms used achieve that goal in a manner similar to the |
154 | upstream <filename>kernel.org</filename>. | 156 | upstream <filename>kernel.org</filename>. |
@@ -159,9 +161,8 @@ | |||
159 | The features are tagged and organized by way of a branching strategy implemented by the | 161 | The features are tagged and organized by way of a branching strategy implemented by the |
160 | source code manager (SCM) Git. | 162 | source code manager (SCM) Git. |
161 | For information on Git as applied to the Yocto Project, see the | 163 | For information on Git as applied to the Yocto Project, see the |
162 | "<ulink url='http://www.yoctoproject.org/docs/1.1.1/dev-manual/dev-manual.html#git'>Git</ulink>" | 164 | "<ulink url='&YOCTO_DOCS_DEV_URL;#git'>Git</ulink>" section in the |
163 | section in <ulink url='http://www.yoctoproject.org/docs/1.1.1/dev-manual/dev-manual.html'>The | 165 | Yocto Project Development Manual. |
164 | Yocto Project Development Manual</ulink>. | ||
165 | </para> | 166 | </para> |
166 | <para> | 167 | <para> |
167 | The result is that the user has the ability to see the added features and | 168 | The result is that the user has the ability to see the added features and |
@@ -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. |
@@ -288,11 +289,10 @@ | |||
288 | <para> | 289 | <para> |
289 | You can find documentation on Git at <ulink url='http://git-scm.com/documentation'></ulink>. | 290 | You can find documentation on Git at <ulink url='http://git-scm.com/documentation'></ulink>. |
290 | You can also get an introduction to Git as it applies to the Yocto Project in the | 291 | You can also get an introduction to Git as it applies to the Yocto Project in the |
291 | "<ulink url='http://www.yoctoproject.org/docs/1.1.1/dev-manual/dev-manual.html#git'>Git</ulink>" | 292 | "<ulink url='&YOCTO_DOCS_DEV_URL;#git'>Git</ulink>" |
292 | section in <ulink url='http://www.yoctoproject.org/docs/1.1.1/dev-manual/dev-manual.html'>The | 293 | section in the Yocto Project Development Manual. |
293 | Yocto Project Development Manual</ulink>. | 294 | These referenced sections overview Git and describe a minimal set of |
294 | This section overviews Git and describes a minimal set of commands that allow you to be | 295 | commands that allow you to be functional using Git. |
295 | functional using Git. | ||
296 | <note> | 296 | <note> |
297 | You can use as much, or as little, of what Git has to offer to accomplish what | 297 | You can use as much, or as little, of what Git has to offer to accomplish what |
298 | you need for your project. | 298 | you need for your project. |
@@ -336,11 +336,6 @@ kernel toolkit: | |||
336 | </itemizedlist> | 336 | </itemizedlist> |
337 | </para> --> | 337 | </para> --> |
338 | </section> | 338 | </section> |
339 | |||
340 | |||
341 | |||
342 | |||
343 | |||
344 | </chapter> | 339 | </chapter> |
345 | <!-- | 340 | <!-- |
346 | vim: expandtab tw=80 ts=4 | 341 | vim: expandtab tw=80 ts=4 |