summaryrefslogtreecommitdiffstats
path: root/bitbake
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:11:04 +0100
commitb492191d87b080304a9d4f2efe0f7c377f6f9438 (patch)
tree8f1c4bc06ba4fbc558c73c0742ca8a52b47ba24b /bitbake
parent78c99742b8dd9ae663bfcac8e514069cf11e8d44 (diff)
downloadpoky-b492191d87b080304a9d4f2efe0f7c377f6f9438.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: e05d79a6ed92c9ce17b90fd5fb6186898a7b3bf8) 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 b59a7cdc84..21ef85a2ae 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -389,7 +389,7 @@ class Git(FetchMethod):
389 tmpdir = tempfile.mkdtemp(dir=d.getVar('DL_DIR')) 389 tmpdir = tempfile.mkdtemp(dir=d.getVar('DL_DIR'))
390 try: 390 try:
391 # Do the checkout. This implicitly involves a Git LFS fetch. 391 # Do the checkout. This implicitly involves a Git LFS fetch.
392 self.unpack(ud, tmpdir, d) 392 Git.unpack(self, ud, tmpdir, d)
393 393
394 # Scoop up a copy of any stuff that Git LFS downloaded. Merge them into 394 # Scoop up a copy of any stuff that Git LFS downloaded. Merge them into
395 # the bare clonedir. 395 # the bare clonedir.