summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2019-01-15 16:31:32 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-16 15:35:07 +0000
commit3974e5054f4de60e56123e004e3e4b521867a952 (patch)
tree51e3ca4ad62a013cfcf61b29250a85f6fb5090f5 /bitbake/lib
parent566d31960cf1e86b7e1e6dc0272600d24b335134 (diff)
downloadpoky-3974e5054f4de60e56123e004e3e4b521867a952.tar.gz
bitbake: gitsm.py: Add support for alternative URL formats from submodule files
The following appear to be the git supported formats: proto://user:pass@host/path (URI format) user@host:path (SSH format) /path or ./path or ../path (local file format) We adjust the parsing to find out if we have a URI format or not. When we are NOT in URI format, we do our best to determine SSH or file format by looking for a ':' in the overall string. If we find a ':' we assume SSH format and adjust accordingly. Note, in SSH format we simply replace the ':' with a '/' when constructing the URL. However, if the original path was ":/...", we don't want '//' so we deal with this corner case as well. (Bitbake rev: dcac05e7dc6b0c5f8e63d36ad105b7eab41f0016) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/fetch2/gitsm.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py
index b7959ff5d1..dd94186cc4 100644
--- a/bitbake/lib/bb/fetch2/gitsm.py
+++ b/bitbake/lib/bb/fetch2/gitsm.py
@@ -100,8 +100,21 @@ class GitSM(Git):
100 module_hash = module_hash.split()[2] 100 module_hash = module_hash.split()[2]
101 101
102 # Build new SRC_URI 102 # Build new SRC_URI
103 proto = uris[module].split(':', 1)[0] 103 if "://" not in uris[module]:
104 url = uris[module].replace('%s:' % proto, 'gitsm:', 1) 104 # It's ssh if the format does NOT have "://", but has a ':'
105 if ":" in uris[module]:
106 proto = "ssh"
107 if ":/" in uris[module]:
108 url = "gitsm://" + uris[module].replace(':/', '/', 1)
109 else:
110 url = "gitsm://" + uris[module].replace(':', '/', 1)
111 else: # Fall back to 'file' if there is no ':'
112 proto = "file"
113 url = "gitsm://" + uris[module]
114 else:
115 proto = uris[module].split(':', 1)[0]
116 url = uris[module].replace('%s:' % proto, 'gitsm:', 1)
117
105 url += ';protocol=%s' % proto 118 url += ';protocol=%s' % proto
106 url += ";name=%s" % module 119 url += ";name=%s" % module
107 url += ";bareclone=1;nocheckout=1;nobranch=1" 120 url += ";bareclone=1;nocheckout=1;nobranch=1"