summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennaro Iorio <gen.iorio92@gmail.com>2022-06-30 19:24:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-01 12:20:18 +0100
commit241a27ea80968329625463213f76a5c5880a33e8 (patch)
tree19ad5363d3c9aa7745e73750c216c70c43225dba
parentdfaabf971b02e33870f9f927e9b1356e05e74a17 (diff)
downloadpoky-241a27ea80968329625463213f76a5c5880a33e8.tar.gz
bitbake: fetch2: gitsm: fix incorrect handling of git submodule relative urls
As specified by git submodule manual relative urls can start either with '..' or './', second case was incorrectly managed leading to an interpretation of urls starting with './' as absoulte urls. (Bitbake rev: 4a0bd3bcd1f7fc25364df8bbf185ff64881c015b) Signed-off-by: Gennaro Iorio <gennaro.iorio@schindler.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/gitsm.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py
index c5c23d5260..c1950e4819 100644
--- a/bitbake/lib/bb/fetch2/gitsm.py
+++ b/bitbake/lib/bb/fetch2/gitsm.py
@@ -88,7 +88,7 @@ class GitSM(Git):
88 subrevision[m] = module_hash.split()[2] 88 subrevision[m] = module_hash.split()[2]
89 89
90 # Convert relative to absolute uri based on parent uri 90 # Convert relative to absolute uri based on parent uri
91 if uris[m].startswith('..'): 91 if uris[m].startswith('..') or uris[m].startswith('./'):
92 newud = copy.copy(ud) 92 newud = copy.copy(ud)
93 newud.path = os.path.realpath(os.path.join(newud.path, uris[m])) 93 newud.path = os.path.realpath(os.path.join(newud.path, uris[m]))
94 uris[m] = Git._get_repo_url(self, newud) 94 uris[m] = Git._get_repo_url(self, newud)