recipetool: create: do not treat numbers in SCM URLs as versions
Numbers within SCM (e.g. git) URLs are extremely unlikely to be valid version numbers - more likely they are just part of the name, thus don't try to extract them and use them as the version - doing so causes pretty bad behaviour within devtool: --------- snip --------- $ devtool add https://github.com/inhedron/libtr50 NOTE: Fetching git://github.com/inhedron/libtr50;protocol=https... ... NOTE: Using default source tree path .../build/workspace/sources/libtr ... RecursionError: maximum recursion depth exceeded while calling a Python object --------- snip --------- (This was because ${PV} was being substituted into the URL, but PV's value was being set to include ${SRCPV}, so there was a circular reference.) (From OE-Core rev: 3427508b6ce865654f8bf01a6fc04b83c70315d3) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
6ac9c605e6
commit
e0a94f2e1f
|
@ -336,7 +336,7 @@ def determine_from_url(srcuri):
|
|||
pn = res.group(1).strip().replace('_', '-')
|
||||
pv = res.group(2).strip().replace('_', '.')
|
||||
|
||||
if not pn and not pv:
|
||||
if not pn and not pv and parseres.scheme not in ['git', 'gitsm', 'svn', 'hg']:
|
||||
srcfile = os.path.basename(parseres.path.rstrip('/'))
|
||||
pn, pv = determine_from_filename(srcfile)
|
||||
|
||||
|
@ -567,7 +567,6 @@ def create_recipe(args):
|
|||
if name_pv and not realpv:
|
||||
realpv = name_pv
|
||||
|
||||
|
||||
if not srcuri:
|
||||
lines_before.append('# No information for SRC_URI yet (only an external source tree was specified)')
|
||||
lines_before.append('SRC_URI = "%s"' % srcuri)
|
||||
|
|
Loading…
Reference in New Issue