@@ -429,11 +429,7 @@ and then based on successful testing, merges them.
In general, each component (e.g. layer) should have a ``README`` file
that indicates where to send the changes and which process to follow.
-The "poky" repository, which is the Yocto Project's reference build
-environment, is a hybrid repository that contains several individual
-pieces (e.g. BitBake, Metadata, documentation, and so forth) built using
-the combo-layer tool. The upstream location used for submitting changes
-varies by component:
+The upstream location used for submitting changes varies by component:
- *Core Metadata:* Send your patches to the
:oe_lists:`openembedded-core </g/openembedded-core>`
@@ -620,7 +616,7 @@ have been followed:
methods to find out:
- *Maintenance File:* Examine the ``maintainers.inc`` file, which is
- located in the :term:`Source Directory` at
+ located in :term:`OpenEmbedded-Core (OE-Core)` at
``meta/conf/distro/include``, to see who is responsible for code.
- *Search by File:* Using :ref:`overview-manual/development-environment:git`, you can
@@ -645,9 +641,8 @@ have been followed:
The Yocto Project provides two scripts that conveniently let you
generate and send pull requests to the Yocto Project. These scripts
are ``create-pull-request`` and ``send-pull-request``. You can find
- these scripts in the ``scripts`` directory within the
- :term:`Source Directory` (e.g.
- ``poky/scripts``).
+ these scripts in the ``scripts`` directory within
+ :term:`OpenEmbedded-Core (OE-Core)`.
Using these scripts correctly formats the requests without
introducing any whitespace or HTML formatting. The maintainer that
@@ -660,7 +655,7 @@ have been followed:
directory into which you pushed the change, and provides a subject
line in the created patch files::
- $ poky/scripts/create-pull-request -u meta-intel-contrib -s "Updated Manual Section Reference in README"
+ $ ./scripts/create-pull-request -u meta-intel-contrib -s "Updated Manual Section Reference in README"
Running this script forms ``*.patch`` files in a folder named
``pull-``\ `PID` in the current directory. One of the patch files is a
@@ -673,7 +668,7 @@ have been followed:
and email address. In this example, the email address is a mailing
list::
- $ poky/scripts/send-pull-request -p ~/meta-intel/pull-10565 -t meta-intel@lists.yoctoproject.org
+ $ ./scripts/send-pull-request -p ~/meta-intel/pull-10565 -t meta-intel@lists.yoctoproject.org
You need to follow the prompts as the script is interactive.
@@ -682,8 +677,8 @@ have been followed:
For help on using these scripts, simply provide the ``-h``
argument as follows::
- $ poky/scripts/create-pull-request -h
- $ poky/scripts/send-pull-request -h
+ $ ./scripts/create-pull-request -h
+ $ ./scripts/send-pull-request -h
Submitting Changes to Stable Release Branches
=============================================
@@ -857,14 +852,14 @@ used testing branches for OpenEmbedded-Core are as follows:
:oe_git:`openembedded-core </openembedded-core/>` repository and contains
proposed changes to the core metadata.
-- *poky "master-next" branch:* This branch is part of the
- :yocto_git:`poky </poky/>` repository and combines proposed
- changes to BitBake, the core metadata and the poky distro.
+- *meta-yocto "master-next" branch:* This branch is part of the
+ :yocto_git:`meta-yocto </meta-yocto/>` repository and combines proposed
+ changes to meta-yocto.
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.
+branches in both the "openembedded-core" and "meta-yocto" 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
Remove references to the Poky repository, replace by OpenEmbedded-Core in most cases. Signed-off-by: Antonin Godard <antonin.godard@bootlin.com> --- documentation/contributor-guide/submit-changes.rst | 29 +++++++++------------- 1 file changed, 12 insertions(+), 17 deletions(-)