summaryrefslogtreecommitdiffstats
path: root/scripts/lib/recipetool
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-12-22 17:02:55 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-28 09:25:12 +0000
commit470f20bc0261617d8f2cfdaf32d79d42432e6575 (patch)
tree76f8e927b893d76c1bc5d4b7f7f80d28ec20dbd6 /scripts/lib/recipetool
parent8e0a84c90175cc2fedff0272abda073ee270b876 (diff)
downloadpoky-470f20bc0261617d8f2cfdaf32d79d42432e6575.tar.gz
recipetool: create: handle https://....git URLs
When you grab a URL for a github repository you'll almost certainly find it in https://github.com/path/to/repository.git format; but bitbake's fetcher can't handle that because it'll see https:// at the start and assume it should use wget to fetch it. If the URL starts with http:// or https:// and the path part ends with .git then assume it's a git repository and adjust it accordingly. (From OE-Core rev: bdbc4cf41d30eddb8a9ed882dedcc1670ce8fdd6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/recipetool')
-rw-r--r--scripts/lib/recipetool/create.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 2d750465d1..7987fbb0c4 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -108,6 +108,11 @@ def create_recipe(args):
108 # Assume the archive contains the directory structure verbatim 108 # Assume the archive contains the directory structure verbatim
109 # so we need to extract to a subdirectory 109 # so we need to extract to a subdirectory
110 fetchuri += ';subdir=%s' % os.path.splitext(os.path.basename(urlparse.urlsplit(fetchuri).path))[0] 110 fetchuri += ';subdir=%s' % os.path.splitext(os.path.basename(urlparse.urlsplit(fetchuri).path))[0]
111 git_re = re.compile('(https?)://([^;]+\.git)(;.*)?')
112 res = git_re.match(fetchuri)
113 if res:
114 # Need to switch the URI around so that the git fetcher is used
115 fetchuri = 'git://%s;protocol=%s%s' % (res.group(2), res.group(1), res.group(3) or '')
111 srcuri = fetchuri 116 srcuri = fetchuri
112 rev_re = re.compile(';rev=([^;]+)') 117 rev_re = re.compile(';rev=([^;]+)')
113 res = rev_re.search(srcuri) 118 res = rev_re.search(srcuri)