diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-03-15 22:50:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-20 09:59:32 +0000 |
commit | 00b23ae2aa1f157280ae77a14c2ca90f9b6f6d18 (patch) | |
tree | 61fc947a3bb4016cd3f4d2e61f3d3f49263f30e1 /meta/lib | |
parent | 11032bebe8b08a317f02abf39a3e9783d9b5c052 (diff) | |
download | poky-00b23ae2aa1f157280ae77a14c2ca90f9b6f6d18.tar.gz |
patch.py: Use git format-patch with --no-signature --no-numbered params
* --no-signature saves unnecessary .patch modifications when executed on
host with different git version
* --no-numbered saves unnecessary .patch modifications when number of the
applied patches is changed (the number is still in the filename so the
order how they should be applied is still preserved)
* both options exist for very long time, I've tested them with git 1.9.1
from Ubuntu 14.04 and I'm quite sure they were available even in much
older releases, so there shouldn't be any issue on relatively new sanity
tested distros
(From OE-Core rev: ad76fa92c3a5be38962aff09df070ffd9756f777)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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 bfa7d21879..af7aa52351 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -448,7 +448,7 @@ class GitApplyTree(PatchTree): | |||
448 | import re | 448 | import re |
449 | tempdir = tempfile.mkdtemp(prefix='oepatch') | 449 | tempdir = tempfile.mkdtemp(prefix='oepatch') |
450 | try: | 450 | try: |
451 | shellcmd = ["git", "format-patch", startcommit, "-o", tempdir] | 451 | shellcmd = ["git", "format-patch", "--no-signature", "--no-numbered", startcommit, "-o", tempdir] |
452 | if paths: | 452 | if paths: |
453 | shellcmd.append('--') | 453 | shellcmd.append('--') |
454 | shellcmd.extend(paths) | 454 | shellcmd.extend(paths) |