summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorRoland Hieber <rhi@pengutronix.de>2023-09-22 12:00:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-25 14:37:26 +0100
commit653ac666c430c37c32df1b9e633c68214003e85c (patch)
treed14c6a66f8d5ae64d2f714a0ed34359ffd56678d /documentation
parentbb440f76a9349a5bb8d434fcad13df626b2a21a0 (diff)
downloadpoky-653ac666c430c37c32df1b9e633c68214003e85c.tar.gz
contributor-guide: recipe-style-guide: add more patch tagging examples
(From yocto-docs rev: a2904fd3ccdcb1d7232adce51966749cb1e3cb92) Signed-off-by: Roland Hieber <rhi@pengutronix.de> Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/contributor-guide/recipe-style-guide.rst21
1 files changed, 20 insertions, 1 deletions
diff --git a/documentation/contributor-guide/recipe-style-guide.rst b/documentation/contributor-guide/recipe-style-guide.rst
index b63172bd77..7906e5e5d9 100644
--- a/documentation/contributor-guide/recipe-style-guide.rst
+++ b/documentation/contributor-guide/recipe-style-guide.rst
@@ -336,7 +336,10 @@ the status should be changed to ``Submitted [where]``, and an additional
336``Signed-off-by:`` line should be added to the patch by the person claiming 336``Signed-off-by:`` line should be added to the patch by the person claiming
337responsibility for upstreaming. 337responsibility for upstreaming.
338 338
339For example, if the patch has been submitted upstream:: 339Examples
340--------
341
342Here's an example of a patch that has been submitted upstream::
340 343
341 rpm: Adjusted the foo setting in bar 344 rpm: Adjusted the foo setting in bar
342 345
@@ -351,3 +354,19 @@ For example, if the patch has been submitted upstream::
351 354
352A future update can change the value to ``Accepted`` or ``Denied`` as 355A future update can change the value to ``Accepted`` or ``Denied`` as
353appropriate. 356appropriate.
357
358Another example of a patch that is specific to OpenEmbedded::
359
360 Do not treat warnings as errors
361
362 There are additional warnings found with musl which are
363 treated as errors and fails the build, we have more combinations
364 than upstream supports to handle.
365
366 Upstream-Status: Inappropriate [oe specific]
367
368Here's a patch that has been backported from an upstream commit::
369
370 include missing sys/file.h for LOCK_EX
371
372 Upstream-Status: Backport [https://github.com/systemd/systemd/commit/ac8db36cbc26694ee94beecc8dca208ec4b5fd45]