summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-24 08:08:44 -0800
committerSteve Sakoman <steve@sakoman.com>2025-02-05 06:54:35 -0800
commit1f103ae930662bbb099b7decbd692be3d09551e4 (patch)
tree97145ef9fb76e377ba7a340b9464e7573352afea /bitbake
parenta42a2d776dca915fe36e93f445321b64d357a3be (diff)
downloadpoky-1f103ae930662bbb099b7decbd692be3d09551e4.tar.gz
bitbake: tests/fetch: Fix git shallow test failure with git >= 2.48
>From git 2.48 release notes: """ When "git fetch $remote" notices that refs/remotes/$remote/HEAD is missing and discovers what branch the other side points with its HEAD, refs/remotes/$remote/HEAD is updated to point to it. """ This means with git 2.48 onwards, there is a mystery "HEAD" revision appearing in some of our shallow clone tests. We can avoid this by using the same canonicalization as used for the reference revisions. This resolves autobuilder failures on the Fedora 40 workers. (Bitbake rev: e71f1ce53cf3b8320caa481ae62d1ce2900c4670) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit c83444d1210740e27b1744d3aa7c5cad4e28db2f) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/tests/fetch.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index 9f0f00fffc..88f4ba0413 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -1621,6 +1621,8 @@ class GitShallowTest(FetcherTest):
1621 if cwd is None: 1621 if cwd is None:
1622 cwd = self.gitdir 1622 cwd = self.gitdir
1623 actual_refs = self.git(['for-each-ref', '--format=%(refname)'], cwd=cwd).splitlines() 1623 actual_refs = self.git(['for-each-ref', '--format=%(refname)'], cwd=cwd).splitlines()
1624 # Resolve references into the same format as the comparision (needed by git 2.48 onwards)
1625 actual_refs = self.git(['rev-parse', '--symbolic-full-name'] + actual_refs, cwd=cwd).splitlines()
1624 full_expected = self.git(['rev-parse', '--symbolic-full-name'] + expected_refs, cwd=cwd).splitlines() 1626 full_expected = self.git(['rev-parse', '--symbolic-full-name'] + expected_refs, cwd=cwd).splitlines()
1625 self.assertEqual(sorted(set(full_expected)), sorted(set(actual_refs))) 1627 self.assertEqual(sorted(set(full_expected)), sorted(set(actual_refs)))
1626 1628