diff options
author | Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> | 2021-01-31 11:46:49 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2021-02-08 06:15:17 -1000 |
commit | 22b0bd5ad09a0ac40f1d8043266fa5b68b532802 (patch) | |
tree | 4525b6208511af8df41087be104637dcaab55ef2 /meta/lib/oe | |
parent | 0ab58355cc625e43056ae07772222be19e98f5f6 (diff) | |
download | openembedded-core-contrib-22b0bd5ad09a0ac40f1d8043266fa5b68b532802.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]
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>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/patch.py | 2 |
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): 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 |