Re: [docs] [PATCH] doc/bitbake-user-manual-ref-variables: extend the MIRRORS documentation

Hi Antonin,

On 6/1/26 3:21 PM, Antonin Godard via lists.yoctoproject.org wrote:
> The MIRRORS variable wasn't properly documented as Ross highlighted in
> bug 16297. Give it a proper description detailing its usage and which
> keywords are available. Also link PREMIRRORS to MIRRORS as they use the
> same syntax.
> 

Quick drive-by comment.

> [YOCTO #16297]
> 
> Signed-off-by: Antonin Godard <[email protected]>
> ---
>   .../bitbake-user-manual-ref-variables.rst          | 56 ++++++++++++++++++++++
>   1 file changed, 56 insertions(+)
> 
> diff --git a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
> index 9824b58ef27..753e9a38f90 100644
> --- a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
> +++ b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
> @@ -1416,6 +1416,58 @@ overview of their function and contents.
>         upstream source, and then locations specified by :term:`MIRRORS` in that
>         order.
>   
> +      This variable has a specific syntax. Each line must contain a regular
> +      expression matching the original source URL on the leftmost part and a
> +      replacement URL for it on the rightmost part. For example::
> +

Leftmost and rightmost are confusing here. This is a space separated 
list which is expected to have an even number of elements as it contains 
a list of pairs (themselves separated by a space).

Note that the code handles newlines in MIRROR (see mirror_from_string in 
lib/bb/fetch2/__init__.py).

> +         MIRRORS:prepend = " \
> +             git://git.openembedded.org/.* git:///mirrors/openembedded/BASENAME \
> +         "
> +
> +      In the above example:
> +
> +      -  The leftmost part means that any Git repository (``git://`` fetcher)
> +         whose URL starts with ``git.openembedded.org/`` will be matched.
> +
> +      -  The rightmost part is the replacement URL for the original repository,
> +         which is hosted locally in the ``/mirrors/openembedded`` directory. It
> +         also uses the ``BASENAME`` keyword which is detailed below.
> +

This is mostly fine as it visually is leftmost/rightmost verbatim.

> +      The rightmost part of each line can contain keywords which are
> +      automatically replaced by BitBake. These keywords can contain either a
> +      sub-part of the original URL or meta-information about it.
> +
> +      For what follows, let's take the following URL as an example for the
> +      original source (matched by the leftmost part of the line):
> +      ``git://git.openembedded.org/project/repo.git``.
> +
> +      A replacement for this URL can be created using the following keywords:
> +
> +      -  ``TYPE``: the URL scheme or fetcher type. For the example above: ``git``.
> +      -  ``HOST``: the URL host. For the example above: ``git.openembedded.org``.
> +      -  ``PATH``: the URL path. For the example above: ``/project/repo.git``.
> +      -  ``BASENAME``: the URL basename. For the example above: ``repo.git``.
> +      -  ``MIRRORNAME``: a translation of the host and path with common
> +         characters substituted to dots (``.``). For the example above:
> +         ``git.openembedded.org.project.repo.git``.
> +
> +      The rightmost part of the line can also be a bare URL that uses no special
> +      keywords (usually ``https://`` or ``file://``). For example::
> +
> +         MIRRORS:prepend = " \
> +             git://git.openembedded.org/.* file:///mirrors/openembedded/ \
> +         "
> +
> +      In the above example, the fetcher will try to find a mirror tarball in the
> +      ``/mirrors/openembedded`` directory. The name of this tarball should follow
> +      the name of the tarball created by BitBake (for Git repositories,
> +      the :term:`BB_GENERATE_MIRROR_TARBALLS` variable must be set to "1" to
> +      generate them).
> +
> +      If we take ``git://git.openembedded.org/project/repo.git`` as an example,
> +      the tarball would have to be named
> +      ``git2_git.openembedded.org.project.repo.git.tar.gz``.
> +
>      :term:`OVERRIDES`
>         A colon-separated list that BitBake uses to control what variables are
>         overridden after BitBake parses recipes and configuration files.
> @@ -1544,6 +1596,10 @@ overview of their function and contents.
>         use ``file://`` URLs to point to local directories or network shares as
>         well.
>   
> +      The syntax of the :term:`PREMIRRORS` variable is the same as
> +      :term:`MIRRORS`. See the definition of the :term:`MIRRORS` for more
> +      details on it.
> +

s/on it//

It's implied.

Cheers,
Quentin