summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2023-03-24 00:09:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-30 10:51:54 +0100
commitac3eb2418aa91e85c39560913c1ddfd2134555ba (patch)
treef4f0d22ef40f26ecc2e2027b6d3d811c334fb73a /bitbake/lib
parent4d9886e1435dba3785973cc920865f8ab67e644d (diff)
downloadpoky-ac3eb2418aa91e85c39560913c1ddfd2134555ba.tar.gz
bitbake: fetch/git: Fix local clone url to make it work with repo
The "git clone /path/to/git/objects_symlink" couldn't work after the following change: https://github.com/git/git/commit/6f054f9fb3a501c35b55c65e547a244f14c38d56 But repo command manages the git repo as symlinks, so check whether the objects is an symlink to fix the problem: * Nothing is changed if git/objects is not a symlink * Use "git clone file://" when git/objects is a symlink (Bitbake rev: a0d8108eba8d542707740d00c66c1c5f5b963f18) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/fetch2/git.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index d0d68538e2..2a3c06fe4e 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -367,9 +367,13 @@ class Git(FetchMethod):
367 367
368 # If the repo still doesn't exist, fallback to cloning it 368 # If the repo still doesn't exist, fallback to cloning it
369 if not os.path.exists(ud.clonedir): 369 if not os.path.exists(ud.clonedir):
370 # We do this since git will use a "-l" option automatically for local urls where possible 370 # We do this since git will use a "-l" option automatically for local urls where possible,
371 # but it doesn't work when git/objects is a symlink, only works when it is a directory.
371 if repourl.startswith("file://"): 372 if repourl.startswith("file://"):
372 repourl = repourl[7:] 373 repourl_path = repourl[7:]
374 objects = os.path.join(repourl_path, 'objects')
375 if os.path.isdir(objects) and not os.path.islink(objects):
376 repourl = repourl_path
373 clone_cmd = "LANG=C %s clone --bare --mirror %s %s --progress" % (ud.basecmd, shlex.quote(repourl), ud.clonedir) 377 clone_cmd = "LANG=C %s clone --bare --mirror %s %s --progress" % (ud.basecmd, shlex.quote(repourl), ud.clonedir)
374 if ud.proto.lower() != 'file': 378 if ud.proto.lower() != 'file':
375 bb.fetch2.check_network_access(d, clone_cmd, ud.url) 379 bb.fetch2.check_network_access(d, clone_cmd, ud.url)