diff options
Diffstat (limited to 'meta/lib/oe')
| -rw-r--r-- | meta/lib/oe/patch.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index f02dee8d27..bfa7d21879 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
| @@ -36,6 +36,22 @@ def runcmd(args, dir = None): | |||
| 36 | (exitstatus, output) = oe.utils.getstatusoutput(cmd) | 36 | (exitstatus, output) = oe.utils.getstatusoutput(cmd) |
| 37 | if exitstatus != 0: | 37 | if exitstatus != 0: |
| 38 | raise CmdError(cmd, exitstatus >> 8, output) | 38 | raise CmdError(cmd, exitstatus >> 8, output) |
| 39 | if " fuzz " in output: | ||
| 40 | bb.warn(""" | ||
| 41 | Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. | ||
| 42 | The context lines in the patches can be updated with devtool: | ||
| 43 | |||
| 44 | devtool modify <recipe> | ||
| 45 | devtool finish --force-patch-refresh <recipe> <layer_path> | ||
| 46 | |||
| 47 | Then the updated patches and the source tree (in devtool's workspace) | ||
| 48 | should be reviewed to make sure the patches apply in the correct place | ||
| 49 | and don't introduce duplicate lines (which can, and does happen | ||
| 50 | when some of the context is ignored). Further information: | ||
| 51 | http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html | ||
| 52 | https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 | ||
| 53 | Details: | ||
| 54 | {}""".format(output)) | ||
| 39 | return output | 55 | return output |
| 40 | 56 | ||
| 41 | finally: | 57 | finally: |
