diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2025-03-17 18:13:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-19 12:09:06 +0000 |
commit | 9fda20fc1c65109534a3a410f632055daa9e0798 (patch) | |
tree | 7c46ceda3568424b8e1bc3bc2fc511bf45cad23f /meta/classes/devtool-source.bbclass | |
parent | 9eb610fb74f25f40b9e2b06052cd281b272a2cb8 (diff) | |
download | poky-9fda20fc1c65109534a3a410f632055daa9e0798.tar.gz |
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.
(From OE-Core rev: 5dba8d0b6c940934375eea9af37e7c4856b51c96)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/devtool-source.bbclass')
-rw-r--r-- | meta/classes/devtool-source.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/devtool-source.bbclass b/meta/classes/devtool-source.bbclass index 3e24800dcb..9762003ba7 100644 --- a/meta/classes/devtool-source.bbclass +++ b/meta/classes/devtool-source.bbclass | |||
@@ -179,9 +179,9 @@ python devtool_post_patch() { | |||
179 | # (otherwise we'd likely be left with identical commits that have different hashes) | 179 | # (otherwise we'd likely be left with identical commits that have different hashes) |
180 | bb.process.run('git rebase devtool-no-overrides', cwd=srcsubdir) | 180 | bb.process.run('git rebase devtool-no-overrides', cwd=srcsubdir) |
181 | bb.process.run('git checkout %s' % devbranch, cwd=srcsubdir) | 181 | bb.process.run('git checkout %s' % devbranch, cwd=srcsubdir) |
182 | bb.process.run('git tag -f devtool-patched', cwd=srcsubdir) | 182 | bb.process.run('git tag -f --no-sign devtool-patched', cwd=srcsubdir) |
183 | if os.path.exists(os.path.join(srcsubdir, '.gitmodules')): | 183 | if os.path.exists(os.path.join(srcsubdir, '.gitmodules')): |
184 | bb.process.run('git submodule foreach --recursive "git tag -f devtool-patched"', cwd=srcsubdir) | 184 | bb.process.run('git submodule foreach --recursive "git tag -f --no-sign devtool-patched"', cwd=srcsubdir) |
185 | 185 | ||
186 | } | 186 | } |
187 | 187 | ||