mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

documentation/dev-manual: Changed 2.6.37 to 3.0 for 1.1 release.

Browse Source 
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>
This commit is contained in:
Scott Rifenbark
2011-08-11 10:29:20 -07:00
committed by Richard Purdie
parent 9584cb5d15
commit e04e02cd46
4 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/dev-manual/dev-manual-bsp-appendix.xml
+10 -9
View File
@@ -173,7 +173,7 @@
<filename>PREFERRED_PROVIDER_virtual/kernel</filename> statement. <filename>PREFERRED_PROVIDER_virtual/kernel</filename> statement.
This statement identifies the kernel that the BSP is going to use. 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 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>
<para> <para>
@@ -300,7 +300,7 @@
The recipe for that kernel is not located in the The recipe for that kernel is not located in the
BSP layer but rather in the local Yocto Project files at BSP layer but rather in the local Yocto Project files at
<filename>meta/recipes-kernel/linux</filename> and is <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> The <filename>SRCREV_machine</filename> and <filename>SRCREV_meta</filename>
statements point to the exact commits used by the Yocto Project development team 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. in their source repositories that identify the right kernel for our hardware.
@@ -309,7 +309,7 @@
<para> <para>
However, in the <filename>meta-mymachine</filename> layer in However, in the <filename>meta-mymachine</filename> layer in
<filename>recipes-kernel/linux</filename> resides a <filename>.bbappend</filename> <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>. 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 Thus, the <filename>SRCREV</filename> statements in the "append" file override
the more general statements found in <filename>meta</filename>. the more general statements found in <filename>meta</filename>.
@@ -343,7 +343,7 @@
</para> </para>
<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 we delete the two <filename>SRCREV</filename> statements that support
EMGD (the top pair). EMGD (the top pair).
We also change the remaining pair to specify <filename>mymachine</filename> 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 exact commit strings in the Yocto Project source repositories you need to change
the <filename>SRCREV</filename> statements. the <filename>SRCREV</filename> statements.
You can find all the <filename>machine</filename> and <filename>meta</filename> 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 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>. <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>
<para> <para>
@@ -376,7 +377,7 @@
branch</para></listitem> branch</para></listitem>
<listitem><para>Click on the commit column header to view the top commit</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 <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> </orderedlist>
</para> </para>
@@ -387,14 +388,14 @@
</para> </para>
<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>, <filename>COMPATIBLE_MACHINE</filename>, <filename>KMACHINE</filename>,
and <filename>KERNEL_FEATURES</filename> statements. and <filename>KERNEL_FEATURES</filename> statements.
Two sets of these exist: one set supports EMGD and one set does not. 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. 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 The remaining three must be changed so that <filename>mymachine</filename> replaces
<filename>crownbay-noemgd</filename> and <filename>crownbay</filename>. <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: the edits:
<literallayout class='monospaced'> <literallayout class='monospaced'>
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
documentation/dev-manual/dev-manual-kernel-appendix.xml
+10 -10
View File
@@ -176,7 +176,7 @@
<title>Setting Up the Bare Clone and its Copy</title> <title>Setting Up the Bare Clone and its Copy</title>
<para> <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 Thus, you need to create a bare clone of that kernel and then make a copy of the
bare clone. bare clone.
See the bulleted item See the bulleted item
@@ -189,12 +189,12 @@
The bare clone exists for the kernel build tools and simply as the receiving end The bare clone exists for the kernel build tools and simply as the receiving end
of <filename>git push</filename> of <filename>git push</filename>
commands after you make edits and commits inside the copy of the clone. 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. a local branch created and checked out for your work.
This example uses <filename>common-pc-base</filename> as the local branch. This example uses <filename>common-pc-base</filename> as the local branch.
The following commands create and checkout the branch: The following commands create and checkout the branch:
<literallayout class='monospaced'> <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 $ 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. 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' Switched to a new branch 'common-pc-base'
@@ -287,7 +287,7 @@
<para> <para>
The file you change in this example is named <filename>calibrate.c</filename> 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>. (the copy of the bare clone) in <filename>init</filename>.
This example simply inserts several <filename>printk</filename> statements This example simply inserts several <filename>printk</filename> statements
at the beginning of the <filename>calibrate_delay</filename> function. at the beginning of the <filename>calibrate_delay</filename> function.
@@ -409,20 +409,20 @@
" "
</literallayout></para></listitem> </literallayout></para></listitem>
<listitem><para><emphasis>Identify Your Source Files</emphasis> - In the <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> <filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename>
directory, you need to identify the location of the directory, you need to identify the location of the
local source code, which in this example is the bare clone named 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 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. following statement.
Be sure to substitute your user information in the statement: Be sure to substitute your user information in the statement:
<literallayout class='monospaced'> <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> </literallayout></para></listitem>
<listitem><para><emphasis>Specify the Kernel Machine</emphasis> - Also in the <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: the kernel machine with the following statement:
<literallayout class='monospaced'> <literallayout class='monospaced'>
KMACHINE_qemux86 = "yocto/standard/common-pc/base" KMACHINE_qemux86 = "yocto/standard/common-pc/base"
@@ -438,7 +438,7 @@
comment out the <filename>COMPATIBLE_MACHINE</filename> statements in all comment out the <filename>COMPATIBLE_MACHINE</filename> statements in all
<filename>.bbappend</filename> files, or you should simply remove all the files <filename>.bbappend</filename> files, or you should simply remove all the files
except the one your are using for the build 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> </note>
</section> </section>
documentation/dev-manual/dev-manual-model.xml
+4 -2
View File
@@ -256,8 +256,10 @@
<itemizedlist> <itemizedlist>
<listitem><para><emphasis><filename>linux-yocto-2.6.34</filename></emphasis> - The <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> 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 <listitem><para><emphasis><filename>linux-yocto-2.6.37</filename></emphasis> - The
Linux Yocto kernel that is based on the Linux 2.6.37 release.</para></listitem> 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 <listitem><para><emphasis><filename>linux-yocto-dev</filename></emphasis> - A development
kernel based on the Linux 2.6.39-rc1 release.</para></listitem> 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 <listitem><para><emphasis><filename>linux-2.6</filename></emphasis> - A kernel based on
documentation/dev-manual/dev-manual-start.xml
+7 -7
View File
@@ -114,13 +114,13 @@
For simplicity, it is recommended that you create these structures outside of the For simplicity, it is recommended that you create these structures outside of the
Yocto Project files Git repository.</para> Yocto Project files Git repository.</para>
<para>As an example, the following transcript shows how to create the bare clone <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. that clone.
The bare clone is named <filename>linux-yocto-2.6.37.git</filename>, while the The bare clone is named <filename>linux-yocto-3.0.git</filename>, while the
copy is named <filename>linux-yocto-2.6.37</filename>: copy is named <filename>linux-yocto-3.0</filename>:
<literallayout class='monospaced'> <literallayout class='monospaced'>
$ git clone --bare git://git.yoctoproject.org/linux-yocto-2.6.37 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-2.6.37.git/ Initialized empty Git repository in /home/scottrif/poky/linux-yocto-3.0.git/
remote: Counting objects: 1886034, done. remote: Counting objects: 1886034, done.
remote: Compressing objects: 100% (314326/314326), done. remote: Compressing objects: 100% (314326/314326), done.
remote: Total 1886034 (delta 1570200), reused 1870337 (delta 1554798) remote: Total 1886034 (delta 1570200), reused 1870337 (delta 1554798)
@@ -129,8 +129,8 @@
</literallayout></para> </literallayout></para>
<para>Now create a clone of the bare clone just created: <para>Now create a clone of the bare clone just created:
<literallayout class='monospaced'> <literallayout class='monospaced'>
$ git clone linux-yocto-2.6.37.git linux-yocto-2.6.37 $ git clone linux-yocto-3.0.git linux-yocto-3.0
Initialized empty Git repository in /home/scottrif/poky/linux-yocto-2.6.37/.git/ Initialized empty Git repository in /home/scottrif/poky/linux-yocto-3.0/.git/
Checking out files: 100% (35188/35188), done. Checking out files: 100% (35188/35188), done.
</literallayout></para></listitem> </literallayout></para></listitem>
<listitem id='poky-extras-repo'><para><emphasis> <listitem id='poky-extras-repo'><para><emphasis>