From 9a548f0ee468294286e233f63b31eeff520acfd5 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Mon, 23 Apr 2012 14:41:10 -0600 Subject: documentation: Replacements for "1.1" and "edison", etc. I did a quick and dirty scrub over the manuals for the strings "1.1" and "edison". I found some instances that were not properly variablized. Also, discovered some references to the linux-yocto-3.0-1.1.x. All but one instance of this needed changed to linux-yocto-3.2. (From yocto-docs rev: 620fb4b7626defcefc8a039de09ae4599ee7f454) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- .../dev-manual/dev-manual-kernel-appendix.xml | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'documentation/dev-manual/dev-manual-kernel-appendix.xml') 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 - This example uses the Yocto Project 1.1 Release code named "edison", - which maps to the edison branch in the repository. - The following commands create and checkout the local edison + This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;", + which maps to the &DISTRO_NAME; branch in the repository. + The following commands create and checkout the local &DISTRO_NAME; branch: $ 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;' @@ -184,7 +184,7 @@ Setting Up the Bare Clone and its Copy - This example modifies the linux-yocto-3.0-1.1.x kernel. + This example modifies the linux-yocto-3.2 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 git push commands after you make edits and commits inside the copy of the clone. - The copy (my-linux-yocto-3.0-1.1.x-work in this example) has to have + The copy (my-linux-yocto-3.2-work in this example) has to have a local branch created and checked out for your work. This example uses common-pc-base as the local branch. The following commands create and checkout the branch: - $ 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 @@ The file you change in this example is named calibrate.c - and is located in the my-linux-yocto-3.0-1.1.x-work Git repository + and is located in the my-linux-yocto-3.2-work Git repository (the copy of the bare clone) in init. This example simply inserts several printk statements at the beginning of the calibrate_delay function. @@ -420,13 +420,13 @@ poky-extras/meta-kernel-dev/recipes-kernel/linux directory, you need to identify the location of the local source code, which in this example is the bare clone named - linux-yocto-3.0-1.1.x.git. + linux-yocto-3.2.git. To do this, set the KSRC_linux_yocto variable to point to your - local linux-yocto-3.0-1.1.x.git Git repository by adding the + local linux-yocto-3.2.git Git repository by adding the following statement. Be sure to substitute your user information in the statement: - KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0-1.1.x.git + KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.2.git Specify the Kernel Machine: Also in the linux-yocto_3.0.bbappend file, you need to specify @@ -545,13 +545,13 @@ $ git branch -a $ git tag -l - 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 &DISTRO_NAME; branch in the repository. The following commands create and checkout the local &DISTRO_NAME; branch: $ 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;' @@ -654,7 +654,7 @@ After setting up the environment to run menuconfig, you are ready to use the tool to interactively change the kernel configuration. - In this example, we are basing our changes on the linux-yocto-3.0-1.1.x + In this example, we are basing our changes on the linux-yocto-3.2 kernel. The Yocto Project build environment recognizes this kernel as linux-yocto. -- cgit v1.2.3-54-g00ecf