summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorNiels Avonds <niels@codebits.be>2021-04-26 11:27:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-27 15:22:58 +0100
commit2742e7376015a5ef4d84f29cfbd70b9474f2389c (patch)
tree4cc95d474b486bc9535a6312b29f736be64ddedd /bitbake
parent3f8758b54dc45f16cb28689271a2f580917e4078 (diff)
downloadpoky-2742e7376015a5ef4d84f29cfbd70b9474f2389c.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: 88d1d2b65a70081389a1c8f9b590a013a1cb4452) 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>
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 e3ba80a3f5..cf7424ebf4 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -394,7 +394,7 @@ class Git(FetchMethod):
394 tmpdir = tempfile.mkdtemp(dir=d.getVar('DL_DIR')) 394 tmpdir = tempfile.mkdtemp(dir=d.getVar('DL_DIR'))
395 try: 395 try:
396 # Do the checkout. This implicitly involves a Git LFS fetch. 396 # Do the checkout. This implicitly involves a Git LFS fetch.
397 self.unpack(ud, tmpdir, d) 397 Git.unpack(self, ud, tmpdir, d)
398 398
399 # Scoop up a copy of any stuff that Git LFS downloaded. Merge them into 399 # Scoop up a copy of any stuff that Git LFS downloaded. Merge them into
400 # the bare clonedir. 400 # the bare clonedir.