aboutsummaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-04-15 07:30:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-18 16:28:24 +0100
commite975d26e84100ccd4c7fd675d29304f8d5bdfbcc (patch)
treeaba10105b82f994e1b6d7d72b9749a9e5b75fdfa /documentation/ref-manual
parent84452ee325c6a9e01d6b09f2defbcd480ca51390 (diff)
downloadopenembedded-core-contrib-e975d26e84100ccd4c7fd675d29304f8d5bdfbcc.tar.gz
documentation: Converted "meta-yocto" to "meta-poky"
Occurrences in many manuals and one figure. (From yocto-docs rev: 26d30cd162083c62216fb4ab526d0b231f453de1) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual')
-rw-r--r--documentation/ref-manual/closer-look.xml6
-rwxr-xr-x[-rw-r--r--]documentation/ref-manual/figures/user-configuration.pngbin23687 -> 74109 bytes
-rw-r--r--documentation/ref-manual/ref-structure.xml20
-rw-r--r--documentation/ref-manual/ref-variables.xml16
4 files changed, 21 insertions, 21 deletions
diff --git a/documentation/ref-manual/closer-look.xml b/documentation/ref-manual/closer-look.xml
index 42b99980a3..84ff584bad 100644
--- a/documentation/ref-manual/closer-look.xml
+++ b/documentation/ref-manual/closer-look.xml
@@ -73,7 +73,7 @@
</para>
<para>
- <imagedata fileref="figures/user-configuration.png" align="center" width="5.5in" depth="3.5in" />
+ <imagedata fileref="figures/user-configuration.png" align="center" />
</para>
<para>
@@ -100,7 +100,7 @@
</para>
<para>
- The <filename>meta-yocto</filename> layer inside Poky contains
+ The <filename>meta-poky</filename> layer inside Poky contains
a <filename>conf</filename> directory that has example
configuration files.
These example files are used as a basis for creating actual
@@ -158,7 +158,7 @@
To see the default configurations in a <filename>local.conf</filename>
file created by the build environment script, see the
<filename>local.conf.sample</filename> in the
- <filename>meta-yocto</filename> layer:
+ <filename>meta-poky</filename> layer:
<itemizedlist>
<listitem><para><emphasis>Parallelism Options:</emphasis>
Controlled by the
diff --git a/documentation/ref-manual/figures/user-configuration.png b/documentation/ref-manual/figures/user-configuration.png
index f2b3f8e7fe..c298401fc3 100644..100755
--- a/documentation/ref-manual/figures/user-configuration.png
+++ b/documentation/ref-manual/figures/user-configuration.png
Binary files differ
diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml
index a0b36f034b..e51ceb1bf5 100644
--- a/documentation/ref-manual/ref-structure.xml
+++ b/documentation/ref-manual/ref-structure.xml
@@ -123,8 +123,8 @@
</para>
</section>
- <section id='structure-core-meta-yocto'>
- <title><filename>meta-yocto/</filename></title>
+ <section id='structure-core-meta-poky'>
+ <title><filename>meta-poky/</filename></title>
<para>
This directory contains the configuration for the Poky
@@ -233,7 +233,7 @@
</literallayout>
The script gets its default list of common targets from the
<filename>conf-notes.txt</filename> file, which is found in the
- <filename>meta-yocto</filename> directory within the
+ <filename>meta-poky</filename> directory within the
<ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>.
Should you have custom distributions, it is very easy to modify
this configuration file to include your targets for your
@@ -260,7 +260,7 @@
</literallayout>
The OpenEmbedded build system uses the template configuration
files, which are found by default in the
- <filename>meta-yocto/conf</filename> directory in the
+ <filename>meta-poky/conf</filename> directory in the
<ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>.
See the
"<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-custom-template-configuration-directory'>Creating a Custom Template Configuration Directory</ulink>"
@@ -373,7 +373,7 @@
</literallayout>
The script gets its default list of common targets from the
<filename>conf-notes.txt</filename> file, which is found in the
- <filename>meta-yocto</filename> directory within the
+ <filename>meta-poky</filename> directory within the
<ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>.
Should you have custom distributions, it is very easy to modify
this configuration file to include your targets for your
@@ -409,7 +409,7 @@
<para>
The OpenEmbedded build system uses the template configuration
files, which are found by default in the
- <filename>meta-yocto/conf</filename> directory in the
+ <filename>meta-poky/conf</filename> directory in the
<ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>.
See the
"<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-custom-template-configuration-directory'>Creating a Custom Template Configuration Directory</ulink>"
@@ -513,7 +513,7 @@
<para>
The source <filename>local.conf.sample</filename> file used
depends on the <filename>$TEMPLATECONF</filename> script variable,
- which defaults to <filename>meta-yocto/conf</filename>
+ which defaults to <filename>meta-poky/conf</filename>
when you are building from the Yocto Project development
environment and defaults to <filename>meta/conf</filename> when
you are building from the OpenEmbedded Core environment.
@@ -536,7 +536,7 @@
<ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>.
You can find the Yocto Project version of the
<filename>local.conf.sample</filename> file in the
- <filename>meta-yocto/conf</filename> directory.
+ <filename>meta-poky/conf</filename> directory.
</note>
</para>
</section>
@@ -567,7 +567,7 @@
<para>
The source <filename>bblayers.conf.sample</filename> file used
depends on the <filename>$TEMPLATECONF</filename> script variable,
- which defaults to <filename>meta-yocto/conf</filename>
+ which defaults to <filename>meta-poky/conf</filename>
when you are building from the Yocto Project development
environment and defaults to <filename>meta/conf</filename> when
you are building from the OpenEmbedded Core environment.
@@ -588,7 +588,7 @@
<ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>.
You can find the Yocto Project version of the
<filename>bblayers.conf.sample</filename> file in the
- <filename>meta-yocto/conf</filename> directory.
+ <filename>meta-poky/conf</filename> directory.
</note>
</para>
</section>
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 3e0c151415..244f68a3f7 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -1130,7 +1130,7 @@
<literallayout class='monospaced'>
BBLAYERS = " \
/home/scottrif/poky/meta \
- /home/scottrif/poky/meta-yocto \
+ /home/scottrif/poky/meta-poky \
/home/scottrif/poky/meta-yocto-bsp \
/home/scottrif/poky/meta-mykernel \
"
@@ -3112,7 +3112,7 @@
For example, the distribution configuration file for the
Poky distribution is named <filename>poky.conf</filename>
and resides in the
- <filename>meta-yocto/conf/distro</filename> directory of
+ <filename>meta-poky/conf/distro</filename> directory of
the
<ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>.
</para>
@@ -6035,7 +6035,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
<para>
See the
- <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta-yocto/conf/local.conf.sample.extended'><filename>local.conf.sample.extended</filename></ulink>
+ <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta-poky/conf/local.conf.sample.extended'><filename>local.conf.sample.extended</filename></ulink>
file for additional information.
You can also reference the
<ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta/classes/kernel.bbclass'><filename>kernel.bbclass</filename></ulink>
@@ -6089,7 +6089,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
You cannot set the variable in a recipe file.
</note>
See the
- <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta-yocto/conf/local.conf.sample.extended'><filename>local.conf.sample.extended</filename></ulink>
+ <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta-poky/conf/local.conf.sample.extended'><filename>local.conf.sample.extended</filename></ulink>
file for additional information.
</para>
</glossdef>
@@ -7781,7 +7781,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
is "poky", the default value for
<filename>MIRRORS</filename> is defined in the
<filename>conf/distro/poky.conf</filename> file in the
- <filename>meta-yocto</filename> Git repository.
+ <filename>meta-poky</filename> Git repository.
</para>
</glossdef>
</glossentry>
@@ -9640,7 +9640,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
is "poky", the default value for
<filename>PREMIRRORS</filename> is defined in the
<filename>conf/distro/poky.conf</filename> file in the
- <filename>meta-yocto</filename> Git repository.
+ <filename>meta-poky</filename> Git repository.
</para>
<para>
@@ -11126,7 +11126,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
<!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> -->
Specifies the version of the SDK.
The distribution configuration file (e.g.
- <filename>/meta-yocto/conf/distro/poky.conf</filename>)
+ <filename>/meta-poky/conf/distro/poky.conf</filename>)
defines the <filename>SDK_VERSION</filename> as follows:
<literallayout class='monospaced'>
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
@@ -14345,7 +14345,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
USER_CLASSES ?= "buildstats image-mklibs image-prelink"
</literallayout>
For more information, see
- <filename>meta-yocto/conf/local.conf.sample</filename> in
+ <filename>meta-poky/conf/local.conf.sample</filename> in
the
<ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>.
</para>