summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Dziendzielski <tomasz.dziendzielski@gmail.com>2021-01-31 11:46:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-10 23:55:53 +0000
commit4929a3c12e31855ce2481cfac9eb7d5792d2f5ea (patch)
tree04bf305f6937b39c2fd960435f04a09f3d02ebc4
parent55261cd7eb9e2a9958e48f1a5720b4e7b87bc461 (diff)
downloadpoky-4929a3c12e31855ce2481cfac9eb7d5792d2f5ea.tar.gz
lib/oe/patch.py: Ignore scissors line on applying patch
The "devtool modify" could remove message body before scissors line, so patches re-generated from git tree were incorrectly modified. Adding --no-scissors to "git am" invocation to prevent this behaviour. [YOCTO #12674] (From OE-Core rev: 22b0bd5ad09a0ac40f1d8043266fa5b68b532802) Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 13ea33fbd197b9ee3cf913d9995617115f22798f) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/patch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 7ca2e28b1f..7cd8436da5 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -512,7 +512,7 @@ class GitApplyTree(PatchTree):
512 try: 512 try:
513 shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot] 513 shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot]
514 self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail) 514 self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail)
515 shellcmd += ["am", "-3", "--keep-cr", "-p%s" % patch['strippath']] 515 shellcmd += ["am", "-3", "--keep-cr", "--no-scissors", "-p%s" % patch['strippath']]
516 return _applypatchhelper(shellcmd, patch, force, reverse, run) 516 return _applypatchhelper(shellcmd, patch, force, reverse, run)
517 except CmdError: 517 except CmdError:
518 # Need to abort the git am, or we'll still be within it at the end 518 # Need to abort the git am, or we'll still be within it at the end