From 2e234162da158d74fbb5682f2fafc785691845aa Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 25 Jun 2025 20:54:25 +0100 Subject: [PATCH] bitbake: fetch2/git: Add tag to shallow clone tarball name It makes sense to allow the shallow clone mirror tarball name to include the tag name so that tags can be added to existing urls and the tarballs will be maintained correctly. The code already allows this to be done easily just by moving the tag handling code. (Bitbake rev: 68fce3be14e4dd801661f4ef302d229fb16a04b5) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/git.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index e7b030998c..14ec45a3f6 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py @@ -199,6 +199,8 @@ class Git(FetchMethod): ud.shallow_skip_fast = False ud.shallow = d.getVar("BB_GIT_SHALLOW") == "1" ud.shallow_extra_refs = (d.getVar("BB_GIT_SHALLOW_EXTRA_REFS") or "").split() + if 'tag' in ud.parm: + ud.shallow_extra_refs.append("refs/tags/" + ud.parm['tag']) depth_default = d.getVar("BB_GIT_SHALLOW_DEPTH") if depth_default is not None: @@ -633,8 +635,6 @@ class Git(FetchMethod): for line in all_refs_remote: all_refs.append(line.split()[-1]) extra_refs = [] - if 'tag' in ud.parm: - extra_refs.append("refs/tags/" + ud.parm['tag']) for r in ud.shallow_extra_refs: if not ud.bareclone: r = r.replace('refs/heads/', 'refs/remotes/origin/')