summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/patch.py19
1 files changed, 4 insertions, 15 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 7dd31d9d46..f43cf047c0 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -38,21 +38,10 @@ def runcmd(args, dir = None):
38 if exitstatus != 0: 38 if exitstatus != 0:
39 raise CmdError(cmd, exitstatus >> 8, output) 39 raise CmdError(cmd, exitstatus >> 8, output)
40 if " fuzz " in output: 40 if " fuzz " in output:
41 bb.warn(""" 41 # Drop patch fuzz info with header and footer to log file so
42Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. 42 # insane.bbclass can handle to throw error/warning
43The context lines in the patches can be updated with devtool: 43 bb.note("--- Patch fuzz start ---\n%s\n--- Patch fuzz end ---" % format(output))
44 44
45 devtool modify <recipe>
46 devtool finish --force-patch-refresh <recipe> <layer_path>
47
48Then the updated patches and the source tree (in devtool's workspace)
49should be reviewed to make sure the patches apply in the correct place
50and don't introduce duplicate lines (which can, and does happen
51when some of the context is ignored). Further information:
52http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
53https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
54Details:
55{}""".format(output))
56 return output 45 return output
57 46
58 finally: 47 finally: