]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
projects / thirdparty / openembedded / openembedded-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 83d8b46) | patch
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)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 3 Feb 2021 21:42:44 +0000 (21:42 +0000)
commit13ea33fbd197b9ee3cf913d9995617115f22798f
tree6aa804022d6467f9810e8be687042b061811aa4ctree | snapshot
parent83d8b469750d7917376abb4d34f7797ee0f75267commit | diff
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>
meta/lib/oe/patch.py diff | blob | blame | history
Mirror of git://git.openembedded.org/openembedded-core