summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2011-08-11 10:29:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 15:27:03 +0100
commite04e02cd4671848e481328c6443cf0f89ca75cfe (patch)
treea8ee73063e0468aaf50518aec0564169afa5eed4 /documentation
parent9584cb5d1523625c4e595c4cd33d894449549268 (diff)
downloadpoky-e04e02cd4671848e481328c6443cf0f89ca75cfe.tar.gz
documentation/dev-manual: Changed 2.6.37 to 3.0 for 1.1 release.
Bruce Ashfield's review comments indicated that we will be using linux-yocto-3.0 and not linux-yocto-2.6.37. So I am putting these changes in to anticipate the 1.1 release. (From yocto-docs rev: ecbe1c90c5aa65b2dde77ba6094b5956e37d061d) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/dev-manual/dev-manual-bsp-appendix.xml19
-rw-r--r--documentation/dev-manual/dev-manual-kernel-appendix.xml20
-rw-r--r--documentation/dev-manual/dev-manual-model.xml6
-rw-r--r--documentation/dev-manual/dev-manual-start.xml14
4 files changed, 31 insertions, 28 deletions
diff --git a/documentation/dev-manual/dev-manual-bsp-appendix.xml b/documentation/dev-manual/dev-manual-bsp-appendix.xml
index 6a3598543f..97ceb12744 100644
--- a/documentation/dev-manual/dev-manual-bsp-appendix.xml
+++ b/documentation/dev-manual/dev-manual-bsp-appendix.xml
@@ -173,7 +173,7 @@
173 <filename>PREFERRED_PROVIDER_virtual/kernel</filename> statement. 173 <filename>PREFERRED_PROVIDER_virtual/kernel</filename> statement.
174 This statement identifies the kernel that the BSP is going to use. 174 This statement identifies the kernel that the BSP is going to use.
175 In this case the BSP is using <filename>linux-yocto</filename>, which is the 175 In this case the BSP is using <filename>linux-yocto</filename>, which is the
176 current Linux Yocto kernel based on the Linux 2.6.37 release. 176 current Linux Yocto kernel based on the Linux 3.0 release.
177 </para> 177 </para>
178 178
179 <para> 179 <para>
@@ -300,7 +300,7 @@
300 The recipe for that kernel is not located in the 300 The recipe for that kernel is not located in the
301 BSP layer but rather in the local Yocto Project files at 301 BSP layer but rather in the local Yocto Project files at
302 <filename>meta/recipes-kernel/linux</filename> and is 302 <filename>meta/recipes-kernel/linux</filename> and is
303 named <filename>linux-yocto_2.6.37.bb</filename>. 303 named <filename>linux-yocto_3.0.bb</filename>.
304 The <filename>SRCREV_machine</filename> and <filename>SRCREV_meta</filename> 304 The <filename>SRCREV_machine</filename> and <filename>SRCREV_meta</filename>
305 statements point to the exact commits used by the Yocto Project development team 305 statements point to the exact commits used by the Yocto Project development team
306 in their source repositories that identify the right kernel for our hardware. 306 in their source repositories that identify the right kernel for our hardware.
@@ -309,7 +309,7 @@
309 <para> 309 <para>
310 However, in the <filename>meta-mymachine</filename> layer in 310 However, in the <filename>meta-mymachine</filename> layer in
311 <filename>recipes-kernel/linux</filename> resides a <filename>.bbappend</filename> 311 <filename>recipes-kernel/linux</filename> resides a <filename>.bbappend</filename>
312 file named <filename>linux-yocto_2.6.37.bbappend</filename> that 312 file named <filename>linux-yocto_3.0.bbappend</filename> that
313 is appended to the recipe of the same name in <filename>meta/recipes-kernel/link</filename>. 313 is appended to the recipe of the same name in <filename>meta/recipes-kernel/link</filename>.
314 Thus, the <filename>SRCREV</filename> statements in the "append" file override 314 Thus, the <filename>SRCREV</filename> statements in the "append" file override
315 the more general statements found in <filename>meta</filename>. 315 the more general statements found in <filename>meta</filename>.
@@ -343,7 +343,7 @@
343 </para> 343 </para>
344 344
345 <para> 345 <para>
346 To fix this situation in <filename>linux-yocto_2.6.37.bbappend</filename> 346 To fix this situation in <filename>linux-yocto_3.0.bbappend</filename>
347 we delete the two <filename>SRCREV</filename> statements that support 347 we delete the two <filename>SRCREV</filename> statements that support
348 EMGD (the top pair). 348 EMGD (the top pair).
349 We also change the remaining pair to specify <filename>mymachine</filename> 349 We also change the remaining pair to specify <filename>mymachine</filename>
@@ -364,8 +364,9 @@
364 exact commit strings in the Yocto Project source repositories you need to change 364 exact commit strings in the Yocto Project source repositories you need to change
365 the <filename>SRCREV</filename> statements. 365 the <filename>SRCREV</filename> statements.
366 You can find all the <filename>machine</filename> and <filename>meta</filename> 366 You can find all the <filename>machine</filename> and <filename>meta</filename>
367 branch points (commits) for the <filename>linux-yocto-2.6.37</filename> kernel 367 branch points (commits) for the <filename>linux-yocto-3.0</filename> kernel
368 <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37'>here</ulink>. 368 <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37'>here</ulink>
369 [WRITER's NOTE: Need new link to the 3.0 source repo area when it is available].
369 </para> 370 </para>
370 371
371 <para> 372 <para>
@@ -376,7 +377,7 @@
376 branch</para></listitem> 377 branch</para></listitem>
377 <listitem><para>Click on the commit column header to view the top commit</para></listitem> 378 <listitem><para>Click on the commit column header to view the top commit</para></listitem>
378 <listitem><para>Copy the commit string for use in the 379 <listitem><para>Copy the commit string for use in the
379 <filename>linux-yocto_2.6.37.bbappend</filename> file</para></listitem> 380 <filename>linux-yocto_3.0.bbappend</filename> file</para></listitem>
380 </orderedlist> 381 </orderedlist>
381 </para> 382 </para>
382 383
@@ -387,14 +388,14 @@
387 </para> 388 </para>
388 389
389 <para> 390 <para>
390 Also in the <filename>linux-yocto_2.6.37.bbappend</filename> file are 391 Also in the <filename>linux-yocto_3.0.bbappend</filename> file are
391 <filename>COMPATIBLE_MACHINE</filename>, <filename>KMACHINE</filename>, 392 <filename>COMPATIBLE_MACHINE</filename>, <filename>KMACHINE</filename>,
392 and <filename>KERNEL_FEATURES</filename> statements. 393 and <filename>KERNEL_FEATURES</filename> statements.
393 Two sets of these exist: one set supports EMGD and one set does not. 394 Two sets of these exist: one set supports EMGD and one set does not.
394 Because we are not interested in supporting EMGD those three can be deleted. 395 Because we are not interested in supporting EMGD those three can be deleted.
395 The remaining three must be changed so that <filename>mymachine</filename> replaces 396 The remaining three must be changed so that <filename>mymachine</filename> replaces
396 <filename>crownbay-noemgd</filename> and <filename>crownbay</filename>. 397 <filename>crownbay-noemgd</filename> and <filename>crownbay</filename>.
397 Here is the final <filename>linux-yocto_2.6.37.bbappend</filename> file after all 398 Here is the final <filename>linux-yocto_3.0.bbappend</filename> file after all
398 the edits: 399 the edits:
399 <literallayout class='monospaced'> 400 <literallayout class='monospaced'>
400 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 401 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/documentation/dev-manual/dev-manual-kernel-appendix.xml b/documentation/dev-manual/dev-manual-kernel-appendix.xml
index d7b5587cb9..4000a0b943 100644
--- a/documentation/dev-manual/dev-manual-kernel-appendix.xml
+++ b/documentation/dev-manual/dev-manual-kernel-appendix.xml
@@ -176,7 +176,7 @@
176 <title>Setting Up the Bare Clone and its Copy</title> 176 <title>Setting Up the Bare Clone and its Copy</title>
177 177
178 <para> 178 <para>
179 This example modifies the <filename>linux-yocto-2.6.37</filename> kernel. 179 This example modifies the <filename>linux-yocto-3.0</filename> kernel.
180 Thus, you need to create a bare clone of that kernel and then make a copy of the 180 Thus, you need to create a bare clone of that kernel and then make a copy of the
181 bare clone. 181 bare clone.
182 See the bulleted item 182 See the bulleted item
@@ -189,12 +189,12 @@
189 The bare clone exists for the kernel build tools and simply as the receiving end 189 The bare clone exists for the kernel build tools and simply as the receiving end
190 of <filename>git push</filename> 190 of <filename>git push</filename>
191 commands after you make edits and commits inside the copy of the clone. 191 commands after you make edits and commits inside the copy of the clone.
192 The copy (<filename>linux-yocto-2.6.37</filename> in this example) has to have 192 The copy (<filename>linux-yocto-3.0</filename> in this example) has to have
193 a local branch created and checked out for your work. 193 a local branch created and checked out for your work.
194 This example uses <filename>common-pc-base</filename> as the local branch. 194 This example uses <filename>common-pc-base</filename> as the local branch.
195 The following commands create and checkout the branch: 195 The following commands create and checkout the branch:
196 <literallayout class='monospaced'> 196 <literallayout class='monospaced'>
197 $ cd ~/linux-yocto-2.6.37 197 $ cd ~/linux-yocto-3.0
198 $ git checkout -b common-pc-base origin/yocto/standard/common-pc/base 198 $ git checkout -b common-pc-base origin/yocto/standard/common-pc/base
199 Branch common-pc-base set up to track remote branch yocto/standard/common-pc/base from origin. 199 Branch common-pc-base set up to track remote branch yocto/standard/common-pc/base from origin.
200 Switched to a new branch 'common-pc-base' 200 Switched to a new branch 'common-pc-base'
@@ -287,7 +287,7 @@
287 287
288 <para> 288 <para>
289 The file you change in this example is named <filename>calibrate.c</filename> 289 The file you change in this example is named <filename>calibrate.c</filename>
290 and is located in the <filename>linux-yocto-2.6.37</filename> Git repository 290 and is located in the <filename>linux-yocto-3.0</filename> Git repository
291 (the copy of the bare clone) in <filename>init</filename>. 291 (the copy of the bare clone) in <filename>init</filename>.
292 This example simply inserts several <filename>printk</filename> statements 292 This example simply inserts several <filename>printk</filename> statements
293 at the beginning of the <filename>calibrate_delay</filename> function. 293 at the beginning of the <filename>calibrate_delay</filename> function.
@@ -409,20 +409,20 @@
409 " 409 "
410 </literallayout></para></listitem> 410 </literallayout></para></listitem>
411 <listitem><para><emphasis>Identify Your Source Files</emphasis> - In the 411 <listitem><para><emphasis>Identify Your Source Files</emphasis> - In the
412 <filename>linux-yocto_2.6.37.bbappend</filename> file located in the 412 <filename>linux-yocto_3.0.bbappend</filename> file located in the
413 <filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename> 413 <filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename>
414 directory, you need to identify the location of the 414 directory, you need to identify the location of the
415 local source code, which in this example is the bare clone named 415 local source code, which in this example is the bare clone named
416 <filename>linux-yocto-2.6.37.git</filename>. 416 <filename>linux-yocto-3.0.git</filename>.
417 To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your 417 To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your
418 local <filename>linux-yocto-2.6.37.git</filename> Git repository by adding the 418 local <filename>linux-yocto-3.0.git</filename> Git repository by adding the
419 following statement. 419 following statement.
420 Be sure to substitute your user information in the statement: 420 Be sure to substitute your user information in the statement:
421 <literallayout class='monospaced'> 421 <literallayout class='monospaced'>
422 KSRC_linux_yocto ?= /home/scottrif/linux-yocto-2.6.37.git 422 KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0.git
423 </literallayout></para></listitem> 423 </literallayout></para></listitem>
424 <listitem><para><emphasis>Specify the Kernel Machine</emphasis> - Also in the 424 <listitem><para><emphasis>Specify the Kernel Machine</emphasis> - Also in the
425 <filename>linux-yocto_2.6.37.bbappend</filename> file, you need to specify 425 <filename>linux-yocto_3.0.bbappend</filename> file, you need to specify
426 the kernel machine with the following statement: 426 the kernel machine with the following statement:
427 <literallayout class='monospaced'> 427 <literallayout class='monospaced'>
428 KMACHINE_qemux86 = "yocto/standard/common-pc/base" 428 KMACHINE_qemux86 = "yocto/standard/common-pc/base"
@@ -438,7 +438,7 @@
438 comment out the <filename>COMPATIBLE_MACHINE</filename> statements in all 438 comment out the <filename>COMPATIBLE_MACHINE</filename> statements in all
439 <filename>.bbappend</filename> files, or you should simply remove all the files 439 <filename>.bbappend</filename> files, or you should simply remove all the files
440 except the one your are using for the build 440 except the one your are using for the build
441 (i.e. <filename>linux-yocto_2.6.37.bbappend</filename> in this example). 441 (i.e. <filename>linux-yocto_3.0.bbappend</filename> in this example).
442 </note> 442 </note>
443 </section> 443 </section>
444 444
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 68ea76e0c5..c0c0247247 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -256,8 +256,10 @@
256 <itemizedlist> 256 <itemizedlist>
257 <listitem><para><emphasis><filename>linux-yocto-2.6.34</filename></emphasis> - The 257 <listitem><para><emphasis><filename>linux-yocto-2.6.34</filename></emphasis> - The
258 stable Linux Yocto kernel that is based on the Linux 2.6.34 release.</para></listitem> 258 stable Linux Yocto kernel that is based on the Linux 2.6.34 release.</para></listitem>
259 <listitem><para><emphasis><filename>linux-yocto-2.6.37</filename></emphasis> - The current 259 <listitem><para><emphasis><filename>linux-yocto-2.6.37</filename></emphasis> - The
260 Linux Yocto kernel that is based on the Linux 2.6.37 release.</para></listitem> 260 stable Linux Yocto kernel that is based on the Linux 2.6.37 release.</para></listitem>
261 <listitem><para><emphasis><filename>linux-yocto-3.0</filename></emphasis> - The current
262 Linux Yocto kernel that is based on the Linux 3.0 release.</para></listitem>
261 <listitem><para><emphasis><filename>linux-yocto-dev</filename></emphasis> - A development 263 <listitem><para><emphasis><filename>linux-yocto-dev</filename></emphasis> - A development
262 kernel based on the Linux 2.6.39-rc1 release.</para></listitem> 264 kernel based on the Linux 2.6.39-rc1 release.</para></listitem>
263 <listitem><para><emphasis><filename>linux-2.6</filename></emphasis> - A kernel based on 265 <listitem><para><emphasis><filename>linux-2.6</filename></emphasis> - A kernel based on
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml
index 52be498b44..f6938fc9ca 100644
--- a/documentation/dev-manual/dev-manual-start.xml
+++ b/documentation/dev-manual/dev-manual-start.xml
@@ -114,13 +114,13 @@
114 For simplicity, it is recommended that you create these structures outside of the 114 For simplicity, it is recommended that you create these structures outside of the
115 Yocto Project files Git repository.</para> 115 Yocto Project files Git repository.</para>
116 <para>As an example, the following transcript shows how to create the bare clone 116 <para>As an example, the following transcript shows how to create the bare clone
117 of the <filename>linux-yocto-2.6.37</filename> kernel and then create a copy of 117 of the <filename>linux-yocto-3.0</filename> kernel and then create a copy of
118 that clone. 118 that clone.
119 The bare clone is named <filename>linux-yocto-2.6.37.git</filename>, while the 119 The bare clone is named <filename>linux-yocto-3.0.git</filename>, while the
120 copy is named <filename>linux-yocto-2.6.37</filename>: 120 copy is named <filename>linux-yocto-3.0</filename>:
121 <literallayout class='monospaced'> 121 <literallayout class='monospaced'>
122 $ git clone --bare git://git.yoctoproject.org/linux-yocto-2.6.37 linux-yocto-2.6.37.git 122 $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.0 linux-yocto-3.0.git
123 Initialized empty Git repository in /home/scottrif/poky/linux-yocto-2.6.37.git/ 123 Initialized empty Git repository in /home/scottrif/poky/linux-yocto-3.0.git/
124 remote: Counting objects: 1886034, done. 124 remote: Counting objects: 1886034, done.
125 remote: Compressing objects: 100% (314326/314326), done. 125 remote: Compressing objects: 100% (314326/314326), done.
126 remote: Total 1886034 (delta 1570200), reused 1870337 (delta 1554798) 126 remote: Total 1886034 (delta 1570200), reused 1870337 (delta 1554798)
@@ -129,8 +129,8 @@
129 </literallayout></para> 129 </literallayout></para>
130 <para>Now create a clone of the bare clone just created: 130 <para>Now create a clone of the bare clone just created:
131 <literallayout class='monospaced'> 131 <literallayout class='monospaced'>
132 $ git clone linux-yocto-2.6.37.git linux-yocto-2.6.37 132 $ git clone linux-yocto-3.0.git linux-yocto-3.0
133 Initialized empty Git repository in /home/scottrif/poky/linux-yocto-2.6.37/.git/ 133 Initialized empty Git repository in /home/scottrif/poky/linux-yocto-3.0/.git/
134 Checking out files: 100% (35188/35188), done. 134 Checking out files: 100% (35188/35188), done.
135 </literallayout></para></listitem> 135 </literallayout></para></listitem>
136 <listitem id='poky-extras-repo'><para><emphasis> 136 <listitem id='poky-extras-repo'><para><emphasis>