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/ref-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/ref-manual')
-rw-r--r-- | documentation/ref-manual/closer-look.xml | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | documentation/ref-manual/figures/user-configuration.png | bin | 23687 -> 74109 bytes | |||
-rw-r--r-- | documentation/ref-manual/ref-structure.xml | 20 | ||||
-rw-r--r-- | documentation/ref-manual/ref-variables.xml | 16 |
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 @@ | |||
73 | </para> | 73 | </para> |
74 | 74 | ||
75 | <para> | 75 | <para> |
76 | <imagedata fileref="figures/user-configuration.png" align="center" width="5.5in" depth="3.5in" /> | 76 | <imagedata fileref="figures/user-configuration.png" align="center" /> |
77 | </para> | 77 | </para> |
78 | 78 | ||
79 | <para> | 79 | <para> |
@@ -100,7 +100,7 @@ | |||
100 | </para> | 100 | </para> |
101 | 101 | ||
102 | <para> | 102 | <para> |
103 | The <filename>meta-yocto</filename> layer inside Poky contains | 103 | The <filename>meta-poky</filename> layer inside Poky contains |
104 | a <filename>conf</filename> directory that has example | 104 | a <filename>conf</filename> directory that has example |
105 | configuration files. | 105 | configuration files. |
106 | These example files are used as a basis for creating actual | 106 | These example files are used as a basis for creating actual |
@@ -158,7 +158,7 @@ | |||
158 | To see the default configurations in a <filename>local.conf</filename> | 158 | To see the default configurations in a <filename>local.conf</filename> |
159 | file created by the build environment script, see the | 159 | file created by the build environment script, see the |
160 | <filename>local.conf.sample</filename> in the | 160 | <filename>local.conf.sample</filename> in the |
161 | <filename>meta-yocto</filename> layer: | 161 | <filename>meta-poky</filename> layer: |
162 | <itemizedlist> | 162 | <itemizedlist> |
163 | <listitem><para><emphasis>Parallelism Options:</emphasis> | 163 | <listitem><para><emphasis>Parallelism Options:</emphasis> |
164 | Controlled by the | 164 | 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 @@ | |||
123 | </para> | 123 | </para> |
124 | </section> | 124 | </section> |
125 | 125 | ||
126 | <section id='structure-core-meta-yocto'> | 126 | <section id='structure-core-meta-poky'> |
127 | <title><filename>meta-yocto/</filename></title> | 127 | <title><filename>meta-poky/</filename></title> |
128 | 128 | ||
129 | <para> | 129 | <para> |
130 | This directory contains the configuration for the Poky | 130 | This directory contains the configuration for the Poky |
@@ -233,7 +233,7 @@ | |||
233 | </literallayout> | 233 | </literallayout> |
234 | The script gets its default list of common targets from the | 234 | The script gets its default list of common targets from the |
235 | <filename>conf-notes.txt</filename> file, which is found in the | 235 | <filename>conf-notes.txt</filename> file, which is found in the |
236 | <filename>meta-yocto</filename> directory within the | 236 | <filename>meta-poky</filename> directory within the |
237 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. | 237 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. |
238 | Should you have custom distributions, it is very easy to modify | 238 | Should you have custom distributions, it is very easy to modify |
239 | this configuration file to include your targets for your | 239 | this configuration file to include your targets for your |
@@ -260,7 +260,7 @@ | |||
260 | </literallayout> | 260 | </literallayout> |
261 | The OpenEmbedded build system uses the template configuration | 261 | The OpenEmbedded build system uses the template configuration |
262 | files, which are found by default in the | 262 | files, which are found by default in the |
263 | <filename>meta-yocto/conf</filename> directory in the | 263 | <filename>meta-poky/conf</filename> directory in the |
264 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. | 264 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. |
265 | See the | 265 | See the |
266 | "<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-custom-template-configuration-directory'>Creating a Custom Template Configuration Directory</ulink>" | 266 | "<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-custom-template-configuration-directory'>Creating a Custom Template Configuration Directory</ulink>" |
@@ -373,7 +373,7 @@ | |||
373 | </literallayout> | 373 | </literallayout> |
374 | The script gets its default list of common targets from the | 374 | The script gets its default list of common targets from the |
375 | <filename>conf-notes.txt</filename> file, which is found in the | 375 | <filename>conf-notes.txt</filename> file, which is found in the |
376 | <filename>meta-yocto</filename> directory within the | 376 | <filename>meta-poky</filename> directory within the |
377 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. | 377 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. |
378 | Should you have custom distributions, it is very easy to modify | 378 | Should you have custom distributions, it is very easy to modify |
379 | this configuration file to include your targets for your | 379 | this configuration file to include your targets for your |
@@ -409,7 +409,7 @@ | |||
409 | <para> | 409 | <para> |
410 | The OpenEmbedded build system uses the template configuration | 410 | The OpenEmbedded build system uses the template configuration |
411 | files, which are found by default in the | 411 | files, which are found by default in the |
412 | <filename>meta-yocto/conf</filename> directory in the | 412 | <filename>meta-poky/conf</filename> directory in the |
413 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. | 413 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. |
414 | See the | 414 | See the |
415 | "<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-custom-template-configuration-directory'>Creating a Custom Template Configuration Directory</ulink>" | 415 | "<ulink url='&YOCTO_DOCS_DEV_URL;#creating-a-custom-template-configuration-directory'>Creating a Custom Template Configuration Directory</ulink>" |
@@ -513,7 +513,7 @@ | |||
513 | <para> | 513 | <para> |
514 | The source <filename>local.conf.sample</filename> file used | 514 | The source <filename>local.conf.sample</filename> file used |
515 | depends on the <filename>$TEMPLATECONF</filename> script variable, | 515 | depends on the <filename>$TEMPLATECONF</filename> script variable, |
516 | which defaults to <filename>meta-yocto/conf</filename> | 516 | which defaults to <filename>meta-poky/conf</filename> |
517 | when you are building from the Yocto Project development | 517 | when you are building from the Yocto Project development |
518 | environment and defaults to <filename>meta/conf</filename> when | 518 | environment and defaults to <filename>meta/conf</filename> when |
519 | you are building from the OpenEmbedded Core environment. | 519 | you are building from the OpenEmbedded Core environment. |
@@ -536,7 +536,7 @@ | |||
536 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. | 536 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. |
537 | You can find the Yocto Project version of the | 537 | You can find the Yocto Project version of the |
538 | <filename>local.conf.sample</filename> file in the | 538 | <filename>local.conf.sample</filename> file in the |
539 | <filename>meta-yocto/conf</filename> directory. | 539 | <filename>meta-poky/conf</filename> directory. |
540 | </note> | 540 | </note> |
541 | </para> | 541 | </para> |
542 | </section> | 542 | </section> |
@@ -567,7 +567,7 @@ | |||
567 | <para> | 567 | <para> |
568 | The source <filename>bblayers.conf.sample</filename> file used | 568 | The source <filename>bblayers.conf.sample</filename> file used |
569 | depends on the <filename>$TEMPLATECONF</filename> script variable, | 569 | depends on the <filename>$TEMPLATECONF</filename> script variable, |
570 | which defaults to <filename>meta-yocto/conf</filename> | 570 | which defaults to <filename>meta-poky/conf</filename> |
571 | when you are building from the Yocto Project development | 571 | when you are building from the Yocto Project development |
572 | environment and defaults to <filename>meta/conf</filename> when | 572 | environment and defaults to <filename>meta/conf</filename> when |
573 | you are building from the OpenEmbedded Core environment. | 573 | you are building from the OpenEmbedded Core environment. |
@@ -588,7 +588,7 @@ | |||
588 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. | 588 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. |
589 | You can find the Yocto Project version of the | 589 | You can find the Yocto Project version of the |
590 | <filename>bblayers.conf.sample</filename> file in the | 590 | <filename>bblayers.conf.sample</filename> file in the |
591 | <filename>meta-yocto/conf</filename> directory. | 591 | <filename>meta-poky/conf</filename> directory. |
592 | </note> | 592 | </note> |
593 | </para> | 593 | </para> |
594 | </section> | 594 | </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 @@ | |||
1130 | <literallayout class='monospaced'> | 1130 | <literallayout class='monospaced'> |
1131 | BBLAYERS = " \ | 1131 | BBLAYERS = " \ |
1132 | /home/scottrif/poky/meta \ | 1132 | /home/scottrif/poky/meta \ |
1133 | /home/scottrif/poky/meta-yocto \ | 1133 | /home/scottrif/poky/meta-poky \ |
1134 | /home/scottrif/poky/meta-yocto-bsp \ | 1134 | /home/scottrif/poky/meta-yocto-bsp \ |
1135 | /home/scottrif/poky/meta-mykernel \ | 1135 | /home/scottrif/poky/meta-mykernel \ |
1136 | " | 1136 | " |
@@ -3112,7 +3112,7 @@ | |||
3112 | For example, the distribution configuration file for the | 3112 | For example, the distribution configuration file for the |
3113 | Poky distribution is named <filename>poky.conf</filename> | 3113 | Poky distribution is named <filename>poky.conf</filename> |
3114 | and resides in the | 3114 | and resides in the |
3115 | <filename>meta-yocto/conf/distro</filename> directory of | 3115 | <filename>meta-poky/conf/distro</filename> directory of |
3116 | the | 3116 | the |
3117 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. | 3117 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. |
3118 | </para> | 3118 | </para> |
@@ -6035,7 +6035,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
6035 | 6035 | ||
6036 | <para> | 6036 | <para> |
6037 | See the | 6037 | See the |
6038 | <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta-yocto/conf/local.conf.sample.extended'><filename>local.conf.sample.extended</filename></ulink> | 6038 | <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta-poky/conf/local.conf.sample.extended'><filename>local.conf.sample.extended</filename></ulink> |
6039 | file for additional information. | 6039 | file for additional information. |
6040 | You can also reference the | 6040 | You can also reference the |
6041 | <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta/classes/kernel.bbclass'><filename>kernel.bbclass</filename></ulink> | 6041 | <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" | |||
6089 | You cannot set the variable in a recipe file. | 6089 | You cannot set the variable in a recipe file. |
6090 | </note> | 6090 | </note> |
6091 | See the | 6091 | See the |
6092 | <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta-yocto/conf/local.conf.sample.extended'><filename>local.conf.sample.extended</filename></ulink> | 6092 | <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta-poky/conf/local.conf.sample.extended'><filename>local.conf.sample.extended</filename></ulink> |
6093 | file for additional information. | 6093 | file for additional information. |
6094 | </para> | 6094 | </para> |
6095 | </glossdef> | 6095 | </glossdef> |
@@ -7781,7 +7781,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
7781 | is "poky", the default value for | 7781 | is "poky", the default value for |
7782 | <filename>MIRRORS</filename> is defined in the | 7782 | <filename>MIRRORS</filename> is defined in the |
7783 | <filename>conf/distro/poky.conf</filename> file in the | 7783 | <filename>conf/distro/poky.conf</filename> file in the |
7784 | <filename>meta-yocto</filename> Git repository. | 7784 | <filename>meta-poky</filename> Git repository. |
7785 | </para> | 7785 | </para> |
7786 | </glossdef> | 7786 | </glossdef> |
7787 | </glossentry> | 7787 | </glossentry> |
@@ -9640,7 +9640,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
9640 | is "poky", the default value for | 9640 | is "poky", the default value for |
9641 | <filename>PREMIRRORS</filename> is defined in the | 9641 | <filename>PREMIRRORS</filename> is defined in the |
9642 | <filename>conf/distro/poky.conf</filename> file in the | 9642 | <filename>conf/distro/poky.conf</filename> file in the |
9643 | <filename>meta-yocto</filename> Git repository. | 9643 | <filename>meta-poky</filename> Git repository. |
9644 | </para> | 9644 | </para> |
9645 | 9645 | ||
9646 | <para> | 9646 | <para> |
@@ -11126,7 +11126,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
11126 | <!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> | 11126 | <!-- <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> --> |
11127 | Specifies the version of the SDK. | 11127 | Specifies the version of the SDK. |
11128 | The distribution configuration file (e.g. | 11128 | The distribution configuration file (e.g. |
11129 | <filename>/meta-yocto/conf/distro/poky.conf</filename>) | 11129 | <filename>/meta-poky/conf/distro/poky.conf</filename>) |
11130 | defines the <filename>SDK_VERSION</filename> as follows: | 11130 | defines the <filename>SDK_VERSION</filename> as follows: |
11131 | <literallayout class='monospaced'> | 11131 | <literallayout class='monospaced'> |
11132 | SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" | 11132 | 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" | |||
14345 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" | 14345 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" |
14346 | </literallayout> | 14346 | </literallayout> |
14347 | For more information, see | 14347 | For more information, see |
14348 | <filename>meta-yocto/conf/local.conf.sample</filename> in | 14348 | <filename>meta-poky/conf/local.conf.sample</filename> in |
14349 | the | 14349 | the |
14350 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. | 14350 | <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>. |
14351 | </para> | 14351 | </para> |