From 9eb610fb74f25f40b9e2b06052cd281b272a2cb8 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Mon, 17 Mar 2025 18:13:01 +0100 Subject: devtool: Do not create annotated tags if tag.gpgSign is set If tag.gpgSign is configured in Git's configuration, then creating the devtool-base 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: f96e955b29aad6a9e0b20f8e9a4987ace3808c91) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- scripts/lib/devtool/upgrade.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/lib/devtool/upgrade.py') diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 94b6c11a37..9abf72eccf 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -188,9 +188,9 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee if uri.startswith('git://') or uri.startswith('gitsm://'): __run('git fetch') __run('git checkout %s' % rev) - __run('git tag -f devtool-base-new') + __run('git tag -f --no-sign devtool-base-new') __run('git submodule update --recursive') - __run('git submodule foreach \'git tag -f devtool-base-new\'') + __run('git submodule foreach \'git tag -f --no-sign devtool-base-new\'') (stdout, _) = __run('git submodule --quiet foreach \'echo $sm_path\'') paths += [os.path.join(srctree, p) for p in stdout.splitlines()] checksums = {} @@ -257,7 +257,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee useroptions = [] oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=rd) __run('git %s commit -q -m "Commit of upstream changes at version %s" --allow-empty' % (' '.join(useroptions), newpv)) - __run('git tag -f devtool-base-%s' % newpv) + __run('git tag -f --no-sign devtool-base-%s' % newpv) revs = {} for path in paths: -- cgit v1.2.3-54-g00ecf