summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual/dev-manual-model.xml
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-01-23 11:32:12 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-30 16:06:01 +0000
commit1ad79777424cc9e155a06cdabf19a4c9b3aa66c7 (patch)
tree543a63e4d2582c425ca0cca9d56600bec26bc992 /documentation/dev-manual/dev-manual-model.xml
parentfe40f117c1154ee148e4ddcc512da031e43fbc0d (diff)
downloadpoky-1ad79777424cc9e155a06cdabf19a4c9b3aa66c7.tar.gz
documentation/dev-manual: Changes to repo names and kernel example.
To make the kernel example more easily understood, Joshua Lock suggested that the names used for the bare clone of the kernel git repo and the copy of the bare clone be more different. So I have changed the example such that the bare clone repo is named linux-yocto-3.0-1.1.x.git and the copy of the bare clone (or working repo) is named my-linux-yocto-3.0-1.1.x-work. Note that this also implies the use of the linux-yocto_3.0-1.1.x kernel and not the linux-yocto_3.0 kernel. All the changes made here should take care of the example. I did have to introduce a new figure that showed the kernel repos based on the new names used in the example. Also, I had to delete the other from this branch. The examples are now diverging according to (master) work and 1.1.x work. Reported-by: Joshua Lock <joshua.lock@intel.com> (From yocto-docs rev: f4fdef6078fccfc2c72b6e0ad1dfae1f1ecb2aa6) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual/dev-manual-model.xml')
-rw-r--r--documentation/dev-manual/dev-manual-model.xml8
1 files changed, 6 insertions, 2 deletions
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 4b625d1831..abe26e90a6 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -231,8 +231,12 @@
231 stable Linux Yocto kernel that is based on the Linux 2.6.34 release.</para></listitem> 231 stable Linux Yocto kernel that is based on the Linux 2.6.34 release.</para></listitem>
232 <listitem><para><emphasis><filename>linux-yocto-2.6.37</filename></emphasis> - The 232 <listitem><para><emphasis><filename>linux-yocto-2.6.37</filename></emphasis> - The
233 stable Linux Yocto kernel that is based on the Linux 2.6.37 release.</para></listitem> 233 stable Linux Yocto kernel that is based on the Linux 2.6.37 release.</para></listitem>
234 <listitem><para><emphasis><filename>linux-yocto-3.0</filename></emphasis> - The current 234 <listitem><para><emphasis><filename>linux-yocto-3.0</filename></emphasis> - The
235 Linux Yocto kernel that is based on the Linux 3.0 release.</para></listitem> 235 stable Linux Yocto kernel to use with the Yocto Project current (master) development.
236 This kernel is based on the Linux 3.0 release.</para></listitem>
237 <listitem><para><emphasis><filename>linux-yocto-3.0-1.1.x</filename></emphasis> - The
238 stable Linux Yocto kernel to use with the Yocto Project Release 1.1.x.
239 This kernel is based on the Linux 3.0 release.</para></listitem>
236 <listitem><para><emphasis><filename>linux-yocto-dev</filename></emphasis> - A development 240 <listitem><para><emphasis><filename>linux-yocto-dev</filename></emphasis> - A development
237 kernel based on the latest upstream release candidate available.</para></listitem> 241 kernel based on the latest upstream release candidate available.</para></listitem>
238 </itemizedlist> 242 </itemizedlist>