summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2011-08-11 10:29:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 15:27:03 +0100
commite04e02cd4671848e481328c6443cf0f89ca75cfe (patch)
treea8ee73063e0468aaf50518aec0564169afa5eed4 /documentation/dev-manual
parent9584cb5d1523625c4e595c4cd33d894449549268 (diff)
downloadast2050-yocto-poky-e04e02cd4671848e481328c6443cf0f89ca75cfe.zip
ast2050-yocto-poky-e04e02cd4671848e481328c6443cf0f89ca75cfe.tar.gz
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 <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual')
-rw-r--r--documentation/dev-manual/dev-manual-bsp-appendix.xml19
-rw-r--r--documentation/dev-manual/dev-manual-kernel-appendix.xml20
-rw-r--r--documentation/dev-manual/dev-manual-model.xml6
-rw-r--r--documentation/dev-manual/dev-manual-start.xml14
4 files changed, 31 insertions, 28 deletions
diff --git a/documentation/dev-manual/dev-manual-bsp-appendix.xml b/documentation/dev-manual/dev-manual-bsp-appendix.xml
index 6a35985..97ceb12 100644
--- a/documentation/dev-manual/dev-manual-bsp-appendix.xml
+++ b/documentation/dev-manual/dev-manual-bsp-appendix.xml
@@ -173,7 +173,7 @@
<filename>PREFERRED_PROVIDER_virtual/kernel</filename> statement.
This statement identifies the kernel that the BSP is going to use.
In this case the BSP is using <filename>linux-yocto</filename>, 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.
</para>
<para>
@@ -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
<filename>meta/recipes-kernel/linux</filename> and is
- named <filename>linux-yocto_2.6.37.bb</filename>.
+ named <filename>linux-yocto_3.0.bb</filename>.
The <filename>SRCREV_machine</filename> and <filename>SRCREV_meta</filename>
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 @@
<para>
However, in the <filename>meta-mymachine</filename> layer in
<filename>recipes-kernel/linux</filename> resides a <filename>.bbappend</filename>
- file named <filename>linux-yocto_2.6.37.bbappend</filename> that
+ file named <filename>linux-yocto_3.0.bbappend</filename> that
is appended to the recipe of the same name in <filename>meta/recipes-kernel/link</filename>.
Thus, the <filename>SRCREV</filename> statements in the "append" file override
the more general statements found in <filename>meta</filename>.
@@ -343,7 +343,7 @@
</para>
<para>
- To fix this situation in <filename>linux-yocto_2.6.37.bbappend</filename>
+ To fix this situation in <filename>linux-yocto_3.0.bbappend</filename>
we delete the two <filename>SRCREV</filename> statements that support
EMGD (the top pair).
We also change the remaining pair to specify <filename>mymachine</filename>
@@ -364,8 +364,9 @@
exact commit strings in the Yocto Project source repositories you need to change
the <filename>SRCREV</filename> statements.
You can find all the <filename>machine</filename> and <filename>meta</filename>
- branch points (commits) for the <filename>linux-yocto-2.6.37</filename> kernel
- <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37'>here</ulink>.
+ branch points (commits) for the <filename>linux-yocto-3.0</filename> kernel
+ <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37'>here</ulink>
+ [WRITER's NOTE: Need new link to the 3.0 source repo area when it is available].
</para>
<para>
@@ -376,7 +377,7 @@
branch</para></listitem>
<listitem><para>Click on the commit column header to view the top commit</para></listitem>
<listitem><para>Copy the commit string for use in the
- <filename>linux-yocto_2.6.37.bbappend</filename> file</para></listitem>
+ <filename>linux-yocto_3.0.bbappend</filename> file</para></listitem>
</orderedlist>
</para>
@@ -387,14 +388,14 @@
</para>
<para>
- Also in the <filename>linux-yocto_2.6.37.bbappend</filename> file are
+ Also in the <filename>linux-yocto_3.0.bbappend</filename> file are
<filename>COMPATIBLE_MACHINE</filename>, <filename>KMACHINE</filename>,
and <filename>KERNEL_FEATURES</filename> 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 <filename>mymachine</filename> replaces
<filename>crownbay-noemgd</filename> and <filename>crownbay</filename>.
- Here is the final <filename>linux-yocto_2.6.37.bbappend</filename> file after all
+ Here is the final <filename>linux-yocto_3.0.bbappend</filename> file after all
the edits:
<literallayout class='monospaced'>
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 d7b5587..4000a0b 100644
--- a/documentation/dev-manual/dev-manual-kernel-appendix.xml
+++ b/documentation/dev-manual/dev-manual-kernel-appendix.xml
@@ -176,7 +176,7 @@
<title>Setting Up the Bare Clone and its Copy</title>
<para>
- This example modifies the <filename>linux-yocto-2.6.37</filename> kernel.
+ This example modifies the <filename>linux-yocto-3.0</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
@@ -189,12 +189,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-2.6.37</filename> in this example) has to have
+ The copy (<filename>linux-yocto-3.0</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-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 @@
<para>
The file you change in this example is named <filename>calibrate.c</filename>
- and is located in the <filename>linux-yocto-2.6.37</filename> Git repository
+ and is located in the <filename>linux-yocto-3.0</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.
@@ -409,20 +409,20 @@
"
</literallayout></para></listitem>
<listitem><para><emphasis>Identify Your Source Files</emphasis> - In the
- <filename>linux-yocto_2.6.37.bbappend</filename> file located in the
+ <filename>linux-yocto_3.0.bbappend</filename> file located in the
<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-2.6.37.git</filename>.
+ <filename>linux-yocto-3.0.git</filename>.
To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your
- local <filename>linux-yocto-2.6.37.git</filename> Git repository by adding the
+ local <filename>linux-yocto-3.0.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-2.6.37.git
+ KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0.git
</literallayout></para></listitem>
<listitem><para><emphasis>Specify the Kernel Machine</emphasis> - Also in the
- <filename>linux-yocto_2.6.37.bbappend</filename> file, you need to specify
+ <filename>linux-yocto_3.0.bbappend</filename> file, you need to specify
the kernel machine with the following statement:
<literallayout class='monospaced'>
KMACHINE_qemux86 = "yocto/standard/common-pc/base"
@@ -438,7 +438,7 @@
comment out the <filename>COMPATIBLE_MACHINE</filename> statements in all
<filename>.bbappend</filename> files, or you should simply remove all the files
except the one your are using for the build
- (i.e. <filename>linux-yocto_2.6.37.bbappend</filename> in this example).
+ (i.e. <filename>linux-yocto_3.0.bbappend</filename> in this example).
</note>
</section>
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 68ea76e..c0c0247 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -256,8 +256,10 @@
<itemizedlist>
<listitem><para><emphasis><filename>linux-yocto-2.6.34</filename></emphasis> - The
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 current
- Linux Yocto kernel that is based on the Linux 2.6.37 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
+ Linux Yocto kernel that 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 Linux 2.6.39-rc1 release.</para></listitem>
<listitem><para><emphasis><filename>linux-2.6</filename></emphasis> - A kernel based on
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml
index 52be498..f6938fc 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.</para>
<para>As an example, the following transcript shows how to create the bare clone
- of the <filename>linux-yocto-2.6.37</filename> kernel and then create a copy of
+ of the <filename>linux-yocto-3.0</filename> kernel and then create a copy of
that clone.
- The bare clone is named <filename>linux-yocto-2.6.37.git</filename>, while the
- copy is named <filename>linux-yocto-2.6.37</filename>:
+ The bare clone is named <filename>linux-yocto-3.0.git</filename>, while the
+ copy is named <filename>linux-yocto-3.0</filename>:
<literallayout class='monospaced'>
- $ 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 @@
</literallayout></para>
<para>Now create a clone of the bare clone just created:
<literallayout class='monospaced'>
- $ 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.
</literallayout></para></listitem>
<listitem id='poky-extras-repo'><para><emphasis>
OpenPOWER on IntegriCloud