diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2012-02-02 14:40:01 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-08 12:07:49 -0800 |
commit | babc066860bc936f5254dedc5d002d00ca7c2882 (patch) | |
tree | 1854d48e2adb5eef8551f87974698c97b847891a | |
parent | 9cfbefcc3d25a00054166aeaac49b873a2aa5cd0 (diff) | |
download | ast2050-yocto-poky-babc066860bc936f5254dedc5d002d00ca7c2882.zip ast2050-yocto-poky-babc066860bc936f5254dedc5d002d00ca7c2882.tar.gz |
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 <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/dev-manual/dev-manual-kernel-appendix.xml | 16 | ||||
-rw-r--r-- | documentation/dev-manual/dev-manual-model.xml | 5 | ||||
-rw-r--r-- | documentation/dev-manual/dev-manual-start.xml | 14 |
3 files changed, 19 insertions, 16 deletions
diff --git a/documentation/dev-manual/dev-manual-kernel-appendix.xml b/documentation/dev-manual/dev-manual-kernel-appendix.xml index 8eed4e6..0836fe9 100644 --- a/documentation/dev-manual/dev-manual-kernel-appendix.xml +++ b/documentation/dev-manual/dev-manual-kernel-appendix.xml @@ -178,7 +178,7 @@ <title>Setting Up the Bare Clone and its Copy</title> <para> - This example modifies the <filename>linux-yocto-3.0</filename> kernel. + This example modifies the <filename>linux-yocto-3.0-1.1.x</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 @@ -190,12 +190,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>linux-yocto-3.0</filename> in this example) has to have + The copy (<filename>my-linux-yocto-3.0-1.1.x-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 ~/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 @@ <para> The file you change in this example is named <filename>calibrate.c</filename> - and is located in the <filename>linux-yocto-3.0</filename> Git repository + and is located in the <filename>my-linux-yocto-3.0-1.1.x-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. @@ -414,13 +414,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.git</filename>. + <filename>linux-yocto-3.0-1.1.x.git</filename>. To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your - local <filename>linux-yocto-3.0.git</filename> Git repository by adding the + local <filename>linux-yocto-3.0-1.1.x.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.git + KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0-1.1.x.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 @@ -648,7 +648,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</filename> + In this example, we are basing our changes on the <filename>linux-yocto-3.0-1.1.x</filename> kernel. The Yocto Project build environment recognizes this kernel as <filename>linux-yocto</filename>. diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml index 673bf29..7c03023 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.</para></listitem> <listitem><para><emphasis><filename>linux-yocto-2.6.37</filename></emphasis> - The stable Linux Yocto kernel that is based on the Linux 2.6.37 release.</para></listitem> - <listitem><para><emphasis><filename>linux-yocto-3.0</filename></emphasis> - The current + <listitem><para><emphasis><filename>linux-yocto-3.0</filename></emphasis> - The stable Linux Yocto kernel that is based on the Linux 3.0 release.</para></listitem> + <listitem><para><emphasis><filename>linux-yocto-3.0-1.1.x</filename></emphasis> - 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</para></listitem> <listitem><para><emphasis><filename>linux-yocto-dev</filename></emphasis> - A development kernel based on the latest upstream release candidate available.</para></listitem> </itemizedlist> diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml index 3cb6750..007c751 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.</para> <para>As an example, the following transcript shows how to create the bare clone - of the <filename>linux-yocto-3.0</filename> kernel and then create a copy of + of the <filename>linux-yocto-3.0-1.1.x</filename> kernel and then create a copy of that clone. <note>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 <filename>clone</filename> command. Doing so can speed up the process.</note></para> <para>In the following example, the bare clone is named - <filename>linux-yocto-3.0.git</filename>, while the - copy is named <filename>linux-yocto-3.0</filename>: + <filename>linux-yocto-3.0-1.1.x.git</filename>, while the + copy is named <filename>my-linux-yocto-3.0-1.1.x-work</filename>: <literallayout class='monospaced'> - $ 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 @@ </literallayout></para> <para>Now create a clone of the bare clone just created: <literallayout class='monospaced'> - $ 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. </literallayout></para></listitem> <listitem id='poky-extras-repo'><para><emphasis> |