helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-04-02 02:49:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: fetch/git: Fix local clone url to make it work with repo

Browse Source 
The "git clone /path/to/git/objects_symlink" couldn't work after the following
change:

6f054f9fb3

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>
This commit is contained in:
Robert Yang 2023-03-24 00:09:02 -07:00 committed by Steve Sakoman
parent 0f1f69eabe
commit 965c2ec095
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bitbake/lib/bb/fetch2/git.py
View File

@ -367,9 +367,13 @@ class Git(FetchMethod):
# If the repo still doesn't exist, fallback to cloning it # If the repo still doesn't exist, fallback to cloning it
if not os.path.exists(ud.clonedir): 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://"): 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) clone_cmd = "LANG=C %s clone --bare --mirror %s %s --progress" % (ud.basecmd, shlex.quote(repourl), ud.clonedir)
if ud.proto.lower() != 'file': if ud.proto.lower() != 'file':
bb.fetch2.check_network_access(d, clone_cmd, ud.url) bb.fetch2.check_network_access(d, clone_cmd, ud.url)