diff options
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/contributor-guide/recipe-style-guide.rst | 21 |
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 |
337 | responsibility for upstreaming. | 337 | responsibility for upstreaming. |
338 | 338 | ||
339 | For example, if the patch has been submitted upstream:: | 339 | Examples |
340 | -------- | ||
341 | |||
342 | Here'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 | ||
352 | A future update can change the value to ``Accepted`` or ``Denied`` as | 355 | A future update can change the value to ``Accepted`` or ``Denied`` as |
353 | appropriate. | 356 | appropriate. |
357 | |||
358 | Another 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 | |||
368 | Here'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] | ||