diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2016-04-15 07:30:40 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-18 16:28:24 +0100 |
commit | e975d26e84100ccd4c7fd675d29304f8d5bdfbcc (patch) | |
tree | aba10105b82f994e1b6d7d72b9749a9e5b75fdfa /documentation/dev-manual | |
parent | 84452ee325c6a9e01d6b09f2defbcd480ca51390 (diff) | |
download | poky-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/dev-manual')
-rw-r--r-- | documentation/dev-manual/dev-manual-common-tasks.xml | 22 | ||||
-rw-r--r-- | documentation/dev-manual/dev-manual-newbie.xml | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index 00cad99599..927dcf021b 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml | |||
@@ -72,7 +72,7 @@ | |||
72 | <filename>meta</filename>, | 72 | <filename>meta</filename>, |
73 | <filename>meta-skeleton</filename>, | 73 | <filename>meta-skeleton</filename>, |
74 | <filename>meta-selftest</filename>, | 74 | <filename>meta-selftest</filename>, |
75 | <filename>meta-yocto</filename>, and | 75 | <filename>meta-poky</filename>, and |
76 | <filename>meta-yocto-bsp</filename>. | 76 | <filename>meta-yocto-bsp</filename>. |
77 | Each of these folders represents a distinct layer. | 77 | Each of these folders represents a distinct layer. |
78 | </para> | 78 | </para> |
@@ -165,12 +165,12 @@ | |||
165 | directory to the | 165 | directory to the |
166 | <filename>BBPATH</filename>. | 166 | <filename>BBPATH</filename>. |
167 | On the other hand, distro layers, such as | 167 | On the other hand, distro layers, such as |
168 | <filename>meta-yocto</filename>, can choose | 168 | <filename>meta-poky</filename>, can choose |
169 | to enforce their own precedence over | 169 | to enforce their own precedence over |
170 | <filename>BBPATH</filename>. | 170 | <filename>BBPATH</filename>. |
171 | For an example of that syntax, see the | 171 | For an example of that syntax, see the |
172 | <filename>layer.conf</filename> file for | 172 | <filename>layer.conf</filename> file for |
173 | the <filename>meta-yocto</filename> layer. | 173 | the <filename>meta-poky</filename> layer. |
174 | </note></para></listitem> | 174 | </note></para></listitem> |
175 | <listitem><para>The recipes for the layers are | 175 | <listitem><para>The recipes for the layers are |
176 | appended to | 176 | appended to |
@@ -444,7 +444,7 @@ | |||
444 | 444 | ||
445 | BBLAYERS ?= " \ | 445 | BBLAYERS ?= " \ |
446 | $HOME/poky/meta \ | 446 | $HOME/poky/meta \ |
447 | $HOME/poky/meta-yocto \ | 447 | $HOME/poky/meta-poky \ |
448 | $HOME/poky/meta-yocto-bsp \ | 448 | $HOME/poky/meta-yocto-bsp \ |
449 | $HOME/poky/meta-mylayer \ | 449 | $HOME/poky/meta-mylayer \ |
450 | " | 450 | " |
@@ -870,7 +870,7 @@ | |||
870 | <literallayout class='monospaced'> | 870 | <literallayout class='monospaced'> |
871 | BBLAYERS = ?" \ | 871 | BBLAYERS = ?" \ |
872 | /usr/local/src/yocto/meta \ | 872 | /usr/local/src/yocto/meta \ |
873 | /usr/local/src/yocto/meta-yocto \ | 873 | /usr/local/src/yocto/meta-poky \ |
874 | /usr/local/src/yocto/meta-yocto-bsp \ | 874 | /usr/local/src/yocto/meta-yocto-bsp \ |
875 | /usr/local/src/yocto/meta-mylayer \ | 875 | /usr/local/src/yocto/meta-mylayer \ |
876 | " | 876 | " |
@@ -5511,14 +5511,14 @@ | |||
5511 | <filename>poky/build/conf</filename> directory needs to have the path to your local | 5511 | <filename>poky/build/conf</filename> directory needs to have the path to your local |
5512 | <filename>meta-mylayer</filename> layer. | 5512 | <filename>meta-mylayer</filename> layer. |
5513 | By default, the <filename>BBLAYERS</filename> variable contains paths to | 5513 | By default, the <filename>BBLAYERS</filename> variable contains paths to |
5514 | <filename>meta</filename>, <filename>meta-yocto</filename>, and | 5514 | <filename>meta</filename>, <filename>meta-poky</filename>, and |
5515 | <filename>meta-yocto-bsp</filename> in the | 5515 | <filename>meta-yocto-bsp</filename> in the |
5516 | <filename>poky</filename> Git repository. | 5516 | <filename>poky</filename> Git repository. |
5517 | Add the path to your <filename>meta-mylayer</filename> location: | 5517 | Add the path to your <filename>meta-mylayer</filename> location: |
5518 | <literallayout class='monospaced'> | 5518 | <literallayout class='monospaced'> |
5519 | BBLAYERS ?= " \ | 5519 | BBLAYERS ?= " \ |
5520 | $HOME/poky/meta \ | 5520 | $HOME/poky/meta \ |
5521 | $HOME/poky/meta-yocto \ | 5521 | $HOME/poky/meta-poky \ |
5522 | $HOME/poky/meta-yocto-bsp \ | 5522 | $HOME/poky/meta-yocto-bsp \ |
5523 | $HOME/poky/meta-mylayer \ | 5523 | $HOME/poky/meta-mylayer \ |
5524 | " | 5524 | " |
@@ -5987,7 +5987,7 @@ | |||
5987 | By default, <filename>TEMPLATECONF</filename> is set as | 5987 | By default, <filename>TEMPLATECONF</filename> is set as |
5988 | follows in the <filename>poky</filename> repository: | 5988 | follows in the <filename>poky</filename> repository: |
5989 | <literallayout class='monospaced'> | 5989 | <literallayout class='monospaced'> |
5990 | TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf} | 5990 | TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf} |
5991 | </literallayout> | 5991 | </literallayout> |
5992 | This is the directory used by the build system to find templates | 5992 | This is the directory used by the build system to find templates |
5993 | from which to build some key configuration files. | 5993 | from which to build some key configuration files. |
@@ -6039,7 +6039,7 @@ | |||
6039 | <para> | 6039 | <para> |
6040 | Aside from the <filename>*.sample</filename> configuration files, | 6040 | Aside from the <filename>*.sample</filename> configuration files, |
6041 | the <filename>conf-notes.txt</filename> also resides in the | 6041 | the <filename>conf-notes.txt</filename> also resides in the |
6042 | default <filename>meta-yocto/conf</filename> directory. | 6042 | default <filename>meta-poky/conf</filename> directory. |
6043 | The scripts that set up the build environment | 6043 | The scripts that set up the build environment |
6044 | (i.e. | 6044 | (i.e. |
6045 | <ulink url="&YOCTO_DOCS_REF_URL;#structure-core-script"><filename>&OE_INIT_FILE;</filename></ulink> | 6045 | <ulink url="&YOCTO_DOCS_REF_URL;#structure-core-script"><filename>&OE_INIT_FILE;</filename></ulink> |
@@ -10215,7 +10215,7 @@ | |||
10215 | </literallayout> | 10215 | </literallayout> |
10216 | One thing a development organization might want to consider | 10216 | One thing a development organization might want to consider |
10217 | for end-user convenience is to modify | 10217 | for end-user convenience is to modify |
10218 | <filename>meta-yocto/conf/bblayers.conf.sample</filename> to | 10218 | <filename>meta-poky/conf/bblayers.conf.sample</filename> to |
10219 | ensure that when the end user utilizes the released build | 10219 | ensure that when the end user utilizes the released build |
10220 | system to build an image, the development organization's | 10220 | system to build an image, the development organization's |
10221 | layers are included in the <filename>bblayers.conf</filename> | 10221 | layers are included in the <filename>bblayers.conf</filename> |
@@ -10230,7 +10230,7 @@ | |||
10230 | 10230 | ||
10231 | BBLAYERS ?= " \ | 10231 | BBLAYERS ?= " \ |
10232 | ##OEROOT##/meta \ | 10232 | ##OEROOT##/meta \ |
10233 | ##OEROOT##/meta-yocto \ | 10233 | ##OEROOT##/meta-poky \ |
10234 | ##OEROOT##/meta-yocto-bsp \ | 10234 | ##OEROOT##/meta-yocto-bsp \ |
10235 | ##OEROOT##/meta-mylayer \ | 10235 | ##OEROOT##/meta-mylayer \ |
10236 | " | 10236 | " |
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index 6d4092f02c..75c992f16b 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml | |||
@@ -603,7 +603,7 @@ | |||
603 | the | 603 | the |
604 | <link linkend='build-directory'>Build Directory</link> | 604 | <link linkend='build-directory'>Build Directory</link> |
605 | contains user-defined variables that affect every build. | 605 | contains user-defined variables that affect every build. |
606 | The <filename>meta-yocto/conf/distro/poky.conf</filename> | 606 | The <filename>meta-poky/conf/distro/poky.conf</filename> |
607 | configuration file defines Yocto "distro" configuration | 607 | configuration file defines Yocto "distro" configuration |
608 | variables used only when building with this policy. | 608 | variables used only when building with this policy. |
609 | Machine configuration files, which | 609 | Machine configuration files, which |
@@ -1404,7 +1404,7 @@ | |||
1404 | Examine the <filename>maintainers.inc</filename> file, which is | 1404 | Examine the <filename>maintainers.inc</filename> file, which is |
1405 | located in the | 1405 | located in the |
1406 | <link linkend='source-directory'>Source Directory</link> | 1406 | <link linkend='source-directory'>Source Directory</link> |
1407 | at <filename>meta-yocto/conf/distro/include</filename>, to | 1407 | at <filename>meta-poky/conf/distro/include</filename>, to |
1408 | see who is responsible for code. | 1408 | see who is responsible for code. |
1409 | </para></listitem> | 1409 | </para></listitem> |
1410 | <listitem><para><emphasis>Board Support Package (BSP) README Files:</emphasis> | 1410 | <listitem><para><emphasis>Board Support Package (BSP) README Files:</emphasis> |
@@ -1448,7 +1448,7 @@ | |||
1448 | <listitem><para>For changes to BitBake (anything under the <filename>bitbake</filename> | 1448 | <listitem><para>For changes to BitBake (anything under the <filename>bitbake</filename> |
1449 | directory), send your patch to the | 1449 | directory), send your patch to the |
1450 | <ulink url='&OE_LISTS_URL;/listinfo/bitbake-devel'>bitbake-devel</ulink> mailing list.</para></listitem> | 1450 | <ulink url='&OE_LISTS_URL;/listinfo/bitbake-devel'>bitbake-devel</ulink> mailing list.</para></listitem> |
1451 | <listitem><para>For changes to <filename>meta-yocto</filename>, send your patch to the | 1451 | <listitem><para>For changes to <filename>meta-poky</filename>, send your patch to the |
1452 | <ulink url='&YOCTO_LISTS_URL;/listinfo/poky'>poky</ulink> mailing list.</para></listitem> | 1452 | <ulink url='&YOCTO_LISTS_URL;/listinfo/poky'>poky</ulink> mailing list.</para></listitem> |
1453 | <listitem><para>For changes to other layers hosted on | 1453 | <listitem><para>For changes to other layers hosted on |
1454 | <filename>yoctoproject.org</filename> (unless the | 1454 | <filename>yoctoproject.org</filename> (unless the |