mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-05 08:02:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

dev-manual-common-tasks: Fix refs to testing branches

Browse Source 
After discussions on IRC with Ross we concluded that the `ross/mut`
branch shouldn't really be listed in the docs as it's more of a personal
test branch. Instead we should list the -next branches for
openembedded-core and poky.

(From yocto-docs rev: a6bb1f7b677ea0b540735497fbbbda64ce3653ce)

Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Barker
2020-11-23 18:02:13 +00:00
committed by Richard Purdie
parent 66e11989c0
commit 715ad8daf9
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
documentation/dev-manual/dev-manual-common-tasks.rst
View File

@@ -10666,18 +10666,27 @@ to a contribution repository that is upstream. See the ":ref:`gs-git-workflows-a
section in the Yocto Project Overview and Concepts Manual for additional
concepts on working in the Yocto Project development environment.
Two commonly used testing repositories exist for OpenEmbedded-Core:
Maintainers commonly use ``-next`` branches to test submissions prior to
merging patches. Thus, you can get an idea of the status of a patch based on
whether the patch has been merged into one of these branches. The commonly
used testing branches for OpenEmbedded-Core are as follows:
- *"ross/mut" branch:* The "mut" (master-under-test) tree exists in the
``poky-contrib`` repository in the
:yocto_git:`Yocto Project source repositories <>`.
- *openembedded-core "master-next" branch:* This branch is part of the
:oe_git:`openembedded-core </openembedded-core/>` repository and contains
proposed changes to the core metadata.
- *"master-next" branch:* This branch is part of the main "poky"
repository in the Yocto Project source repositories.
- *poky "master-next" branch:* This branch is part of the
:yocto_git:`poky </cgit/cgit.cgi/poky/>` repository and combines proposed
changes to bitbake, the core metadata and the poky distro.
Maintainers use these branches to test submissions prior to merging
patches. Thus, you can get an idea of the status of a patch based on
whether the patch has been merged into one of these branches.
Similarly, stable branches maintained by the project may have corresponding
``-next`` branches which collect proposed changes. For example,
``&DISTRO_NAME_NO_CAP;-next`` and ``&DISTRO_NAME_NO_CAP_MINUS_ONE;-next``
branches in both the "openembdedded-core" and "poky" repositories.
Other layers may have similar testing branches but there is no formal
requirement or standard for these so please check the documentation for the
layers you are contributing to.
.. note::