@@ -39,7 +39,7 @@ from ``.templateconf`` file that is read from the same directory as
``oe-init-build-env`` script. For the Poky reference distribution this
would be::
- TEMPLATECONF=${TEMPLATECONF:-meta-poky/conf/templates/default}
+ TEMPLATECONF=${TEMPLATECONF:-meta/conf/templates/default}
If you look at a configuration template directory, you will
see the ``bblayers.conf.sample``, ``local.conf.sample``, ``conf-summary.txt`` and
@@ -469,8 +469,8 @@ of the Yocto Project and layers used during your build. Archiving a Git
repository can be done with the :manpage:`git-archive <git-archive(1)>` command.
One thing a development organization might want to consider for end-user
-convenience is to modify
-``meta-poky/conf/templates/default/bblayers.conf.sample`` to ensure that when
+convenience is to provide its own version of the
+:oecore_path:`meta/conf/templates/default/bblayers.conf.sample` file 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 ``bblayers.conf`` file
automatically::
@@ -94,7 +94,7 @@ an entire Linux distribution, including the toolchain, from source.
.. code-block:: shell
- $ TEMPLATECONF=$PWD/layers/meta-yocto/meta-poky/conf/templates/default source ./layers/openembedded-core/oe-init-build-env
+ $ source ./layers/openembedded-core/oe-init-build-env
Among other things, the script creates the :term:`Build Directory`, which is
``build`` in this case and is located in the :term:`Source Directory`.
@@ -228,9 +228,8 @@ Directory` at the time you source the build environment setup script.
:term:`Configuration files <Configuration File>` provide many basic variables
that define a build environment. To show a list of possible variables to
configure from :term:`configuration files <Configuration File>`, see the
-:yocto_git:`local.conf.sample
-</meta-yocto/tree/meta-poky/conf/templates/default/local.conf.sample>` in the
-``meta-poky`` layer:
+:oecore_path:`local.conf.sample <meta/conf/templates/default/local.conf.sample>`
+file in :term:`OpenEmbedded-Core (OE-Core)`:
Here is a non-exhaustive list:
@@ -196,7 +196,7 @@ and ``all_proxy`` set as to standard shell environment variables to redirect
requests through proxy servers.
The Yocto Project also includes a
-``meta-poky/conf/templates/default/site.conf.sample`` file that shows
+:oecore_path:`meta/conf/templates/default/site.conf.sample` file that shows
how to configure a Git proxy server if needed.
.. note::
@@ -315,10 +315,10 @@ The :term:`OpenEmbedded Build System` can create the ``local.conf`` file from a
setup script :ref:`structure-core-script`.
The source ``local.conf.sample`` file used depends on the
-:term:`TEMPLATECONF` script variable, which defaults to ``layers/meta-yocto/meta-poky/conf/templates/default``
-when you are building from the Yocto Project development environment,
-and to ``layers/openembedded-core/meta/conf/templates/default`` when you are building from the OpenEmbedded-Core
-environment. Because the script variable points to the source of the
+:term:`TEMPLATECONF` script variable, which defaults to
+:oecore_path:`meta/conf/templates/default` in :term:`OpenEmbedded-Core
+(OE-Core)`.
+Because the script variable points to the source of the
``local.conf.sample`` file, this implies that you can configure your
build environment from any layer by setting the variable in the
top-level build environment setup script as follows::
@@ -334,8 +334,6 @@ file, it uses ``sed`` to substitute final
You can see how the :term:`TEMPLATECONF` variable is used by looking at the
``layers/openembedded-core/scripts/oe-setup-builddir`` script in :term:`OpenEmbedded-Core (OE-Core)`.
- You can find the :term:`Poky` version of the ``local.conf.sample`` file in
- the ``layers/meta-yocto/meta-poky/conf/templates/default`` directory.
.. _structure-build-conf-bblayers.conf:
@@ -354,9 +352,7 @@ when you ``source`` the top-level build environment setup script (i.e.
As with the :ref:`structure-build-conf-local.conf` file, the source ``bblayers.conf.sample``
file used depends on the :term:`TEMPLATECONF` script variable, which
-defaults to ``meta-poky/conf/templates/default`` when you are building using the
-:term:`Poky` reference distro, and to ``meta/conf/templates/default`` when you are
-building from the OpenEmbedded-Core environment (default). Because the script
+defaults to :oecore_path:`meta/conf/templates/default` . Because the script
variable points to the source of the ``bblayers.conf.sample`` file, this
implies that you can base your build from any layer by setting the
variable in the top-level build environment setup script as follows::
@@ -369,9 +365,7 @@ Once the build process gets the sample file, it uses ``sed`` to substitute final
.. note::
You can see how the :term:`TEMPLATECONF` variable is defined by the ``scripts/oe-setup-builddir``
- script in :term:`OpenEmbedded-Core (OE-Core)`. You can find the :term:`Poky`
- version of the ``bblayers.conf.sample`` file in the ``layers/meta-yocto/meta-poky/conf/templates/default``
- directory.
+ script in :term:`OpenEmbedded-Core (OE-Core)`.
.. _structure-build-conf-site.conf:
@@ -5050,7 +5050,7 @@ system and gives an overview of their function and contents.
configuration file. You cannot set the variable in a recipe file.
See the
- :yocto_git:`local.conf.sample.extended </meta-yocto/tree/meta-poky/conf/templates/default/local.conf.sample.extended>`
+ :oecore_path:`local.conf.sample.extended <meta/conf/templates/default/local.conf.sample.extended>`
file for additional information. Also, for information on creating an
:term:`Initramfs`, see the ":ref:`dev-manual/building:building an initial ram filesystem (Initramfs) image`" section
in the Yocto Project Development Tasks Manual.
The meta-poky's templates have been removed with [1]. They're intented to be replaced with the ones from OpenEmbedded-Core. Replace the occurences of these paths and replace accordingly. [1]: https://git.yoctoproject.org/meta-yocto/commit/meta-poky/conf?id=ac300baea7314ea3c80f2330b2a993f729f32150 Signed-off-by: Antonin Godard <antonin.godard@bootlin.com> --- .../custom-template-configuration-directory.rst | 2 +- documentation/dev-manual/licenses.rst | 4 ++-- documentation/dev-manual/poky-manual-setup.rst | 2 +- documentation/overview-manual/concepts.rst | 5 ++--- documentation/ref-manual/faq.rst | 2 +- documentation/ref-manual/structure.rst | 18 ++++++------------ documentation/ref-manual/variables.rst | 2 +- 7 files changed, 14 insertions(+), 21 deletions(-)