summaryrefslogtreecommitdiffstats
path: root/meta/lib
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-03 21:45:49 +0000
commita3cba800effd783aa42438efddfb97aa26adf7c3 (patch)
tree8063bbd652e25cd14126e931ad9bf9ceb4965a6e /meta/lib
parentb1e70354dda04b7628aed5d33b5b766d377a5d3c (diff)
downloadpoky-a3cba800effd783aa42438efddfb97aa26adf7c3.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: 13ea33fbd197b9ee3cf913d9995617115f22798f) Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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 8ad70f53f1..fccbedb519 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -516,7 +516,7 @@ class GitApplyTree(PatchTree):
516 try: 516 try:
517 shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot] 517 shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot]
518 self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail) 518 self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail)
519 shellcmd += ["am", "-3", "--keep-cr", "-p%s" % patch['strippath']] 519 shellcmd += ["am", "-3", "--keep-cr", "--no-scissors", "-p%s" % patch['strippath']]
520 return _applypatchhelper(shellcmd, patch, force, reverse, run) 520 return _applypatchhelper(shellcmd, patch, force, reverse, run)
521 except CmdError: 521 except CmdError:
522 # Need to abort the git am, or we'll still be within it at the end 522 # Need to abort the git am, or we'll still be within it at the end