From e04e02cd4671848e481328c6443cf0f89ca75cfe Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Thu, 11 Aug 2011 10:29:20 -0700 Subject: documentation/dev-manual: Changed 2.6.37 to 3.0 for 1.1 release. Bruce Ashfield's review comments indicated that we will be using linux-yocto-3.0 and not linux-yocto-2.6.37. So I am putting these changes in to anticipate the 1.1 release. (From yocto-docs rev: ecbe1c90c5aa65b2dde77ba6094b5956e37d061d) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/dev-manual/dev-manual-bsp-appendix.xml | 19 ++++++++++--------- .../dev-manual/dev-manual-kernel-appendix.xml | 20 ++++++++++---------- documentation/dev-manual/dev-manual-model.xml | 6 ++++-- documentation/dev-manual/dev-manual-start.xml | 14 +++++++------- 4 files changed, 31 insertions(+), 28 deletions(-) (limited to 'documentation') diff --git a/documentation/dev-manual/dev-manual-bsp-appendix.xml b/documentation/dev-manual/dev-manual-bsp-appendix.xml index 6a3598543f..97ceb12744 100644 --- a/documentation/dev-manual/dev-manual-bsp-appendix.xml +++ b/documentation/dev-manual/dev-manual-bsp-appendix.xml @@ -173,7 +173,7 @@ PREFERRED_PROVIDER_virtual/kernel statement. This statement identifies the kernel that the BSP is going to use. In this case the BSP is using linux-yocto, which is the - current Linux Yocto kernel based on the Linux 2.6.37 release. + current Linux Yocto kernel based on the Linux 3.0 release. @@ -300,7 +300,7 @@ The recipe for that kernel is not located in the BSP layer but rather in the local Yocto Project files at meta/recipes-kernel/linux and is - named linux-yocto_2.6.37.bb. + named linux-yocto_3.0.bb. The SRCREV_machine and SRCREV_meta statements point to the exact commits used by the Yocto Project development team in their source repositories that identify the right kernel for our hardware. @@ -309,7 +309,7 @@ However, in the meta-mymachine layer in recipes-kernel/linux resides a .bbappend - file named linux-yocto_2.6.37.bbappend that + file named linux-yocto_3.0.bbappend that is appended to the recipe of the same name in meta/recipes-kernel/link. Thus, the SRCREV statements in the "append" file override the more general statements found in meta. @@ -343,7 +343,7 @@ - To fix this situation in linux-yocto_2.6.37.bbappend + To fix this situation in linux-yocto_3.0.bbappend we delete the two SRCREV statements that support EMGD (the top pair). We also change the remaining pair to specify mymachine @@ -364,8 +364,9 @@ exact commit strings in the Yocto Project source repositories you need to change the SRCREV statements. You can find all the machine and meta - branch points (commits) for the linux-yocto-2.6.37 kernel - here. + branch points (commits) for the linux-yocto-3.0 kernel + here + [WRITER's NOTE: Need new link to the 3.0 source repo area when it is available]. @@ -376,7 +377,7 @@ branch Click on the commit column header to view the top commit Copy the commit string for use in the - linux-yocto_2.6.37.bbappend file + linux-yocto_3.0.bbappend file @@ -387,14 +388,14 @@ - Also in the linux-yocto_2.6.37.bbappend file are + Also in the linux-yocto_3.0.bbappend file are COMPATIBLE_MACHINE, KMACHINE, and KERNEL_FEATURES statements. Two sets of these exist: one set supports EMGD and one set does not. Because we are not interested in supporting EMGD those three can be deleted. The remaining three must be changed so that mymachine replaces crownbay-noemgd and crownbay. - Here is the final linux-yocto_2.6.37.bbappend file after all + Here is the final linux-yocto_3.0.bbappend file after all the edits: FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/documentation/dev-manual/dev-manual-kernel-appendix.xml b/documentation/dev-manual/dev-manual-kernel-appendix.xml index d7b5587cb9..4000a0b943 100644 --- a/documentation/dev-manual/dev-manual-kernel-appendix.xml +++ b/documentation/dev-manual/dev-manual-kernel-appendix.xml @@ -176,7 +176,7 @@ Setting Up the Bare Clone and its Copy - This example modifies the linux-yocto-2.6.37 kernel. + This example modifies the linux-yocto-3.0 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 @@ -189,12 +189,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-2.6.37 in this example) has to have + The copy (linux-yocto-3.0 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-2.6.37 + $ cd ~/linux-yocto-3.0 $ 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. Switched to a new branch 'common-pc-base' @@ -287,7 +287,7 @@ The file you change in this example is named calibrate.c - and is located in the linux-yocto-2.6.37 Git repository + and is located in the linux-yocto-3.0 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. @@ -409,20 +409,20 @@ " Identify Your Source Files - In the - linux-yocto_2.6.37.bbappend file located in the + linux-yocto_3.0.bbappend file located in the 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-2.6.37.git. + linux-yocto-3.0.git. To do this, set the KSRC_linux_yocto variable to point to your - local linux-yocto-2.6.37.git Git repository by adding the + local linux-yocto-3.0.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-2.6.37.git + KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0.git Specify the Kernel Machine - Also in the - linux-yocto_2.6.37.bbappend file, you need to specify + linux-yocto_3.0.bbappend file, you need to specify the kernel machine with the following statement: KMACHINE_qemux86 = "yocto/standard/common-pc/base" @@ -438,7 +438,7 @@ comment out the COMPATIBLE_MACHINE statements in all .bbappend files, or you should simply remove all the files except the one your are using for the build - (i.e. linux-yocto_2.6.37.bbappend in this example). + (i.e. linux-yocto_3.0.bbappend in this example). diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml index 68ea76e0c5..c0c0247247 100644 --- a/documentation/dev-manual/dev-manual-model.xml +++ b/documentation/dev-manual/dev-manual-model.xml @@ -256,8 +256,10 @@ linux-yocto-2.6.34 - The stable Linux Yocto kernel that is based on the Linux 2.6.34 release. - linux-yocto-2.6.37 - The current - Linux Yocto kernel that is based on the Linux 2.6.37 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 kernel that is based on the Linux 3.0 release. linux-yocto-dev - A development kernel based on the Linux 2.6.39-rc1 release. linux-2.6 - A kernel based on diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml index 52be498b44..f6938fc9ca 100644 --- a/documentation/dev-manual/dev-manual-start.xml +++ b/documentation/dev-manual/dev-manual-start.xml @@ -114,13 +114,13 @@ 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-2.6.37 kernel and then create a copy of + of the linux-yocto-3.0 kernel and then create a copy of that clone. - The bare clone is named linux-yocto-2.6.37.git, while the - copy is named linux-yocto-2.6.37: + The bare clone is named linux-yocto-3.0.git, while the + copy is named linux-yocto-3.0: - $ git clone --bare git://git.yoctoproject.org/linux-yocto-2.6.37 linux-yocto-2.6.37.git - Initialized empty Git repository in /home/scottrif/poky/linux-yocto-2.6.37.git/ + $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.0 linux-yocto-3.0.git + Initialized empty Git repository in /home/scottrif/poky/linux-yocto-3.0.git/ remote: Counting objects: 1886034, done. remote: Compressing objects: 100% (314326/314326), done. remote: Total 1886034 (delta 1570200), reused 1870337 (delta 1554798) @@ -129,8 +129,8 @@ Now create a clone of the bare clone just created: - $ git clone linux-yocto-2.6.37.git linux-yocto-2.6.37 - Initialized empty Git repository in /home/scottrif/poky/linux-yocto-2.6.37/.git/ + $ git clone linux-yocto-3.0.git linux-yocto-3.0 + Initialized empty Git repository in /home/scottrif/poky/linux-yocto-3.0/.git/ Checking out files: 100% (35188/35188), done. -- cgit v1.2.3-54-g00ecf