diff options
Diffstat (limited to 'documentation/dev-manual/dev-manual-kernel-appendix.xml')
-rw-r--r-- | documentation/dev-manual/dev-manual-kernel-appendix.xml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/documentation/dev-manual/dev-manual-kernel-appendix.xml b/documentation/dev-manual/dev-manual-kernel-appendix.xml index 58f33e8ef3..865c43b3ec 100644 --- a/documentation/dev-manual/dev-manual-kernel-appendix.xml +++ b/documentation/dev-manual/dev-manual-kernel-appendix.xml | |||
@@ -155,13 +155,13 @@ | |||
155 | $ git branch -a | 155 | $ git branch -a |
156 | $ git tag -l | 156 | $ git tag -l |
157 | </literallayout> | 157 | </literallayout> |
158 | This example uses the Yocto Project 1.1 Release code named "edison", | 158 | This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;", |
159 | which maps to the <filename>edison</filename> branch in the repository. | 159 | which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository. |
160 | The following commands create and checkout the local <filename>edison</filename> | 160 | The following commands create and checkout the local <filename>&DISTRO_NAME;</filename> |
161 | branch: | 161 | branch: |
162 | <literallayout class='monospaced'> | 162 | <literallayout class='monospaced'> |
163 | $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; | 163 | $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; |
164 | Branch edison set up to track remote branch &DISTRO_NAME; from origin. | 164 | Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin. |
165 | Switched to a new branch '&DISTRO_NAME;' | 165 | Switched to a new branch '&DISTRO_NAME;' |
166 | </literallayout> | 166 | </literallayout> |
167 | </para> | 167 | </para> |
@@ -184,7 +184,7 @@ | |||
184 | <title>Setting Up the Bare Clone and its Copy</title> | 184 | <title>Setting Up the Bare Clone and its Copy</title> |
185 | 185 | ||
186 | <para> | 186 | <para> |
187 | This example modifies the <filename>linux-yocto-3.0-1.1.x</filename> kernel. | 187 | This example modifies the <filename>linux-yocto-3.2</filename> kernel. |
188 | Thus, you need to create a bare clone of that kernel and then make a copy of the | 188 | Thus, you need to create a bare clone of that kernel and then make a copy of the |
189 | bare clone. | 189 | bare clone. |
190 | See the bulleted item | 190 | See the bulleted item |
@@ -196,12 +196,12 @@ | |||
196 | The bare clone exists for the kernel build tools and simply as the receiving end | 196 | The bare clone exists for the kernel build tools and simply as the receiving end |
197 | of <filename>git push</filename> | 197 | of <filename>git push</filename> |
198 | commands after you make edits and commits inside the copy of the clone. | 198 | commands after you make edits and commits inside the copy of the clone. |
199 | The copy (<filename>my-linux-yocto-3.0-1.1.x-work</filename> in this example) has to have | 199 | The copy (<filename>my-linux-yocto-3.2-work</filename> in this example) has to have |
200 | a local branch created and checked out for your work. | 200 | a local branch created and checked out for your work. |
201 | This example uses <filename>common-pc-base</filename> as the local branch. | 201 | This example uses <filename>common-pc-base</filename> as the local branch. |
202 | The following commands create and checkout the branch: | 202 | The following commands create and checkout the branch: |
203 | <literallayout class='monospaced'> | 203 | <literallayout class='monospaced'> |
204 | $ cd ~/my-linux-yocto-3.0-1.1.x-work | 204 | $ cd ~/my-linux-yocto-3.2-work |
205 | $ git checkout -b common-pc-base origin/yocto/standard/common-pc/base | 205 | $ git checkout -b common-pc-base origin/yocto/standard/common-pc/base |
206 | Branch common-pc-base set up to track remote branch | 206 | Branch common-pc-base set up to track remote branch |
207 | yocto/standard/common-pc/base from origin. | 207 | yocto/standard/common-pc/base from origin. |
@@ -296,7 +296,7 @@ | |||
296 | 296 | ||
297 | <para> | 297 | <para> |
298 | The file you change in this example is named <filename>calibrate.c</filename> | 298 | The file you change in this example is named <filename>calibrate.c</filename> |
299 | and is located in the <filename>my-linux-yocto-3.0-1.1.x-work</filename> Git repository | 299 | and is located in the <filename>my-linux-yocto-3.2-work</filename> Git repository |
300 | (the copy of the bare clone) in <filename>init</filename>. | 300 | (the copy of the bare clone) in <filename>init</filename>. |
301 | This example simply inserts several <filename>printk</filename> statements | 301 | This example simply inserts several <filename>printk</filename> statements |
302 | at the beginning of the <filename>calibrate_delay</filename> function. | 302 | at the beginning of the <filename>calibrate_delay</filename> function. |
@@ -420,13 +420,13 @@ | |||
420 | <filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename> | 420 | <filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename> |
421 | directory, you need to identify the location of the | 421 | directory, you need to identify the location of the |
422 | local source code, which in this example is the bare clone named | 422 | local source code, which in this example is the bare clone named |
423 | <filename>linux-yocto-3.0-1.1.x.git</filename>. | 423 | <filename>linux-yocto-3.2.git</filename>. |
424 | To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your | 424 | To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your |
425 | local <filename>linux-yocto-3.0-1.1.x.git</filename> Git repository by adding the | 425 | local <filename>linux-yocto-3.2.git</filename> Git repository by adding the |
426 | following statement. | 426 | following statement. |
427 | Be sure to substitute your user information in the statement: | 427 | Be sure to substitute your user information in the statement: |
428 | <literallayout class='monospaced'> | 428 | <literallayout class='monospaced'> |
429 | KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0-1.1.x.git | 429 | KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.2.git |
430 | </literallayout></para></listitem> | 430 | </literallayout></para></listitem> |
431 | <listitem><para><emphasis>Specify the Kernel Machine:</emphasis> Also in the | 431 | <listitem><para><emphasis>Specify the Kernel Machine:</emphasis> Also in the |
432 | <filename>linux-yocto_3.0.bbappend</filename> file, you need to specify | 432 | <filename>linux-yocto_3.0.bbappend</filename> file, you need to specify |
@@ -545,13 +545,13 @@ | |||
545 | $ git branch -a | 545 | $ git branch -a |
546 | $ git tag -l | 546 | $ git tag -l |
547 | </literallayout> | 547 | </literallayout> |
548 | This example uses the Yocto Project 1.1.1 Release code named "&DISTRO_NAME;", | 548 | This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;", |
549 | which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository. | 549 | which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository. |
550 | The following commands create and checkout the local <filename>&DISTRO_NAME;</filename> | 550 | The following commands create and checkout the local <filename>&DISTRO_NAME;</filename> |
551 | branch: | 551 | branch: |
552 | <literallayout class='monospaced'> | 552 | <literallayout class='monospaced'> |
553 | $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; | 553 | $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; |
554 | Branch edison set up to track remote branch &DISTRO_NAME; from origin. | 554 | Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin. |
555 | Switched to a new branch '&DISTRO_NAME;' | 555 | Switched to a new branch '&DISTRO_NAME;' |
556 | </literallayout> | 556 | </literallayout> |
557 | </para> | 557 | </para> |
@@ -654,7 +654,7 @@ | |||
654 | <para> | 654 | <para> |
655 | After setting up the environment to run <filename>menuconfig</filename>, you are ready | 655 | After setting up the environment to run <filename>menuconfig</filename>, you are ready |
656 | to use the tool to interactively change the kernel configuration. | 656 | to use the tool to interactively change the kernel configuration. |
657 | In this example, we are basing our changes on the <filename>linux-yocto-3.0-1.1.x</filename> | 657 | In this example, we are basing our changes on the <filename>linux-yocto-3.2</filename> |
658 | kernel. | 658 | kernel. |
659 | The Yocto Project build environment recognizes this kernel as | 659 | The Yocto Project build environment recognizes this kernel as |
660 | <filename>linux-yocto</filename>. | 660 | <filename>linux-yocto</filename>. |