From 5dba8d0b6c940934375eea9af37e7c4856b51c96 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Mon, 17 Mar 2025 18:13:02 +0100 Subject: [PATCH] devtool-source.bbclass: Do not create annotated tags if tag.gpgSign is set If tag.gpgSign is configured in Git's configuration, then creating the devtool-patched tag will fail (if Git's core.editor is not configured) or it will hang (when trying to open the editor). This is beacause tag.gpgSign causes git tag to create annotated tags. To avoid this, specify --no-sign as argument to git tag. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/devtool-source.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/devtool-source.bbclass b/meta/classes/devtool-source.bbclass index 3e24800dcb0..9762003ba75 100644 --- a/meta/classes/devtool-source.bbclass +++ b/meta/classes/devtool-source.bbclass @@ -179,9 +179,9 @@ python devtool_post_patch() { # (otherwise we'd likely be left with identical commits that have different hashes) bb.process.run('git rebase devtool-no-overrides', cwd=srcsubdir) bb.process.run('git checkout %s' % devbranch, cwd=srcsubdir) - bb.process.run('git tag -f devtool-patched', cwd=srcsubdir) + bb.process.run('git tag -f --no-sign devtool-patched', cwd=srcsubdir) if os.path.exists(os.path.join(srcsubdir, '.gitmodules')): - bb.process.run('git submodule foreach --recursive "git tag -f devtool-patched"', cwd=srcsubdir) + bb.process.run('git submodule foreach --recursive "git tag -f --no-sign devtool-patched"', cwd=srcsubdir) } -- 2.47.3