aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Avonds <niels@codebits.be>2021-05-03 22:35:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-04 23:10:51 +0100
commite05d79a6ed92c9ce17b90fd5fb6186898a7b3bf8 (patch)
tree92b753ea1136230019d47c2789d463bbced18f66
parent32183076cb54f6d247471429cfd99491e41a1cab (diff)
downloadbitbake-yocto-3.2.4.tar.gz
bitbake-yocto-3.2.4.tar.bz2
bitbake-yocto-3.2.4.zip
fetch/gitsm: Fix crash when using git LFS and submodulesyocto-3.2.42020-10.4-gatesgarth1.48.4
Gitsm fetcher crashes when cloning a repository that contains LFS files. This happens because the unpack method is called during download, but the submodules have not been downloaded yet at this point. This issue was introduced in this commit: 977b7268bf4fd425cb86d4a57500350c9b829162 [YOCTO #14283] Signed-off-by: Niels Avonds <niels@codebits.be> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 26caedc4d2e9b5a0f1d57f9291754a7f6c5e437e) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/fetch2/git.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index b59a7cdc..21ef85a2 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -389,7 +389,7 @@ class Git(FetchMethod):
tmpdir = tempfile.mkdtemp(dir=d.getVar('DL_DIR'))
try:
# Do the checkout. This implicitly involves a Git LFS fetch.
- self.unpack(ud, tmpdir, d)
+ Git.unpack(self, ud, tmpdir, d)
# Scoop up a copy of any stuff that Git LFS downloaded. Merge them into
# the bare clonedir.