1 files changed, 44 insertions, 21 deletions
diff --git a/documentation/kernel-dev/kernel-dev-maint-appx.xml b/documentation/kernel-dev/kernel-dev-maint-appx.xml
index 79e6e26e00..f5fd183fd0 100644
--- a/documentation/kernel-dev/kernel-dev-maint-appx.xml
+++ b/documentation/kernel-dev/kernel-dev-maint-appx.xml
@@ -154,8 +154,8 @@
                    </literallayout>
                </para></listitem>
                <listitem><para>
-                    <emphasis>Compile Feature:</emphasis>
+                    <emphasis>Expand Feature:</emphasis>
-                    Once located, the feature description is either compiled
+                    Once located, the feature description is either expanded
                    into a simple script of actions, or into an existing
                    equivalent script that is already part of the shipped
                    kernel.
@@ -169,8 +169,8 @@
                    variable in recipes.
                    </para></listitem>
                <listitem><para>
-                    <emphasis>Locate, Compile, and Append Each Feature:</emphasis>
+                    <emphasis>Locate, Expand, and Append Each Feature:</emphasis>
-                    Each extra feature is located, compiled and appended to
+                    Each extra feature is located, expanded and appended to
                    the script as described in step three.
                    </para></listitem>
                <listitem><para>
@@ -203,23 +203,46 @@
            The kernel tree and cache are ready for developer consumption to
            be locally cloned, configured, and built into a Yocto Project
            kernel specific to some target hardware.
-            <note>
+            <note><title>Notes</title>
-                <para>The generated <filename>yocto-kernel-cache</filename>
+                <itemizedlist>
-                repository adds to the kernel as shipped with the Yocto Project
+                    <listitem><para>
-                release.
+                        The generated <filename>yocto-kernel-cache</filename>
-                Any add-ons and configuration data are applied to the end of
+                        repository adds to the kernel as shipped with the Yocto
-                an existing branch.
+                        Project release.
-                The full repository generation that is found in the
+                        Any add-ons and configuration data are applied to the
-                official Yocto Project kernel repositories at
+                        end of an existing branch.
-                <ulink url='&YOCTO_GIT_URL;/cgit.cgi'>http://git.yoctoproject.org/cgit.cgi</ulink>
+                        The full repository generation that is found in the
-                is the combination of all supported boards and configurations.
+                        official Yocto Project kernel repositories at
-                </para>
+                        <ulink url='&YOCTO_GIT_URL;/cgit.cgi'>http://git.yoctoproject.org/cgit.cgi</ulink>
+                        is the combination of all supported boards and
-                <para>The technique the Yocto Project team uses is flexible
+                        configurations.
-                and allows for seamless blending of an immutable history with
+                        </para></listitem>
-                additional patches specific to a deployment.
+                    <listitem><para>
-                Any additions to the kernel become an integrated part of the
+                        The technique the Yocto Project team uses is flexible
-                branches.</para>
+                        and allows for seamless blending of an immutable
+                        history with additional patches specific to a
+                        deployment.
+                        Any additions to the kernel become an integrated part
+                        of the branches.
+                        </para></listitem>
+                    <listitem><para>
+                        The full kernel tree that you see on
+                        <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink> is
+                        generated through repeating the above steps for all
+                        valid BSPs.
+                        The end result is a branched, clean history tree that
+                        makes up the kernel for a given release.
+                        You can see the script (<filename>kgit-scc</filename>)
+                        responsible for this in the
+                        <ulink url='&YOCTO_GIT_URL;/cgit.cgi/yocto-kernel-tools/tree/tools'><filename>yocto-kernel-tools</filename></ulink>
+                        repository.
+                        </para></listitem>
+                    <listitem><para>
+                        The steps used to construct the full kernel tree are
+                        the same steps that BitBake uses when it builds a
+                        kernel image.
+                        </para></listitem>
+                </itemizedlist>
            </note>
        </para>
    </section>

diff --git a/documentation/kernel-dev/kernel-dev-maint-appx.xml b/documentation/kernel-dev/kernel-dev-maint-appx.xml index 79e6e26e00..f5fd183fd0 100644 --- a/documentation/kernel-dev/kernel-dev-maint-appx.xml +++ b/documentation/kernel-dev/kernel-dev-maint-appx.xml
@@ -154,8 +154,8 @@
154	</literallayout>	154	</literallayout>
155	</para></listitem>	155	</para></listitem>
156	<listitem><para>	156	<listitem><para>
157	<emphasis>Compile Feature:</emphasis>	157	<emphasis>Expand Feature:</emphasis>
158	Once located, the feature description is either compiled	158	Once located, the feature description is either expanded
159	into a simple script of actions, or into an existing	159	into a simple script of actions, or into an existing
160	equivalent script that is already part of the shipped	160	equivalent script that is already part of the shipped
161	kernel.	161	kernel.
@@ -169,8 +169,8 @@
169	variable in recipes.	169	variable in recipes.
170	</para></listitem>	170	</para></listitem>
171	<listitem><para>	171	<listitem><para>
172	<emphasis>Locate, Compile, and Append Each Feature:</emphasis>	172	<emphasis>Locate, Expand, and Append Each Feature:</emphasis>
173	Each extra feature is located, compiled and appended to	173	Each extra feature is located, expanded and appended to
174	the script as described in step three.	174	the script as described in step three.
175	</para></listitem>	175	</para></listitem>
176	<listitem><para>	176	<listitem><para>
@@ -203,23 +203,46 @@
203	The kernel tree and cache are ready for developer consumption to	203	The kernel tree and cache are ready for developer consumption to
204	be locally cloned, configured, and built into a Yocto Project	204	be locally cloned, configured, and built into a Yocto Project
205	kernel specific to some target hardware.	205	kernel specific to some target hardware.
206	<note>	206	<note><title>Notes</title>
207	<para>The generated <filename>yocto-kernel-cache</filename>	207	<itemizedlist>
208	repository adds to the kernel as shipped with the Yocto Project	208	<listitem><para>
209	release.	209	The generated <filename>yocto-kernel-cache</filename>
210	Any add-ons and configuration data are applied to the end of	210	repository adds to the kernel as shipped with the Yocto
211	an existing branch.	211	Project release.
212	The full repository generation that is found in the	212	Any add-ons and configuration data are applied to the
213	official Yocto Project kernel repositories at	213	end of an existing branch.
214	<ulink url='&YOCTO_GIT_URL;/cgit.cgi'>http://git.yoctoproject.org/cgit.cgi</ulink>	214	The full repository generation that is found in the
215	is the combination of all supported boards and configurations.	215	official Yocto Project kernel repositories at
216	</para>	216	<ulink url='&YOCTO_GIT_URL;/cgit.cgi'>http://git.yoctoproject.org/cgit.cgi</ulink>
217		217	is the combination of all supported boards and
218	<para>The technique the Yocto Project team uses is flexible	218	configurations.
219	and allows for seamless blending of an immutable history with	219	</para></listitem>
220	additional patches specific to a deployment.	220	<listitem><para>
221	Any additions to the kernel become an integrated part of the	221	The technique the Yocto Project team uses is flexible
222	branches.</para>	222	and allows for seamless blending of an immutable
		223	history with additional patches specific to a
		224	deployment.
		225	Any additions to the kernel become an integrated part
		226	of the branches.
		227	</para></listitem>
		228	<listitem><para>
		229	The full kernel tree that you see on
		230	<ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink> is
		231	generated through repeating the above steps for all
		232	valid BSPs.
		233	The end result is a branched, clean history tree that
		234	makes up the kernel for a given release.
		235	You can see the script (<filename>kgit-scc</filename>)
		236	responsible for this in the
		237	<ulink url='&YOCTO_GIT_URL;/cgit.cgi/yocto-kernel-tools/tree/tools'><filename>yocto-kernel-tools</filename></ulink>
		238	repository.
		239	</para></listitem>
		240	<listitem><para>
		241	The steps used to construct the full kernel tree are
		242	the same steps that BitBake uses when it builds a
		243	kernel image.
		244	</para></listitem>
		245	</itemizedlist>
223	</note>	246	</note>
224	</para>	247	</para>
225	</section>	248	</section>