diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2023-03-24 00:09:02 -0700 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-04-14 06:51:44 -1000 |
commit | 965c2ec095267c917bac66880b14884b399943ce (patch) | |
tree | 8a68c4433dafb6b9eaeabf08039e6fb783fc1549 | |
parent | 0f1f69eabe06033d7d15f52725c99491ece77ba7 (diff) | |
download | poky-965c2ec095267c917bac66880b14884b399943ce.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: 5b105e76dd7de3b9a25b17b397f2c12c80048894)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a0d8108eba8d542707740d00c66c1c5f5b963f18)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 2e3d32515f..4645a5af0e 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) |