]> code.ossystems Code Review - openembedded-core.git/commit
lib/oe/patch.py: Ignore scissors line on applying patch
authorTomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Sun, 31 Jan 2021 10:46:49 +0000 (11:46 +0100)
committerSteve Sakoman <steve@sakoman.com>
Mon, 8 Feb 2021 16:15:17 +0000 (06:15 -1000)
commit22b0bd5ad09a0ac40f1d8043266fa5b68b532802
tree4525b6208511af8df41087be104637dcaab55ef2
parent0ab58355cc625e43056ae07772222be19e98f5f6
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>
meta/lib/oe/patch.py