mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

documentation: Replacements for "1.1" and "edison", etc.

Browse Source 
I did a quick and dirty scrub over the manuals for the strings
"1.1" and "edison".  I found some instances that were not properly
variablized.  Also, discovered some references to the
linux-yocto-3.0-1.1.x.  All but one instance of this needed changed
to linux-yocto-3.2.

(From yocto-docs rev: 620fb4b7626defcefc8a039de09ae4599ee7f454)

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
2012-04-23 14:41:10 -06:00
committed by Richard Purdie
parent 946c650a47
commit 9a548f0ee4
7 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/adt-manual/adt-eclipse.xml
+1 -1
View File
@@ -324,7 +324,7 @@
</para></listitem> </para></listitem>
<listitem><para><emphasis>Point to the Toolchain:</emphasis> <listitem><para><emphasis>Point to the Toolchain:</emphasis>
If you are using a stand-alone pre-built toolchain, you should be pointing to the If you are using a stand-alone pre-built toolchain, you should be pointing to the
<filename>/opt/poky/1.1</filename> directory. <filename>&YOCTO_ADTPATH_DIR;</filename> directory.
This is the location for toolchains installed by the ADT Installer or by hand. This is the location for toolchains installed by the ADT Installer or by hand.
Sections "<link linkend='configuring-and-running-the-adt-installer-script'>Configuring Sections "<link linkend='configuring-and-running-the-adt-installer-script'>Configuring
and Running the ADT Installer Script</link>" and and Running the ADT Installer Script</link>" and
documentation/dev-manual/dev-manual-bsp-appendix.xml
+10 -10
View File
@@ -43,7 +43,7 @@
$ git clone git://git.yoctoproject.org/poky $ git clone git://git.yoctoproject.org/poky
$ cd poky $ cd poky
</literallayout> </literallayout>
Alternatively, you can start with the downloaded Poky "edison" tarball. Alternatively, you can start with the downloaded Poky "&DISTRO_NAME;" tarball.
These commands unpack the tarball into a Yocto Project File directory structure. These commands unpack the tarball into a Yocto Project File directory structure.
By default, the top-level directory of the file structure is named By default, the top-level directory of the file structure is named
<filename>poky-&YOCTO_POKY;</filename>: <filename>poky-&YOCTO_POKY;</filename>:
@@ -54,7 +54,7 @@
<note><para>If you're using the tarball method, you can ignore all the following steps that <note><para>If you're using the tarball method, you can ignore all the following steps that
ask you to carry out Git operations. ask you to carry out Git operations.
You already have the results of those operations You already have the results of those operations
in the form of the edison release tarballs. in the form of the &DISTRO_NAME; release tarballs.
Consequently, there is nothing left to do other than extract those tarballs into the Consequently, there is nothing left to do other than extract those tarballs into the
proper locations.</para> proper locations.</para>
@@ -160,7 +160,7 @@
$ cd meta-intel $ cd meta-intel
</literallayout> </literallayout>
Alternatively, you can start with the downloaded Crown Bay tarball. Alternatively, you can start with the downloaded Crown Bay tarball.
You can download the edison version of the BSP tarball from the You can download the &DISTRO_NAME; version of the BSP tarball from the
<ulink url='&YOCTO_HOME_URL;/download'>Download</ulink> page of the <ulink url='&YOCTO_HOME_URL;/download'>Download</ulink> page of the
Yocto Project website. Yocto Project website.
Here is the specific link for the tarball needed for this example: Here is the specific link for the tarball needed for this example:
@@ -177,7 +177,7 @@
The <filename>meta-intel</filename> directory contains all the metadata The <filename>meta-intel</filename> directory contains all the metadata
that supports BSP creation. that supports BSP creation.
If you're using the Git method, the following If you're using the Git method, the following
step will switch to the edison metadata. step will switch to the &DISTRO_NAME; metadata.
If you're using the tarball method, you already have the correct metadata and can If you're using the tarball method, you already have the correct metadata and can
skip to the next step. skip to the next step.
Because <filename>meta-intel</filename> is its own Git repository, you will want Because <filename>meta-intel</filename> is its own Git repository, you will want
@@ -445,11 +445,11 @@
and insert the commit identifiers to identify the kernel in which we and insert the commit identifiers to identify the kernel in which we
are interested, which will be based on the <filename>atom-pc-standard</filename> are interested, which will be based on the <filename>atom-pc-standard</filename>
kernel. kernel.
In this case, because we're working with the edison branch of everything, we In this case, because we're working with the &DISTRO_NAME; branch of everything, we
need to use the <filename>SRCREV</filename> values for the atom-pc branch need to use the <filename>SRCREV</filename> values for the atom-pc branch
that are associated with the edison release. that are associated with the &DISTRO_NAME; release.
To find those values, we need to find the <filename>SRCREV</filename> To find those values, we need to find the <filename>SRCREV</filename>
values that edison uses for the atom-pc branch, which we find in the values that &DISTRO_NAME; uses for the atom-pc branch, which we find in the
<filename>poky/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend</filename> <filename>poky/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend</filename>
file. file.
</para> </para>
@@ -474,8 +474,8 @@
<para> <para>
In this example, we're using the <filename>SRCREV</filename> values we In this example, we're using the <filename>SRCREV</filename> values we
found already captured in the edison release because we're creating a BSP based on found already captured in the &DISTRO_NAME; release because we're creating a BSP based on
edison. &DISTRO_NAME;.
If, instead, we had based our BSP on the master branches, we would want to use If, instead, we had based our BSP on the master branches, we would want to use
the most recent <filename>SRCREV</filename> values taken directly from the kernel repo. the most recent <filename>SRCREV</filename> values taken directly from the kernel repo.
We will not be doing that for this example. We will not be doing that for this example.
@@ -682,7 +682,7 @@
</para> </para>
<para> <para>
For reference, the sato image produced by the previous steps for edison For reference, the sato image produced by the previous steps for &DISTRO_NAME;
should look like the following in terms of size. should look like the following in terms of size.
If your sato image is much different from this, If your sato image is much different from this,
you probably made a mistake in one of the above steps: you probably made a mistake in one of the above steps:
documentation/dev-manual/dev-manual-common-tasks.xml
+2 -2
View File
@@ -248,8 +248,8 @@
<para> <para>
Append files files must have the same name as the underlying recipe. Append files files must have the same name as the underlying recipe.
For example, the append file <filename>someapp_1.1.bbappend</filename> must For example, the append file <filename>someapp_&DISTRO;.bbappend</filename> must
apply to <filename>someapp_1.1.bb</filename>. apply to <filename>someapp_&DISTRO;.bb</filename>.
This means the original recipe and append file names are version number specific. This means the original recipe and append file names are version number specific.
If the underlying recipe is renamed to update to a newer version, the If the underlying recipe is renamed to update to a newer version, the
corresponding <filename>.bbappend</filename> file must be renamed as well. corresponding <filename>.bbappend</filename> file must be renamed as well.
documentation/dev-manual/dev-manual-kernel-appendix.xml
+14 -14
View File
@@ -155,13 +155,13 @@
$ git branch -a $ git branch -a
$ git tag -l $ git tag -l
</literallayout> </literallayout>
This example uses the Yocto Project 1.1 Release code named "edison", This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;",
which maps to the <filename>edison</filename> branch in the repository. which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository.
The following commands create and checkout the local <filename>edison</filename> The following commands create and checkout the local <filename>&DISTRO_NAME;</filename>
branch: branch:
<literallayout class='monospaced'> <literallayout class='monospaced'>
$ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
Branch edison set up to track remote branch &DISTRO_NAME; from origin. Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin.
Switched to a new branch '&DISTRO_NAME;' Switched to a new branch '&DISTRO_NAME;'
</literallayout> </literallayout>
</para> </para>
@@ -184,7 +184,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-3.0-1.1.x</filename> kernel. This example modifies the <filename>linux-yocto-3.2</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
@@ -196,12 +196,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>my-linux-yocto-3.0-1.1.x-work</filename> in this example) has to have The copy (<filename>my-linux-yocto-3.2-work</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 ~/my-linux-yocto-3.0-1.1.x-work $ cd ~/my-linux-yocto-3.2-work
$ 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 Branch common-pc-base set up to track remote branch
yocto/standard/common-pc/base from origin. yocto/standard/common-pc/base from origin.
@@ -296,7 +296,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>my-linux-yocto-3.0-1.1.x-work</filename> Git repository and is located in the <filename>my-linux-yocto-3.2-work</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.
@@ -420,13 +420,13 @@
<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-3.0-1.1.x.git</filename>. <filename>linux-yocto-3.2.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-3.0-1.1.x.git</filename> Git repository by adding the local <filename>linux-yocto-3.2.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-3.0-1.1.x.git KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.2.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_3.0.bbappend</filename> file, you need to specify <filename>linux-yocto_3.0.bbappend</filename> file, you need to specify
@@ -545,13 +545,13 @@
$ git branch -a $ git branch -a
$ git tag -l $ git tag -l
</literallayout> </literallayout>
This example uses the Yocto Project 1.1.1 Release code named "&DISTRO_NAME;", This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;",
which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository. which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository.
The following commands create and checkout the local <filename>&DISTRO_NAME;</filename> The following commands create and checkout the local <filename>&DISTRO_NAME;</filename>
branch: branch:
<literallayout class='monospaced'> <literallayout class='monospaced'>
$ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
Branch edison set up to track remote branch &DISTRO_NAME; from origin. Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin.
Switched to a new branch '&DISTRO_NAME;' Switched to a new branch '&DISTRO_NAME;'
</literallayout> </literallayout>
</para> </para>
@@ -654,7 +654,7 @@
<para> <para>
After setting up the environment to run <filename>menuconfig</filename>, you are ready After setting up the environment to run <filename>menuconfig</filename>, you are ready
to use the tool to interactively change the kernel configuration. 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-1.1.x</filename> In this example, we are basing our changes on the <filename>linux-yocto-3.2</filename>
kernel. kernel.
The Yocto Project build environment recognizes this kernel as The Yocto Project build environment recognizes this kernel as
<filename>linux-yocto</filename>. <filename>linux-yocto</filename>.
documentation/dev-manual/dev-manual-model.xml
+3
View File
@@ -247,6 +247,9 @@
<listitem><para><emphasis><filename>linux-yocto-3.0-1.1.x</filename></emphasis> - The <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 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> is based on the Linux 3.0 release</para></listitem>
<listitem><para><emphasis><filename>linux-yocto-3.2</filename></emphasis> - The
stable Linux Yocto kernel to use with the Yocto Project Release 1.2. This kernel
is based on the Linux 3.2 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 latest upstream release candidate available.</para></listitem> kernel based on the latest upstream release candidate available.</para></listitem>
</itemizedlist> </itemizedlist>
documentation/dev-manual/dev-manual-newbie.xml
+2 -1
View File
@@ -494,7 +494,8 @@
Git uses "branches" to organize different development efforts. Git uses "branches" to organize different development efforts.
For example, the <filename>poky</filename> repository has For example, the <filename>poky</filename> repository has
<filename>laverne</filename>, <filename>bernard</filename>, <filename>laverne</filename>, <filename>bernard</filename>,
<filename>edison</filename>, and <filename>master</filename> branches among <filename>edison</filename>, <filename>denzil</filename> and
<filename>master</filename> branches among
others. others.
You can see all the branches by going to You can see all the branches by going to
<ulink url='&YOCTO_GIT_URL;/cgit.cgi/poky/'></ulink> and <ulink url='&YOCTO_GIT_URL;/cgit.cgi/poky/'></ulink> and
documentation/dev-manual/dev-manual-start.xml
+7 -7
View File
@@ -132,18 +132,18 @@
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-3.0-1.1.x</filename> kernel and then create a copy of of the <filename>linux-yocto-3.2</filename> kernel and then create a copy of
that clone. that clone.
<note>When you have a local Linux Yocto kernel Git repository, you can <note>When you have a local Linux Yocto kernel Git repository, you can
reference that repository rather than the upstream Git repository as reference that repository rather than the upstream Git repository as
part of the <filename>clone</filename> command. part of the <filename>clone</filename> command.
Doing so can speed up the process.</note></para> Doing so can speed up the process.</note></para>
<para>In the following example, the bare clone is named <para>In the following example, the bare clone is named
<filename>linux-yocto-3.0-1.1.x.git</filename>, while the <filename>linux-yocto-3.2.git</filename>, while the
copy is named <filename>my-linux-yocto-3.0-1.1.x-work</filename>: copy is named <filename>my-linux-yocto-3.2-work</filename>:
<literallayout class='monospaced'> <literallayout class='monospaced'>
$ git clone --bare git://git.yoctoproject.org/linux-yocto-3.0-1.1.x linux-yocto-3.0-1.1.x.git $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.2 linux-yocto-3.2.git
Initialized empty Git repository in /home/scottrif/linux-yocto-3.0-1.1.x.git/ Initialized empty Git repository in /home/scottrif/linux-yocto-3.2.git/
remote: Counting objects: 2259181, done. remote: Counting objects: 2259181, done.
remote: Compressing objects: 100% (373259/373259), done. remote: Compressing objects: 100% (373259/373259), done.
remote: Total 2259181 (delta 1892638), reused 2231556 (delta 1865300) remote: Total 2259181 (delta 1892638), reused 2231556 (delta 1865300)
@@ -152,8 +152,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-3.0-1.1.x.git my-linux-yocto-3.0-1.1.x-work $ git clone linux-yocto-3.2.git my-linux-yocto-3.2-work
Initialized empty Git repository in /home/scottrif/my-linux-yocto-3.0-1.1.x/.git/ Initialized empty Git repository in /home/scottrif/my-linux-yocto-3.2/.git/
Checking out files: 100% (36898/36898), done. Checking out files: 100% (36898/36898), done.
</literallayout></para></listitem> </literallayout></para></listitem>
<listitem id='poky-extras-repo'><para><emphasis> <listitem id='poky-extras-repo'><para><emphasis>