public inbox for docs@lists.yoctoproject.org
 help / color / mirror / Atom feed
From: "Antonin Godard" <antonin.godard@bootlin.com>
To: <alex.kanavin@gmail.com>, <docs@lists.yoctoproject.org>
Cc: "Alexander Kanavin" <alex@linutronix.de>
Subject: Re: [docs] [PATCH] ref-manual: correctly document the difference between auto.conf and newly added toolcfg.conf
Date: Mon, 06 Oct 2025 18:14:49 +0200	[thread overview]
Message-ID: <DDBDFWFF5Q1P.3I70CPJOP6EO1@bootlin.com> (raw)
In-Reply-To: <20251006134757.36206-1-alex@linutronix.de>

On Mon Oct 6, 2025 at 3:47 PM CEST, Alexander Kanavin via lists.yoctoproject.org wrote:
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  documentation/ref-manual/fragments.rst |  4 ++--
>  documentation/ref-manual/structure.rst | 15 ++++++++++++---
>  2 files changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/documentation/ref-manual/fragments.rst b/documentation/ref-manual/fragments.rst
> index c0118876c..7fd08656d 100644
> --- a/documentation/ref-manual/fragments.rst
> +++ b/documentation/ref-manual/fragments.rst
> @@ -94,7 +94,7 @@ Note that in this case, the fragment will be defined twice in
>  :term:`OE_FRAGMENTS`, and the last value is taken into account:
>  
>  .. code-block::
> -   :caption: build/conf/auto.conf
> +   :caption: build/conf/toolcfg.conf
>  
>     OE_FRAGMENTS += " ... machine/qemuarm64 machine/qemux86-64"
>  
> @@ -103,7 +103,7 @@ In the above example, the value of :term:`MACHINE` is thus equal to
>  
>  When a fragment is enabled with :ref:`ref-bitbake-config-build-enable-fragment`,
>  its name is automatically appended to the :term:`OE_FRAGMENTS` variable in
> -:ref:`structure-build-conf-auto.conf`.
> +:ref:`structure-build-conf-toolcfg.conf`.
>  
>  .. note::
>  
> diff --git a/documentation/ref-manual/structure.rst b/documentation/ref-manual/structure.rst
> index 1aaafcf79..0ef51fa4f 100644
> --- a/documentation/ref-manual/structure.rst
> +++ b/documentation/ref-manual/structure.rst
> @@ -356,15 +356,24 @@ This configuration file is generated by :doc:`bblock </dev-manual/bblock>` and
>  contains the signatures locked by ``bblock``. By default, it does not exist
>  and will be created upon the first invocation of ``bblock``.
>  
> -.. _structure-build-conf-auto.conf:
> +.. _structure-build-conf-toolcfg.conf:
>  
> -``build/conf/auto.conf``
> -------------------------
> +``build/conf/toolcfg.conf``
> +---------------------------
>  
>  This file contains configuration variables that are automatically modified by
>  tools such as :oe_git:`bitbake-config-build </bitbake/tree/bin/bitbake-config-build>`.
>  This file should not be modified manually.
>  
> +.. _structure-build-conf-auto.conf:
> +
> +``build/conf/auto.conf``
> +------------------------
> +
> +This file is intended for use by continuous integration environments, such as the
> +Yocto Project's autobuilder. It should not be created or modified when running
> +local builds.
> +
>  .. _structure-build-downloads:
>  
>  ``build/downloads/``

We also need to update the auto.conf reference in the fragments documentation.
Do you want to send a patch?

But otherwise this change looks good to me, thank you!

Antonin

-- 
Antonin Godard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com



  reply	other threads:[~2025-10-06 16:15 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-06 13:47 [PATCH] ref-manual: correctly document the difference between auto.conf and newly added toolcfg.conf Alexander Kanavin
2025-10-06 16:14 ` Antonin Godard [this message]
2025-10-06 16:27   ` [docs] " Alexander Kanavin
2025-10-07  7:12     ` Antonin Godard
2025-10-15 11:45 ` Antonin Godard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DDBDFWFF5Q1P.3I70CPJOP6EO1@bootlin.com \
    --to=antonin.godard@bootlin.com \
    --cc=alex.kanavin@gmail.com \
    --cc=alex@linutronix.de \
    --cc=docs@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox