From babc066860bc936f5254dedc5d002d00ca7c2882 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Thu, 2 Feb 2012 14:40:01 -0600 Subject: documentation/dev-manual: Updates to names of bare clone and copy I changed the example to use a different kernel (linux-yocto-3.0-1.1.x) and the example that creates the bare clone and the copy of the bare clone to use better names that are more easily distiguishable: linux-yocto-3.0-1.1.x.git and my-linux-3.0-1.1.x-work, respectively. (From yocto-docs rev: b1366d35155121f5aa576715541036304c99f13b) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/dev-manual/dev-manual-kernel-appendix.xml | 16 ++++++++-------- documentation/dev-manual/dev-manual-model.xml | 5 ++++- documentation/dev-manual/dev-manual-start.xml | 14 +++++++------- 3 files changed, 19 insertions(+), 16 deletions(-) (limited to 'documentation/dev-manual') diff --git a/documentation/dev-manual/dev-manual-kernel-appendix.xml b/documentation/dev-manual/dev-manual-kernel-appendix.xml index 8eed4e63b4..0836fe9335 100644 --- a/documentation/dev-manual/dev-manual-kernel-appendix.xml +++ b/documentation/dev-manual/dev-manual-kernel-appendix.xml @@ -178,7 +178,7 @@ Setting Up the Bare Clone and its Copy - This example modifies the linux-yocto-3.0 kernel. + This example modifies the linux-yocto-3.0-1.1.x 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 @@ -190,12 +190,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 (linux-yocto-3.0 in this example) has to have + The copy (my-linux-yocto-3.0-1.1.x-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 ~/linux-yocto-3.0 + $ cd ~/my-linux-yocto-3.0-1.1.x-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. @@ -290,7 +290,7 @@ The file you change in this example is named calibrate.c - and is located in the linux-yocto-3.0 Git repository + and is located in the my-linux-yocto-3.0-1.1.x-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. @@ -414,13 +414,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.git. + linux-yocto-3.0-1.1.x.git. To do this, set the KSRC_linux_yocto variable to point to your - local linux-yocto-3.0.git Git repository by adding the + local linux-yocto-3.0-1.1.x.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.git + KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0-1.1.x.git Specify the Kernel Machine: Also in the linux-yocto_3.0.bbappend file, you need to specify @@ -648,7 +648,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 + In this example, we are basing our changes on the linux-yocto-3.0-1.1.x kernel. The Yocto Project build environment recognizes this kernel as linux-yocto. diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml index 673bf2997b..7c0302365b 100644 --- a/documentation/dev-manual/dev-manual-model.xml +++ b/documentation/dev-manual/dev-manual-model.xml @@ -231,8 +231,11 @@ stable Linux Yocto kernel that is based on the Linux 2.6.34 release. linux-yocto-2.6.37 - The stable Linux Yocto kernel that is based on the Linux 2.6.37 release. - linux-yocto-3.0 - The current + linux-yocto-3.0 - The stable Linux Yocto kernel that is based on the Linux 3.0 release. + linux-yocto-3.0-1.1.x - The + stable Linux Yocto kernel to use with the Yocto Project Release 1.1.x. This kernel + is based on the Linux 3.0 release linux-yocto-dev - A development kernel based on the latest upstream release candidate available. diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml index 3cb6750d54..007c751a4e 100644 --- a/documentation/dev-manual/dev-manual-start.xml +++ b/documentation/dev-manual/dev-manual-start.xml @@ -121,18 +121,18 @@ For simplicity, it is recommended that you create these structures outside of the Yocto Project files' Git repository. As an example, the following transcript shows how to create the bare clone - of the linux-yocto-3.0 kernel and then create a copy of + of the linux-yocto-3.0-1.1.x kernel and then create a copy of that clone. When you have a local Linux Yocto kernel Git repository, you can reference that repository rather than the upstream Git repository as part of the clone command. Doing so can speed up the process. In the following example, the bare clone is named - linux-yocto-3.0.git, while the - copy is named linux-yocto-3.0: + linux-yocto-3.0-1.1.x.git, while the + copy is named my-linux-yocto-3.0-1.1.x-work: - $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.0 linux-yocto-3.0.git - Initialized empty Git repository in /home/scottrif/linux-yocto-3.0.git/ + $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.0-1.1.x linux-yocto-3.0-1.1.x.git + Initialized empty Git repository in /home/scottrif/linux-yocto-3.0-1.1.x.git/ remote: Counting objects: 2259181, done. remote: Compressing objects: 100% (373259/373259), done. remote: Total 2259181 (delta 1892638), reused 2231556 (delta 1865300) @@ -141,8 +141,8 @@ Now create a clone of the bare clone just created: - $ git clone linux-yocto-3.0.git linux-yocto-3.0 - Initialized empty Git repository in /home/scottrif/linux-yocto-3.0/.git/ + $ git clone linux-yocto-3.0-1.1.x.git my-linux-yocto-3.0-1.1.x-work + Initialized empty Git repository in /home/scottrif/my-linux-yocto-3.0-1.1.x/.git/ Checking out files: 100% (36898/36898), done. -- cgit v1.2.3-54-g00ecf