summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorNiels Avonds <niels@codebits.be>2021-05-10 04:15:19 -1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-13 13:12:00 +0100
commit34597b96d94cd4d7aae38c394181df7bebec4171 (patch)
tree979c7cf2612f27ef475346c435d639f0852593d5 /bitbake
parent17f41be0f4c77ca0919eda193dbeca15f886e76e (diff)
downloadpoky-34597b96d94cd4d7aae38c394181df7bebec4171.tar.gz
bitbake: fetch/gitsm: Fix crash when using git LFS and submodules
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] (Bitbake rev: b4acaa314cd8bc86c50e14464ff01c2d110122c4) 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> (cherry picked from commit e05d79a6ed92c9ce17b90fd5fb6186898a7b3bf8) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/git.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 8740e9c05f..112b833f87 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -388,7 +388,7 @@ class Git(FetchMethod):
388 tmpdir = tempfile.mkdtemp(dir=d.getVar('DL_DIR')) 388 tmpdir = tempfile.mkdtemp(dir=d.getVar('DL_DIR'))
389 try: 389 try:
390 # Do the checkout. This implicitly involves a Git LFS fetch. 390 # Do the checkout. This implicitly involves a Git LFS fetch.
391 self.unpack(ud, tmpdir, d) 391 Git.unpack(self, ud, tmpdir, d)
392 392
393 # Scoop up a copy of any stuff that Git LFS downloaded. Merge them into 393 # Scoop up a copy of any stuff that Git LFS downloaded. Merge them into
394 # the bare clonedir. 394 # the bare clonedir.