diff options
| author | Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> | 2021-01-31 11:46:49 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-03 21:45:49 +0000 |
| commit | a3cba800effd783aa42438efddfb97aa26adf7c3 (patch) | |
| tree | 8063bbd652e25cd14126e931ad9bf9ceb4965a6e /scripts/combo-layer | |
| parent | b1e70354dda04b7628aed5d33b5b766d377a5d3c (diff) | |
| download | poky-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 'scripts/combo-layer')
0 files changed, 0 insertions, 0 deletions