summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/bsp-guide/bsp.xml4
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml22
-rw-r--r--documentation/dev-manual/dev-manual-newbie.xml6
-rwxr-xr-x[-rw-r--r--]documentation/mega-manual/figures/user-configuration.pngbin23687 -> 74109 bytes
-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
-rw-r--r--documentation/toaster-manual/toaster-manual-reference.xml32
-rw-r--r--documentation/toaster-manual/toaster-manual-setup-and-use.xml2
10 files changed, 54 insertions, 54 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 9ac72991f6..b0562c7d4d 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -110,7 +110,7 @@
110 <literallayout class='monospaced'> 110 <literallayout class='monospaced'>
111 BBLAYERS ?= " \ 111 BBLAYERS ?= " \
112 /usr/local/src/yocto/meta \ 112 /usr/local/src/yocto/meta \
113 /usr/local/src/yocto/meta-yocto \ 113 /usr/local/src/yocto/meta-poky \
114 /usr/local/src/yocto/meta-yocto-bsp \ 114 /usr/local/src/yocto/meta-yocto-bsp \
115 /usr/local/src/yocto/meta-mylayer \ 115 /usr/local/src/yocto/meta-mylayer \
116 " 116 "
@@ -1536,7 +1536,7 @@
1536 <literallayout class='monospaced'> 1536 <literallayout class='monospaced'>
1537 BBLAYERS = ? " \ 1537 BBLAYERS = ? " \
1538 /usr/local/src/yocto/meta \ 1538 /usr/local/src/yocto/meta \
1539 /usr/local/src/yocto/meta-yocto \ 1539 /usr/local/src/yocto/meta-poky \
1540 /usr/local/src/yocto/meta-yocto-bsp \ 1540 /usr/local/src/yocto/meta-yocto-bsp \
1541 /usr/local/src/yocto/meta-myarm \ 1541 /usr/local/src/yocto/meta-myarm \
1542 " 1542 "
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
diff --git a/documentation/mega-manual/figures/user-configuration.png b/documentation/mega-manual/figures/user-configuration.png
index f2b3f8e7fe..c298401fc3 100644..100755
--- a/documentation/mega-manual/figures/user-configuration.png
+++ b/documentation/mega-manual/figures/user-configuration.png
Binary files differ
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>
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml
index cb27107143..3a46b61b73 100644
--- a/documentation/toaster-manual/toaster-manual-reference.xml
+++ b/documentation/toaster-manual/toaster-manual-reference.xml
@@ -172,9 +172,9 @@
172 <listitem><para> 172 <listitem><para>
173 The first version of the file is found in the 173 The first version of the file is found in the
174 <filename>conf</filename> directory of the 174 <filename>conf</filename> directory of the
175 <filename>meta-yocto</filename> layer 175 <filename>meta-poky</filename> layer
176 (i.e. 176 (i.e.
177 <filename>meta-yocto/conf/toasterconf.json</filename>). 177 <filename>meta-poky/conf/toasterconf.json</filename>).
178 This version contains the default Yocto Project 178 This version contains the default Yocto Project
179 configuration for Toaster. 179 configuration for Toaster.
180 </para></listitem> 180 </para></listitem>
@@ -214,10 +214,10 @@
214 "dirpath": "meta" 214 "dirpath": "meta"
215 }, 215 },
216 { 216 {
217 "name": "meta-yocto", 217 "name": "meta-poky",
218 "local_path": "meta-yocto", 218 "local_path": "meta-poky",
219 "vcs_url": "remote:origin", 219 "vcs_url": "remote:origin",
220 "dirpath": "meta-yocto" 220 "dirpath": "meta-poky"
221 }, 221 },
222 { 222 {
223 "name": "meta-yocto-bsp", 223 "name": "meta-yocto-bsp",
@@ -293,10 +293,10 @@
293 <filename>toasterconf.json</filename> file you just edited. 293 <filename>toasterconf.json</filename> file you just edited.
294 For example, if you cloned the 294 For example, if you cloned the
295 <filename>poky</filename> repository and you edited the 295 <filename>poky</filename> repository and you edited the
296 <filename>meta-yocto/conf/toasterconf.json</filename> file, 296 <filename>meta-poky/conf/toasterconf.json</filename> file,
297 you would type something like the following: 297 you would type something like the following:
298 <literallayout class='monospaced'> 298 <literallayout class='monospaced'>
299 $ bitbake/lib/toaster/manage.py loadconf /home/scottrif/poky/meta-yocto/conf/toasterconf.json 299 $ bitbake/lib/toaster/manage.py loadconf /home/scottrif/poky/meta-poky/conf/toasterconf.json
300 </literallayout> 300 </literallayout>
301 After entering this command, you need to update the 301 After entering this command, you need to update the
302 Toaster database with the information coming from your 302 Toaster database with the information coming from your
@@ -575,9 +575,9 @@
575 <itemizedlist> 575 <itemizedlist>
576 <listitem><para> 576 <listitem><para>
577 The 577 The
578 <filename>meta-yocto/conf/toasterconf.json</filename> 578 <filename>meta-poky/conf/toasterconf.json</filename>
579 in the <filename>conf</filename> directory of the 579 in the <filename>conf</filename> directory of the
580 Yocto Project's <filename>meta-yocto</filename> layer. 580 Yocto Project's <filename>meta-poky</filename> layer.
581 This version contains the default Yocto Project 581 This version contains the default Yocto Project
582 configuration for Toaster. 582 configuration for Toaster.
583 You are prompted to select this file during the Toaster 583 You are prompted to select this file during the Toaster
@@ -698,10 +698,10 @@
698 "dirpath": "meta" 698 "dirpath": "meta"
699 }, 699 },
700 { 700 {
701 "name": "meta-yocto", 701 "name": "meta-poky",
702 "local_path": "meta-yocto", 702 "local_path": "meta-poky",
703 "vcs_url": "remote:origin", 703 "vcs_url": "remote:origin",
704 "dirpath": "meta-yocto" 704 "dirpath": "meta-poky"
705 }, 705 },
706 { 706 {
707 "name": "meta-yocto-bsp", 707 "name": "meta-yocto-bsp",
@@ -817,7 +817,7 @@
817 "description": "Yocto Project master", 817 "description": "Yocto Project master",
818 "bitbake": "master", 818 "bitbake": "master",
819 "branch": "master", 819 "branch": "master",
820 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], 820 "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
821 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, 821 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
822 "helptext": "Toaster will run your builds using the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\"&gt;Yocto Project master branch&lt;/a&gt;, where active development takes place. This is not a stable branch, so your builds might not work as expected." 822 "helptext": "Toaster will run your builds using the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\"&gt;Yocto Project master branch&lt;/a&gt;, where active development takes place. This is not a stable branch, so your builds might not work as expected."
823 }, 823 },
@@ -826,7 +826,7 @@
826 "description": "Yocto Project 2.0 Jethro", 826 "description": "Yocto Project 2.0 Jethro",
827 "bitbake": "jethro", 827 "bitbake": "jethro",
828 "branch": "jethro", 828 "branch": "jethro",
829 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], 829 "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
830 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, 830 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
831 "helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\"&gt;Yocto Project 2.0 \"Jethro\"&lt;/a&gt; branch." 831 "helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\"&gt;Yocto Project 2.0 \"Jethro\"&lt;/a&gt; branch."
832 }, 832 },
@@ -835,7 +835,7 @@
835 "description": "Yocto Project 1.8 Fido", 835 "description": "Yocto Project 1.8 Fido",
836 "bitbake": "fido", 836 "bitbake": "fido",
837 "branch": "fido", 837 "branch": "fido",
838 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], 838 "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
839 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, 839 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
840 "helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\"&gt;Yocto Project 1.8 \"Fido\"&lt;/a&gt; branch." 840 "helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\"&gt;Yocto Project 1.8 \"Fido\"&lt;/a&gt; branch."
841 }, 841 },
@@ -844,7 +844,7 @@
844 "description": "Local Yocto Project", 844 "description": "Local Yocto Project",
845 "bitbake": "HEAD", 845 "bitbake": "HEAD",
846 "branch": "HEAD", 846 "branch": "HEAD",
847 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], 847 "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
848 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, 848 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
849 "helptext": "Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer." 849 "helptext": "Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer."
850 } 850 }
diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/documentation/toaster-manual/toaster-manual-setup-and-use.xml
index e8fb168ce8..963b211223 100644
--- a/documentation/toaster-manual/toaster-manual-setup-and-use.xml
+++ b/documentation/toaster-manual/toaster-manual-setup-and-use.xml
@@ -316,7 +316,7 @@
316 $ cd /var/www/toaster/poky/ 316 $ cd /var/www/toaster/poky/
317 $ ./bitbake/lib/toaster/manage.py syncdb 317 $ ./bitbake/lib/toaster/manage.py syncdb
318 $ ./bitbake/lib/toaster/manage.py migrate 318 $ ./bitbake/lib/toaster/manage.py migrate
319 $ TOASTER_DIR=`pwd` TOASTER_CONF=./meta-yocto/conf/toasterconf.json ./bitbake/lib/toaster/manage.py checksettings 319 $ TOASTER_DIR=`pwd` TOASTER_CONF=./meta-poky/conf/toasterconf.json ./bitbake/lib/toaster/manage.py checksettings
320 $ ./bitbake/lib/toaster/manage.py collectstatic 320 $ ./bitbake/lib/toaster/manage.py collectstatic
321 </literallayout> 321 </literallayout>
322 </para> 322 </para>