diff options
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 @@ <filename>meta</filename>, <filename>meta-skeleton</filename>, <filename>meta-selftest</filename>, - <filename>meta-yocto</filename>, and + <filename>meta-poky</filename>, and <filename>meta-yocto-bsp</filename>. Each of these folders represents a distinct layer. </para> @@ -165,12 +165,12 @@ directory to the <filename>BBPATH</filename>. On the other hand, distro layers, such as - <filename>meta-yocto</filename>, can choose + <filename>meta-poky</filename>, can choose to enforce their own precedence over <filename>BBPATH</filename>. For an example of that syntax, see the <filename>layer.conf</filename> file for - the <filename>meta-yocto</filename> layer. + the <filename>meta-poky</filename> layer. </note></para></listitem> <listitem><para>The recipes for the layers are appended to @@ -444,7 +444,7 @@ BBLAYERS ?= " \ $HOME/poky/meta \ - $HOME/poky/meta-yocto \ + $HOME/poky/meta-poky \ $HOME/poky/meta-yocto-bsp \ $HOME/poky/meta-mylayer \ " @@ -870,7 +870,7 @@ <literallayout class='monospaced'> BBLAYERS = ?" \ /usr/local/src/yocto/meta \ - /usr/local/src/yocto/meta-yocto \ + /usr/local/src/yocto/meta-poky \ /usr/local/src/yocto/meta-yocto-bsp \ /usr/local/src/yocto/meta-mylayer \ " @@ -5511,14 +5511,14 @@ <filename>poky/build/conf</filename> directory needs to have the path to your local <filename>meta-mylayer</filename> layer. By default, the <filename>BBLAYERS</filename> variable contains paths to - <filename>meta</filename>, <filename>meta-yocto</filename>, and + <filename>meta</filename>, <filename>meta-poky</filename>, and <filename>meta-yocto-bsp</filename> in the <filename>poky</filename> Git repository. Add the path to your <filename>meta-mylayer</filename> location: <literallayout class='monospaced'> BBLAYERS ?= " \ $HOME/poky/meta \ - $HOME/poky/meta-yocto \ + $HOME/poky/meta-poky \ $HOME/poky/meta-yocto-bsp \ $HOME/poky/meta-mylayer \ " @@ -5987,7 +5987,7 @@ By default, <filename>TEMPLATECONF</filename> is set as follows in the <filename>poky</filename> repository: <literallayout class='monospaced'> - TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf} + TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf} </literallayout> This is the directory used by the build system to find templates from which to build some key configuration files. @@ -6039,7 +6039,7 @@ <para> Aside from the <filename>*.sample</filename> configuration files, the <filename>conf-notes.txt</filename> also resides in the - default <filename>meta-yocto/conf</filename> directory. + default <filename>meta-poky/conf</filename> directory. The scripts that set up the build environment (i.e. <ulink url="&YOCTO_DOCS_REF_URL;#structure-core-script"><filename>&OE_INIT_FILE;</filename></ulink> @@ -10215,7 +10215,7 @@ </literallayout> One thing a development organization might want to consider for end-user convenience is to modify - <filename>meta-yocto/conf/bblayers.conf.sample</filename> to + <filename>meta-poky/conf/bblayers.conf.sample</filename> to ensure that when the end user utilizes the released build system to build an image, the development organization's layers are included in the <filename>bblayers.conf</filename> @@ -10230,7 +10230,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta \ - ##OEROOT##/meta-yocto \ + ##OEROOT##/meta-poky \ ##OEROOT##/meta-yocto-bsp \ ##OEROOT##/meta-mylayer \ " 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 @@ the <link linkend='build-directory'>Build Directory</link> contains user-defined variables that affect every build. - The <filename>meta-yocto/conf/distro/poky.conf</filename> + The <filename>meta-poky/conf/distro/poky.conf</filename> configuration file defines Yocto "distro" configuration variables used only when building with this policy. Machine configuration files, which @@ -1404,7 +1404,7 @@ Examine the <filename>maintainers.inc</filename> file, which is located in the <link linkend='source-directory'>Source Directory</link> - at <filename>meta-yocto/conf/distro/include</filename>, to + at <filename>meta-poky/conf/distro/include</filename>, to see who is responsible for code. </para></listitem> <listitem><para><emphasis>Board Support Package (BSP) README Files:</emphasis> @@ -1448,7 +1448,7 @@ <listitem><para>For changes to BitBake (anything under the <filename>bitbake</filename> directory), send your patch to the <ulink url='&OE_LISTS_URL;/listinfo/bitbake-devel'>bitbake-devel</ulink> mailing list.</para></listitem> - <listitem><para>For changes to <filename>meta-yocto</filename>, send your patch to the + <listitem><para>For changes to <filename>meta-poky</filename>, send your patch to the <ulink url='&YOCTO_LISTS_URL;/listinfo/poky'>poky</ulink> mailing list.</para></listitem> <listitem><para>For changes to other layers hosted on <filename>yoctoproject.org</filename> (unless the |