]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
patch.py: Use git format-patch with --no-signature --no-numbered params
authorMartin Jansa <martin.jansa@gmail.com>
Thu, 15 Mar 2018 22:50:10 +0000 (22:50 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 20 Mar 2018 09:30:18 +0000 (09:30 +0000)
* --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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/lib/oe/patch.py

index bfa7d2187926bbdb6d883e161c969e3285c0213d..af7aa5235158daa82f1e52cad2abcd28003cc284 100644 (file)
@@ -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)