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-10 23:55:53 +0000 |
| commit | 4929a3c12e31855ce2481cfac9eb7d5792d2f5ea (patch) | |
| tree | 04bf305f6937b39c2fd960435f04a09f3d02ebc4 /meta/lib/oe/sstatesig.py | |
| parent | 55261cd7eb9e2a9958e48f1a5720b4e7b87bc461 (diff) | |
| download | poky-4929a3c12e31855ce2481cfac9eb7d5792d2f5ea.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: 22b0bd5ad09a0ac40f1d8043266fa5b68b532802)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/sstatesig.py')
0 files changed, 0 insertions, 0 deletions