diff options
author | Paul Barker <pbarker@konsulko.com> | 2020-11-23 18:02:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-24 09:07:27 +0000 |
commit | 715ad8daf9c2ffe652bdce3b90517ad1074dd2cd (patch) | |
tree | 3fa2769f885f162e223587825b32ee43daca310e /documentation/dev-manual/dev-manual-common-tasks.rst | |
parent | 66e11989c0dc686d5a8eed04cce44bf6b738708f (diff) | |
download | poky-715ad8daf9c2ffe652bdce3b90517ad1074dd2cd.tar.gz |
dev-manual-common-tasks: Fix refs to testing branches
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>
Diffstat (limited to 'documentation/dev-manual/dev-manual-common-tasks.rst')
-rw-r--r-- | documentation/dev-manual/dev-manual-common-tasks.rst | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.rst b/documentation/dev-manual/dev-manual-common-tasks.rst index 201e187c30..e2957f479a 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.rst +++ b/documentation/dev-manual/dev-manual-common-tasks.rst | |||
@@ -10666,18 +10666,27 @@ to a contribution repository that is upstream. See the ":ref:`gs-git-workflows-a | |||
10666 | section in the Yocto Project Overview and Concepts Manual for additional | 10666 | section in the Yocto Project Overview and Concepts Manual for additional |
10667 | concepts on working in the Yocto Project development environment. | 10667 | concepts on working in the Yocto Project development environment. |
10668 | 10668 | ||
10669 | Two commonly used testing repositories exist for OpenEmbedded-Core: | 10669 | Maintainers commonly use ``-next`` branches to test submissions prior to |
10670 | 10670 | merging patches. Thus, you can get an idea of the status of a patch based on | |
10671 | - *"ross/mut" branch:* The "mut" (master-under-test) tree exists in the | 10671 | whether the patch has been merged into one of these branches. The commonly |
10672 | ``poky-contrib`` repository in the | 10672 | used testing branches for OpenEmbedded-Core are as follows: |
10673 | :yocto_git:`Yocto Project source repositories <>`. | 10673 | |
10674 | 10674 | - *openembedded-core "master-next" branch:* This branch is part of the | |
10675 | - *"master-next" branch:* This branch is part of the main "poky" | 10675 | :oe_git:`openembedded-core </openembedded-core/>` repository and contains |
10676 | repository in the Yocto Project source repositories. | 10676 | proposed changes to the core metadata. |
10677 | 10677 | ||
10678 | Maintainers use these branches to test submissions prior to merging | 10678 | - *poky "master-next" branch:* This branch is part of the |
10679 | patches. Thus, you can get an idea of the status of a patch based on | 10679 | :yocto_git:`poky </cgit/cgit.cgi/poky/>` repository and combines proposed |
10680 | whether the patch has been merged into one of these branches. | 10680 | changes to bitbake, the core metadata and the poky distro. |
10681 | |||
10682 | Similarly, stable branches maintained by the project may have corresponding | ||
10683 | ``-next`` branches which collect proposed changes. For example, | ||
10684 | ``&DISTRO_NAME_NO_CAP;-next`` and ``&DISTRO_NAME_NO_CAP_MINUS_ONE;-next`` | ||
10685 | branches in both the "openembdedded-core" and "poky" repositories. | ||
10686 | |||
10687 | Other layers may have similar testing branches but there is no formal | ||
10688 | requirement or standard for these so please check the documentation for the | ||
10689 | layers you are contributing to. | ||
10681 | 10690 | ||
10682 | .. note:: | 10691 | .. note:: |
10683 | 10692 | ||