diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2023-03-24 00:09:02 -0700 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2023-03-31 04:28:22 -1000 |
| commit | 2802adb572eb73a3eb2725a74a9bbdaafc543fa7 (patch) | |
| tree | 8875b08884e02756c866a5298b9890160d246b72 | |
| parent | a29ffcc12df24737e702e198aeb8f6892884932b (diff) | |
| download | bitbake-2802adb572eb73a3eb2725a74a9bbdaafc543fa7.tar.gz | |
fetch/git: Fix local clone url to make it work with repoyocto-4.0.92022-04.9-kirkstone2.0.9
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
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>
| -rw-r--r-- | lib/bb/fetch2/git.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 4e286ca96..4d6e57ade 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -359,9 +359,13 @@ class Git(FetchMethod): # If the repo still doesn't exist, fallback to cloning it if not os.path.exists(ud.clonedir): - # We do this since git will use a "-l" option automatically for local urls where possible + # We do this since git will use a "-l" option automatically for local urls where possible, + # but it doesn't work when git/objects is a symlink, only works when it is a directory. if repourl.startswith("file://"): - repourl = repourl[7:] + repourl_path = repourl[7:] + objects = os.path.join(repourl_path, 'objects') + if os.path.isdir(objects) and not os.path.islink(objects): + repourl = repourl_path clone_cmd = "LANG=C %s clone --bare --mirror %s %s --progress" % (ud.basecmd, shlex.quote(repourl), ud.clonedir) if ud.proto.lower() != 'file': bb.fetch2.check_network_access(d, clone_cmd, ud.url) |