summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2023-09-12 19:18:45 +0200
committerSteve Sakoman <steve@sakoman.com>2023-09-23 05:26:16 -1000
commit593618f139c0cf3a917e2c2e3285f586b0541e87 (patch)
treec0768b58010d2faffdc467da53fcb05a24f7af9e
parentb17bb4e9c05d368734723135150e4e558e676762 (diff)
downloadpoky-593618f139c0cf3a917e2c2e3285f586b0541e87.tar.gz
contributor-guide: recipe-style-guide: add Upstream-Status
(From yocto-docs rev: 0618611fa049db2b9717cbe609c583a5bb16954e) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--documentation/contributor-guide/recipe-style-guide.rst81
1 files changed, 81 insertions, 0 deletions
diff --git a/documentation/contributor-guide/recipe-style-guide.rst b/documentation/contributor-guide/recipe-style-guide.rst
index a0d513e8e9..99105179a6 100644
--- a/documentation/contributor-guide/recipe-style-guide.rst
+++ b/documentation/contributor-guide/recipe-style-guide.rst
@@ -255,3 +255,84 @@ Tips and Guidelines for Writing Recipes
255- Use :term:`BBCLASSEXTEND` instead of creating separate recipes such as ``-native`` 255- Use :term:`BBCLASSEXTEND` instead of creating separate recipes such as ``-native``
256 and ``-nativesdk`` ones, whenever possible. This avoids having to maintain multiple 256 and ``-nativesdk`` ones, whenever possible. This avoids having to maintain multiple
257 recipe files at the same time. 257 recipe files at the same time.
258
259Patch Upstream Status
260=====================
261
262In order to keep track of patches applied by recipes and ultimately reduce the
263number of patches that need maintaining, the OpenEmbedded build system
264requires information about the upstream status of each patch.
265
266In its description, each patch should provide detailed information about the
267bug that it addresses, such as the URL in a bug tracking system and links
268to relevant mailing list archives.
269
270Then, you should also add an ``Upstream-Status:`` tag containing one of the
271following status strings:
272
273``Pending``
274 No determination has been made yet or not yet submitted to upstream.
275
276``Submitted [where]``
277 Submitted to upstream, waiting for approval. Optionally include where
278 it was submitted, such as the author, mailing list, etc.
279
280``Accepted``
281 Accepted in upstream, expect it to be removed at next update, include
282 expected version info.
283
284``Backport``
285 Backported from new upstream version, because we are at a fixed version,
286 include upstream version info.
287
288``Denied``
289 Not accepted by upstream, include reason in patch.
290
291``Inactive-Upstream [lastcommit: when (and/or) lastrelease: when]``
292 The upstream is no longer available. This typically means a defunct project
293 where no activity has happened for a long time --- measured in years. To make
294 that judgement, it is recommended to look at not only when the last release
295 happened, but also when the last commit happened, and whether newly made bug
296 reports and merge requests since that time receive no reaction. It is also
297 recommended to add to the patch description any relevant links where the
298 inactivity can be clearly seen.
299
300``Inappropriate [reason]``
301 The patch is not appropriate for upstream, include a brief reason on the
302 same line enclosed with ``[]``. The reason can be:
303
304 - ``not author`` (you are not the author and do not intend to upstream this,
305 the source must be listed in the comments)
306 - ``native``
307 - ``licensing``
308 - ``configuration``
309 - ``enable feature``
310 - ``disable feature``
311 - ``bugfix`` (add bug URL here)
312 - ``embedded specific``
313 - ``other`` (give details in comments)
314
315The various ``Inappropriate [reason]`` status items are meant to indicate that
316the person responsible for adding this patch to the system does not intend to
317upstream the patch for a specific reason.
318
319Of course, if another person later takes care of submitting this patch upstream,
320the status should be changed to ``Submitted [where]``, and an additional
321``Signed-off-by:`` line should be added to the patch by the person claiming
322responsibility for upstreaming.
323
324For example, if the patch has been submitted upstream::
325
326 rpm: Adjusted the foo setting in bar
327
328 [RPM Ticket #65] -- http://rpm5.org/cvs/tktview?tn=65,5
329
330 The foo setting in bar was decreased from X to X-50% in order to
331 ensure we don't exhaust all system memory with foobar threads.
332
333 Upstream-Status: Submitted [rpm5-devel@rpm5.org]
334
335 Signed-off-by: Joe Developer <joe.developer@example.com>
336
337A future update can change the value to ``Accepted`` or ``Denied`` as
338appropriate.