From: Diego de los Santos <diego.delossantos@belden.com>
Date: Wed, 19 Nov 2025 14:03:15 +0000 (+0000)
Subject: lib/oe/patch: Disable gpg signing when applying patches using git
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f059af8e544fc0c88f677a5f7a47c1c849d1bcf3;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

lib/oe/patch: Disable gpg signing when applying patches using git

This fixes patching failing when git is configured to automatically sign
commits.

Signed-off-by: Diego de los Santos <diego.delossantos@belden.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index edd77196ee7..77b166cfa3c 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -453,7 +453,7 @@ class GitApplyTree(PatchTree):
         # Prepare git command
         cmd = ["git"]
         GitApplyTree.gitCommandUserOptions(cmd, commituser, commitemail)
-        cmd += ["commit", "-F", tmpfile, "--no-verify"]
+        cmd += ["commit", "-F", tmpfile, "--no-verify", "--no-gpg-sign"]
         # git doesn't like plain email addresses as authors
         if author and '<' in author:
             cmd.append('--author="%s"' % author)
@@ -507,7 +507,7 @@ class GitApplyTree(PatchTree):
             runcmd(['git', 'add'] + files, dir)
         cmd = ["git"]
         GitApplyTree.gitCommandUserOptions(cmd, d=d)
-        cmd += ["commit", "-m", subject, "--no-verify"]
+        cmd += ["commit", "-m", subject, "--no-verify", "--no-gpg-sign"]
         runcmd(cmd, dir)
         GitApplyTree.addNote(dir, "HEAD", GitApplyTree.ignore_commit, d.getVar('PATCH_GIT_USER_NAME'), d.getVar('PATCH_GIT_USER_EMAIL'))