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-03 21:42:44 +0000
commit13ea33fbd197b9ee3cf913d9995617115f22798f (patch)
tree6aa804022d6467f9810e8be687042b061811aa4c
parent83d8b469750d7917376abb4d34f7797ee0f75267 (diff)
downloadopenembedded-core-13ea33fbd197b9ee3cf913d9995617115f22798f.tar.gz
openembedded-core-13ea33fbd197b9ee3cf913d9995617115f22798f.tar.bz2
openembedded-core-13ea33fbd197b9ee3cf913d9995617115f22798f.zip
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] Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.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 8ad70f53f1..fccbedb519 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -516,7 +516,7 @@ class GitApplyTree(PatchTree):
try:
shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot]
self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail)
- shellcmd += ["am", "-3", "--keep-cr", "-p%s" % patch['strippath']]
+ shellcmd += ["am", "-3", "--keep-cr", "--no-scissors", "-p%s" % patch['strippath']]
return _applypatchhelper(shellcmd, patch, force, reverse, run)
except CmdError:
# Need to abort the git am, or we'll still be within it at the end