[oe-commits] [openembedded-core] 04/10: lib/oe/patch.py: add a warning if patch context was ignored

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 5133fd46bccf14e21680f8d94e952914edccb113
Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
AuthorDate: Mon Mar 12 18:49:44 2018 +0200

    lib/oe/patch.py: add a warning if patch context was ignored
    
    Ignoring patch context increases the chances of patches being
    applied incorrectly. Depending on what code is being patched, this can go
    completely unnoticed and create subtle bugs, sometimes with security implications.
    
    Please see here for a specific example:
    https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
    
    On the other hand, we cannot simply force all patch context to match exactly:
    doing this would break a lot of recipes suddenly, across all layers.
    
    So let's try a softer approach: issue a warning, and gently update
    patches over a longer span of time. When most of the warnings are eliminated,
    we can start enforcing a strict patch application policy.
    
    I do understand that this patch creates a lot of warnings all of a sudden, however
    I believe the problem does need to be addressed. All of oe-core recipes have their
    context already fixed.
    
    Sample warning:
    
    WARNING: vulkan-1.0.61.1-r0 do_patch:
    Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
    The context lines in the patches can be updated with devtool:
    
        devtool modify <recipe>
        devtool finish --force-patch-refresh <recipe> <layer_path>
    
    Then the updated patches and the source tree (in devtool's workspace)
    should be reviewed to make sure the patches apply in the correct place
    and don't introduce duplicate lines (which can, and does happen
    when some of the context is ignored).
    Details:
    Applying patch demos-Don-t-build-tri-or-cube.patch
    patching file demos/CMakeLists.txt
    Hunk #1 succeeded at 63 (offset 2 lines).
    Hunk #2 succeeded at 76 with fuzz 1 (offset 2 lines).
    
    [YOCTO #10450]
    
    Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/patch.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index f02dee8..bfa7d21 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -36,6 +36,22 @@ def runcmd(args, dir = None):
         (exitstatus, output) = oe.utils.getstatusoutput(cmd)
         if exitstatus != 0:
             raise CmdError(cmd, exitstatus >> 8, output)
+        if " fuzz " in output:
+            bb.warn("""
+Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
+The context lines in the patches can be updated with devtool:
+
+    devtool modify <recipe>
+    devtool finish --force-patch-refresh <recipe> <layer_path>
+
+Then the updated patches and the source tree (in devtool's workspace)
+should be reviewed to make sure the patches apply in the correct place
+and don't introduce duplicate lines (which can, and does happen
+when some of the context is ignored). Further information:
+http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
+https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
+Details:
+{}""".format(output))
         return output
 
     finally:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.