From 00b23ae2aa1f157280ae77a14c2ca90f9b6f6d18 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 15 Mar 2018 22:50:10 +0000 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/patch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta') 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): import re tempdir = tempfile.mkdtemp(prefix='oepatch') try: - shellcmd = ["git", "format-patch", startcommit, "-o", tempdir] + shellcmd = ["git", "format-patch", "--no-signature", "--no-numbered", startcommit, "-o", tempdir] if paths: shellcmd.append('--') shellcmd.extend(paths) -- cgit v1.2.3-54-g00ecf