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 @@ $ git branch -a $ git tag -l </literallayout> - This example uses the Yocto Project 1.1 Release code named "edison", - which maps to the <filename>edison</filename> branch in the repository. - The following commands create and checkout the local <filename>edison</filename> + This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;", + which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository. + The following commands create and checkout the local <filename>&DISTRO_NAME;</filename> branch: <literallayout class='monospaced'> $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; - Branch edison set up to track remote branch &DISTRO_NAME; from origin. + Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin. Switched to a new branch '&DISTRO_NAME;' </literallayout> </para> @@ -184,7 +184,7 @@ <title>Setting Up the Bare Clone and its Copy</title> <para> - This example modifies the <filename>linux-yocto-3.0-1.1.x</filename> kernel. + This example modifies the <filename>linux-yocto-3.2</filename> kernel. Thus, you need to create a bare clone of that kernel and then make a copy of the bare clone. See the bulleted item @@ -196,12 +196,12 @@ The bare clone exists for the kernel build tools and simply as the receiving end of <filename>git push</filename> commands after you make edits and commits inside the copy of the clone. - The copy (<filename>my-linux-yocto-3.0-1.1.x-work</filename> in this example) has to have + The copy (<filename>my-linux-yocto-3.2-work</filename> in this example) has to have a local branch created and checked out for your work. This example uses <filename>common-pc-base</filename> as the local branch. The following commands create and checkout the branch: <literallayout class='monospaced'> - $ cd ~/my-linux-yocto-3.0-1.1.x-work + $ cd ~/my-linux-yocto-3.2-work $ git checkout -b common-pc-base origin/yocto/standard/common-pc/base Branch common-pc-base set up to track remote branch yocto/standard/common-pc/base from origin. @@ -296,7 +296,7 @@ <para> The file you change in this example is named <filename>calibrate.c</filename> - and is located in the <filename>my-linux-yocto-3.0-1.1.x-work</filename> Git repository + and is located in the <filename>my-linux-yocto-3.2-work</filename> Git repository (the copy of the bare clone) in <filename>init</filename>. This example simply inserts several <filename>printk</filename> statements at the beginning of the <filename>calibrate_delay</filename> function. @@ -420,13 +420,13 @@ <filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename> directory, you need to identify the location of the local source code, which in this example is the bare clone named - <filename>linux-yocto-3.0-1.1.x.git</filename>. + <filename>linux-yocto-3.2.git</filename>. To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your - local <filename>linux-yocto-3.0-1.1.x.git</filename> Git repository by adding the + local <filename>linux-yocto-3.2.git</filename> Git repository by adding the following statement. Be sure to substitute your user information in the statement: <literallayout class='monospaced'> - KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0-1.1.x.git + KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.2.git </literallayout></para></listitem> <listitem><para><emphasis>Specify the Kernel Machine:</emphasis> Also in the <filename>linux-yocto_3.0.bbappend</filename> file, you need to specify @@ -545,13 +545,13 @@ $ git branch -a $ git tag -l </literallayout> - This example uses the Yocto Project 1.1.1 Release code named "&DISTRO_NAME;", + This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;", which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository. The following commands create and checkout the local <filename>&DISTRO_NAME;</filename> branch: <literallayout class='monospaced'> $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; - Branch edison set up to track remote branch &DISTRO_NAME; from origin. + Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin. Switched to a new branch '&DISTRO_NAME;' </literallayout> </para> @@ -654,7 +654,7 @@ <para> After setting up the environment to run <filename>menuconfig</filename>, you are ready to use the tool to interactively change the kernel configuration. - In this example, we are basing our changes on the <filename>linux-yocto-3.0-1.1.x</filename> + In this example, we are basing our changes on the <filename>linux-yocto-3.2</filename> kernel. The Yocto Project build environment recognizes this kernel as <filename>linux-yocto</filename>. |