@@ -234,7 +234,7 @@ def setup_git_repo(repodir, version, devbranch, basetag='devtool-base', d=None):
f.write(line)
bb.process.run('git checkout -b %s' % devbranch, cwd=repodir)
- bb.process.run('git tag -f %s' % basetag, cwd=repodir)
+ bb.process.run('git tag -f --no-sign %s' % basetag, cwd=repodir)
# if recipe unpacks another git repo inside S, we need to declare it as a regular git submodule now,
# so we will be able to tag branches on it and extract patches when doing finish/update on the recipe
@@ -256,7 +256,7 @@ def setup_git_repo(repodir, version, devbranch, basetag='devtool-base', d=None):
oe.patch.GitApplyTree.commitIgnored("Add additional submodule from SRC_URI", dir=os.path.join(root, ".."), d=d)
found = False
if os.path.exists(os.path.join(repodir, '.gitmodules')):
- bb.process.run('git submodule foreach --recursive "git tag -f %s"' % basetag, cwd=repodir)
+ bb.process.run('git submodule foreach --recursive "git tag -f --no-sign %s"' % basetag, cwd=repodir)
def recipe_to_append(recipefile, config, wildcard=False):
"""
@@ -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:
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. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> --- scripts/lib/devtool/__init__.py | 4 ++-- scripts/lib/devtool/upgrade.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)