summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual/dev-manual-kernel-appendix.xml
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/dev-manual/dev-manual-kernel-appendix.xml')
-rw-r--r--documentation/dev-manual/dev-manual-kernel-appendix.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/documentation/dev-manual/dev-manual-kernel-appendix.xml b/documentation/dev-manual/dev-manual-kernel-appendix.xml
index ea59406696..12cb20eb46 100644
--- a/documentation/dev-manual/dev-manual-kernel-appendix.xml
+++ b/documentation/dev-manual/dev-manual-kernel-appendix.xml
@@ -65,7 +65,7 @@
65 </para> 65 </para>
66 66
67 <para> 67 <para>
68 <imagedata fileref="figures/kernel-example-repos.png" width="7in" depth="5in" 68 <imagedata fileref="figures/kernel-example-repos-edison.png" width="7in" depth="5in"
69 align="center" scale="100" /> 69 align="center" scale="100" />
70 </para> 70 </para>
71 71
@@ -178,7 +178,7 @@
178 <title>Setting Up the Bare Clone and its Copy</title> 178 <title>Setting Up the Bare Clone and its Copy</title>
179 179
180 <para> 180 <para>
181 This example modifies the <filename>linux-yocto-3.0</filename> kernel. 181 This example modifies the <filename>linux-yocto-3.0-1.1.x</filename> kernel.
182 Thus, you need to create a bare clone of that kernel and then make a copy of the 182 Thus, you need to create a bare clone of that kernel and then make a copy of the
183 bare clone. 183 bare clone.
184 See the bulleted item 184 See the bulleted item
@@ -190,12 +190,12 @@
190 The bare clone exists for the kernel build tools and simply as the receiving end 190 The bare clone exists for the kernel build tools and simply as the receiving end
191 of <filename>git push</filename> 191 of <filename>git push</filename>
192 commands after you make edits and commits inside the copy of the clone. 192 commands after you make edits and commits inside the copy of the clone.
193 The copy (<filename>linux-yocto-3.0</filename> in this example) has to have 193 The copy (<filename>my-linux-yocto-3.0-1.1.x-work</filename> in this example) has to have
194 a local branch created and checked out for your work. 194 a local branch created and checked out for your work.
195 This example uses <filename>common-pc-base</filename> as the local branch. 195 This example uses <filename>common-pc-base</filename> as the local branch.
196 The following commands create and checkout the branch: 196 The following commands create and checkout the branch:
197 <literallayout class='monospaced'> 197 <literallayout class='monospaced'>
198 $ cd ~/linux-yocto-3.0 198 $ cd ~/my-linux-yocto-3.0-1.1.x
199 $ git checkout -b common-pc-base origin/yocto/standard/common-pc/base 199 $ git checkout -b common-pc-base origin/yocto/standard/common-pc/base
200 Branch common-pc-base set up to track remote branch 200 Branch common-pc-base set up to track remote branch
201 yocto/standard/common-pc/base from origin. 201 yocto/standard/common-pc/base from origin.
@@ -290,7 +290,7 @@
290 290
291 <para> 291 <para>
292 The file you change in this example is named <filename>calibrate.c</filename> 292 The file you change in this example is named <filename>calibrate.c</filename>
293 and is located in the <filename>linux-yocto-3.0</filename> Git repository 293 and is located in the <filename>my-linux-yocto-3.0-1.1.x-work</filename> Git repository
294 (the copy of the bare clone) in <filename>init</filename>. 294 (the copy of the bare clone) in <filename>init</filename>.
295 This example simply inserts several <filename>printk</filename> statements 295 This example simply inserts several <filename>printk</filename> statements
296 at the beginning of the <filename>calibrate_delay</filename> function. 296 at the beginning of the <filename>calibrate_delay</filename> function.
@@ -415,13 +415,13 @@
415 <filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename> 415 <filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename>
416 directory, you need to identify the location of the 416 directory, you need to identify the location of the
417 local source code, which in this example is the bare clone named 417 local source code, which in this example is the bare clone named
418 <filename>linux-yocto-3.0.git</filename>. 418 <filename>linux-yocto-3.0-1.1.x.git</filename>.
419 To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your 419 To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your
420 local <filename>linux-yocto-3.0.git</filename> Git repository by adding the 420 local <filename>linux-yocto-3.0-1.1.x.git</filename> Git repository by adding the
421 following statement. 421 following statement.
422 Be sure to substitute your user information in the statement: 422 Be sure to substitute your user information in the statement:
423 <literallayout class='monospaced'> 423 <literallayout class='monospaced'>
424 KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0.git 424 KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0-1.1.x.git
425 </literallayout></para></listitem> 425 </literallayout></para></listitem>
426 <listitem><para><emphasis>Specify the Kernel Machine:</emphasis> Also in the 426 <listitem><para><emphasis>Specify the Kernel Machine:</emphasis> Also in the
427 <filename>linux-yocto_3.0.bbappend</filename> file, you need to specify 427 <filename>linux-yocto_3.0.bbappend</filename> file, you need to specify
@@ -598,7 +598,7 @@
598 <para> 598 <para>
599 After setting up the environment to run <filename>menuconfig</filename>, you are ready 599 After setting up the environment to run <filename>menuconfig</filename>, you are ready
600 to use the tool to interactively change the kernel configuration. 600 to use the tool to interactively change the kernel configuration.
601 In this example, we are basing our changes on the <filename>linux-yocto-3.0</filename> 601 In this example, we are basing our changes on the <filename>linux-yocto-3.0-1.1.x</filename>
602 kernel. 602 kernel.
603 The Yocto Project build environment recognizes this kernel as 603 The Yocto Project build environment recognizes this kernel as
604 <filename>linux-yocto</filename>. 604 <filename>linux-yocto</filename>.