From 653ac666c430c37c32df1b9e633c68214003e85c Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Fri, 22 Sep 2023 12:00:02 +0200 Subject: contributor-guide: recipe-style-guide: add more patch tagging examples (From yocto-docs rev: a2904fd3ccdcb1d7232adce51966749cb1e3cb92) Signed-off-by: Roland Hieber Reviewed-by: Michael Opdenacker Signed-off-by: Richard Purdie --- .../contributor-guide/recipe-style-guide.rst | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'documentation') 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 ``Signed-off-by:`` line should be added to the patch by the person claiming responsibility for upstreaming. -For example, if the patch has been submitted upstream:: +Examples +-------- + +Here's an example of a patch that has been submitted upstream:: rpm: Adjusted the foo setting in bar @@ -351,3 +354,19 @@ For example, if the patch has been submitted upstream:: A future update can change the value to ``Accepted`` or ``Denied`` as appropriate. + +Another example of a patch that is specific to OpenEmbedded:: + + Do not treat warnings as errors + + There are additional warnings found with musl which are + treated as errors and fails the build, we have more combinations + than upstream supports to handle. + + Upstream-Status: Inappropriate [oe specific] + +Here's a patch that has been backported from an upstream commit:: + + include missing sys/file.h for LOCK_EX + + Upstream-Status: Backport [https://github.com/systemd/systemd/commit/ac8db36cbc26694ee94beecc8dca208ec4b5fd45] -- cgit v1.2.3-54-g00ecf