mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

lib/oe/recipeutils.py: accommodate SRCPV being optional and deprecated in version check regex

Browse Source 
(From OE-Core rev: 84794b59940cb08ec44e5ee7718a464d24136812)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-08-25 12:41:57 +02:00
committed by Richard Purdie
parent b6469ed7d6
commit d3e4f25993
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/recipeutils.py
+4 -5
View File
@@ -945,10 +945,9 @@ def replace_dir_vars(path, d):
path = path.replace(dirpath, '${%s}' % dirvars[dirpath]) path = path.replace(dirpath, '${%s}' % dirvars[dirpath])
return path return path
def get_recipe_pv_without_srcpv(pv, uri_type): def get_recipe_pv_with_pfx_sfx(pv, uri_type):
""" """
Get PV without SRCPV common in SCM's for now only Get PV separating prefix and suffix components.
support git.
Returns tuple with pv, prefix and suffix. Returns tuple with pv, prefix and suffix.
""" """
@@ -956,7 +955,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type):
sfx = '' sfx = ''
if uri_type == 'git': if uri_type == 'git':
git_regex = re.compile(r"(?P<pfx>v?)(?P<ver>.*?)(?P<sfx>\+[^\+]*(git)?r?(AUTOINC\+))(?P<rev>.*)") git_regex = re.compile(r"(?P<pfx>v?)(?P<ver>.*?)(?P<sfx>\+[^\+]*(git)?r?(AUTOINC\+)?)(?P<rev>.*)")
m = git_regex.match(pv) m = git_regex.match(pv)
if m: if m:
@@ -1008,7 +1007,7 @@ def get_recipe_upstream_version(rd):
src_uri = src_uris.split()[0] src_uri = src_uris.split()[0]
uri_type, _, _, _, _, _ = decodeurl(src_uri) uri_type, _, _, _, _, _ = decodeurl(src_uri)
(pv, pfx, sfx) = get_recipe_pv_without_srcpv(rd.getVar('PV'), uri_type) (pv, pfx, sfx) = get_recipe_pv_with_pfx_sfx(rd.getVar('PV'), uri_type)
ru['current_version'] = pv ru['current_version'] = pv
manual_upstream_version = rd.getVar("RECIPE_UPSTREAM_VERSION") manual_upstream_version = rd.getVar("RECIPE_UPSTREAM_VERSION")