diff options
-rw-r--r-- | documentation/dev-manual/dev-manual-common-tasks.xml | 3 | ||||
-rw-r--r-- | documentation/dev-manual/dev-manual-model.xml | 16 | ||||
-rw-r--r-- | documentation/dev-manual/dev-manual-start.xml | 26 |
3 files changed, 26 insertions, 19 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index 11ae3aa657..ce5cbf2528 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml | |||
@@ -5826,8 +5826,7 @@ | |||
5826 | <para>The <filename>merge_config.sh</filename> script is | 5826 | <para>The <filename>merge_config.sh</filename> script is |
5827 | part of the Linux Yocto kernel Git repositories | 5827 | part of the Linux Yocto kernel Git repositories |
5828 | (i.e. <filename>linux-yocto-3.14</filename>, | 5828 | (i.e. <filename>linux-yocto-3.14</filename>, |
5829 | <filename>linux-yocto-3.10</filename>, | 5829 | <filename>linux-yocto-3.19</filename>, and so forth) |
5830 | <filename>linux-yocto-3.8</filename>, and so forth) | ||
5831 | in the | 5830 | in the |
5832 | <filename>scripts/kconfig</filename> directory.</para> | 5831 | <filename>scripts/kconfig</filename> directory.</para> |
5833 | <para>For more information on configuration fragments, | 5832 | <para>For more information on configuration fragments, |
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml index f2f859b94a..bbf4904860 100644 --- a/documentation/dev-manual/dev-manual-model.xml +++ b/documentation/dev-manual/dev-manual-model.xml | |||
@@ -288,9 +288,9 @@ | |||
288 | Linux 3.8 released kernel. | 288 | Linux 3.8 released kernel. |
289 | </para></listitem> | 289 | </para></listitem> |
290 | <listitem><para><emphasis> | 290 | <listitem><para><emphasis> |
291 | <filename>linux-yocto-3.10</filename></emphasis> - The | 291 | <filename>linux-yocto-3.10</filename></emphasis> - An |
292 | stable Yocto Project kernel to use with the Yocto | 292 | additional, unsupported Yocto Project kernel used with |
293 | Project Release 1.5. | 293 | the Yocto Project Release 1.5. |
294 | This kernel is based on the Linux 3.10 released kernel. | 294 | This kernel is based on the Linux 3.10 released kernel. |
295 | </para></listitem> | 295 | </para></listitem> |
296 | <listitem><para><emphasis> | 296 | <listitem><para><emphasis> |
@@ -301,11 +301,17 @@ | |||
301 | </para></listitem> | 301 | </para></listitem> |
302 | <listitem><para><emphasis> | 302 | <listitem><para><emphasis> |
303 | <filename>linux-yocto-3.17</filename></emphasis> - An | 303 | <filename>linux-yocto-3.17</filename></emphasis> - An |
304 | additional Yocto Project kernel used with the Yocto | 304 | additional, unsupported Yocto Project kernel used with |
305 | Project Release 1.7. | 305 | the Yocto Project Release 1.7. |
306 | This kernel is based on the Linux 3.17 released kernel. | 306 | This kernel is based on the Linux 3.17 released kernel. |
307 | </para></listitem> | 307 | </para></listitem> |
308 | <listitem><para><emphasis> | 308 | <listitem><para><emphasis> |
309 | <filename>linux-yocto-3.19</filename></emphasis> - The | ||
310 | stable Yocto Project kernel to use with the Yocto | ||
311 | Project Release 1.8. | ||
312 | This kernel is based on the Linux 3.19 released kernel. | ||
313 | </para></listitem> | ||
314 | <listitem><para><emphasis> | ||
309 | <filename>linux-yocto-dev</filename></emphasis> - A | 315 | <filename>linux-yocto-dev</filename></emphasis> - A |
310 | development kernel based on the latest upstream release | 316 | development kernel based on the latest upstream release |
311 | candidate available. | 317 | candidate available. |
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml index c3206b86f8..518feb7273 100644 --- a/documentation/dev-manual/dev-manual-start.xml +++ b/documentation/dev-manual/dev-manual-start.xml | |||
@@ -138,29 +138,31 @@ | |||
138 | For simplicity, it is recommended that you create these structures outside of the | 138 | For simplicity, it is recommended that you create these structures outside of the |
139 | Source Directory, which is usually named <filename>poky</filename>.</para> | 139 | Source Directory, which is usually named <filename>poky</filename>.</para> |
140 | <para>As an example, the following transcript shows how to create the bare clone | 140 | <para>As an example, the following transcript shows how to create the bare clone |
141 | of the <filename>linux-yocto-3.10</filename> kernel and then create a copy of | 141 | of the <filename>linux-yocto-3.19</filename> kernel and then create a copy of |
142 | that clone. | 142 | that clone. |
143 | <note>When you have a local Yocto Project kernel Git repository, you can | 143 | <note>When you have a local Yocto Project kernel Git repository, you can |
144 | reference that repository rather than the upstream Git repository as | 144 | reference that repository rather than the upstream Git repository as |
145 | part of the <filename>clone</filename> command. | 145 | part of the <filename>clone</filename> command. |
146 | Doing so can speed up the process.</note></para> | 146 | Doing so can speed up the process.</note></para> |
147 | <para>In the following example, the bare clone is named | 147 | <para>In the following example, the bare clone is named |
148 | <filename>linux-yocto-3.10.git</filename>, while the | 148 | <filename>linux-yocto-3.19.git</filename>, while the |
149 | copy is named <filename>my-linux-yocto-3.10-work</filename>: | 149 | copy is named <filename>my-linux-yocto-3.19-work</filename>: |
150 | <literallayout class='monospaced'> | 150 | <literallayout class='monospaced'> |
151 | $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.10 linux-yocto-3.10.git | 151 | $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.19 linux-yocto-3.19.git |
152 | Cloning into bare repository 'linux-yocto-3.10.git'... | 152 | Cloning into bare repository 'linux-yocto-3.19.git'... |
153 | remote: Counting objects: 3364487, done. | 153 | remote: Counting objects: 3983256, done. |
154 | remote: Compressing objects: 100% (507178/507178), done. | 154 | remote: Compressing objects: 100% (605006/605006), done. |
155 | remote: Total 3364487 (delta 2827715), reused 3364481 (delta 2827709) | 155 | remote: Total 3983256 (delta 3352832), reused 3974503 (delta 3344079) |
156 | Receiving objects: 100% (3364487/3364487), 722.95 MiB | 423 KiB/s, done. | 156 | Receiving objects: 100% (3983256/3983256), 843.66 MiB | 1.07 MiB/s, done. |
157 | Resolving deltas: 100% (2827715/2827715), done. | 157 | Resolving deltas: 100% (3352832/3352832), done. |
158 | Checking connectivity... done. | ||
158 | </literallayout></para> | 159 | </literallayout></para> |
159 | <para>Now create a clone of the bare clone just created: | 160 | <para>Now create a clone of the bare clone just created: |
160 | <literallayout class='monospaced'> | 161 | <literallayout class='monospaced'> |
161 | $ git clone linux-yocto-3.10.git my-linux-yocto-3.10-work | 162 | $ git clone linux-yocto-3.19.git my-linux-yocto-3.19-work |
162 | Cloning into 'my-linux-yocto-3.10-work'... | 163 | Cloning into 'my-linux-yocto-3.19-work'... |
163 | done. | 164 | done. |
165 | Checking out files: 100% (48440/48440), done. | ||
164 | </literallayout></para></listitem> | 166 | </literallayout></para></listitem> |
165 | <listitem id='meta-yocto-kernel-extras-repo'><para><emphasis> | 167 | <listitem id='meta-yocto-kernel-extras-repo'><para><emphasis> |
166 | The <filename>meta-yocto-kernel-extras</filename> Git Repository</emphasis>: | 168 | The <filename>meta-yocto-kernel-extras</filename> Git Repository</emphasis>: |